From bb560f77ea1ebfc01ecd907ed5e2e61521da596e Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Thu, 7 May 2020 18:16:58 +0000
Subject: NNI-based Service creation DG bug fixes (uni, l2vpn, and underlay
 resources).

- This is needed for F release

Issue-ID: SDNC-1184
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Ib35d7a70e862c6068d9e3edc10f7d80ba5764e6a
(cherry picked from commit ccf839a4815dc7e26deaf36627d04c0a4587780b [formerly f515a8831e0036414d69d73030e871dec88180f8])

Former-commit-id: fe1e29bd322bdb230b2bcf69fd3823567f11f7f2
---
 ...ENERIC-RESOURCE-API_sotn-create-otn-tunnel.json |  578 +++--
 ...URCE-API_sotn-get-otn-tunnel-path-from-oof.json | 2597 ++++++++++----------
 ...-RESOURCE-API_sotn-get-vf-module-uni-param.json |  166 +-
 ...OURCE-API_sotn-vf-operation-l2vpn-activate.json |  250 +-
 ...ESOURCE-API_sotn-vf-operation-l2vpn-create.json |  586 +++--
 ...ESOURCE-API_sotn-vf-operation-uni-activate.json |  933 +++----
 ...-RESOURCE-API_sotn-vf-operation-uni-create.json |  440 ++--
 ...n-vnf-topology-operation-underlay-activate.json |  250 +-
 ...otn-vnf-topology-operation-underlay-create.json |  344 +--
 ...GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml |   86 +-
 ...OURCE-API_sotn-get-otn-tunnel-path-from-oof.xml |  380 +--
 ...C-RESOURCE-API_sotn-get-vf-module-uni-param.xml |    4 +-
 ...SOURCE-API_sotn-vf-operation-l2vpn-activate.xml |   70 +-
 ...RESOURCE-API_sotn-vf-operation-l2vpn-create.xml |  118 +-
 ...RESOURCE-API_sotn-vf-operation-uni-activate.xml |   79 +-
 ...C-RESOURCE-API_sotn-vf-operation-uni-create.xml |   64 +-
 ...tn-vnf-topology-operation-underlay-activate.xml |   10 +-
 ...sotn-vnf-topology-operation-underlay-create.xml |   22 +-
 18 files changed, 3702 insertions(+), 3275 deletions(-)

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

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 26e9f8fe..8b19b0e4 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
@@ -1,20 +1,20 @@
 [
     {
-        "id": "2d787bd1.a214b4",
+        "id": "317d0413.97b404",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 92,
-        "y": 22,
-        "z": "17040f2b.d4a821",
+        "x": 125,
+        "y": 61,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "99a6e8f9.6615a8"
+                "56043ae0.d8ae54"
             ]
         ]
     },
     {
-        "id": "99a6e8f9.6615a8",
+        "id": "56043ae0.d8ae54",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,427 +22,697 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 206,
-        "y": 125.00003051757812,
-        "z": "17040f2b.d4a821",
+        "x": 239,
+        "y": 164.00003051757812,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "d3f739cf.6d5a28"
+                "1b0e9fc8.fec538"
             ]
         ]
     },
     {
-        "id": "d3f739cf.6d5a28",
+        "id": "1b0e9fc8.fec538",
         "type": "method",
         "name": "sotn-create-otn-tunnel",
         "xml": "<method rpc='sotn-create-otn-tunnel' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 217.0001220703125,
-        "y": 297,
-        "z": "17040f2b.d4a821",
+        "x": 250.0001220703125,
+        "y": 336,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "eb49715b.e15e8"
+                "c6ff1d9b.4f5f78"
             ]
         ]
     },
     {
-        "id": "acad5285.a3e1a",
+        "id": "95a2379b.0d1ce",
         "type": "comment",
         "name": "get cross-domain-link information",
         "info": "",
         "comments": "",
-        "x": 449.5001220703125,
-        "y": 31.286468505859375,
-        "z": "17040f2b.d4a821",
+        "x": 482.5001220703125,
+        "y": 70.28646850585938,
+        "z": "3b47dc40.0a0c44",
         "wires": []
     },
     {
-        "id": "eb49715b.e15e8",
+        "id": "c6ff1d9b.4f5f78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 336.9688720703125,
-        "y": 425.74163818359375,
-        "z": "17040f2b.d4a821",
+        "x": 369.9688720703125,
+        "y": 464.74163818359375,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "96ed9e8f.b90f",
-                "f1e66bd.f624698",
-                "386c8b8a.515584"
+                "26b2f75.3503708",
+                "f64991bb.7d2d3",
+                "f13f2135.894b48"
             ]
         ]
     },
     {
-        "id": "96ed9e8f.b90f",
+        "id": "26b2f75.3503708",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 586,
-        "y": 625,
-        "z": "17040f2b.d4a821",
+        "x": 616,
+        "y": 1203,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "f9d6c529.483238",
-                "aec39761.70cfc8"
+                "6717edba.dd315c",
+                "9d26d203.bf1448"
             ]
         ]
     },
     {
-        "id": "f9d6c529.483238",
+        "id": "6717edba.dd315c",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 882.8438110351562,
-        "y": 580.1218872070312,
-        "z": "17040f2b.d4a821",
+        "x": 912.8438110351562,
+        "y": 1158.1218872070312,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "cb912ed0.0c0a3"
+                "84d1cb1a.eb2fc8"
             ]
         ]
     },
     {
-        "id": "aec39761.70cfc8",
+        "id": "9d26d203.bf1448",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 881.5,
-        "y": 659,
-        "z": "17040f2b.d4a821",
+        "x": 911.5,
+        "y": 1237,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "a260c7eb.1e65d8"
+                "2182e897.132d8"
             ]
         ]
     },
     {
-        "id": "a260c7eb.1e65d8",
+        "id": "2182e897.132d8",
         "type": "execute",
-        "name": "execute RestconfApiCallNode Create ethernet Service with token",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1193,
-        "y": 661,
-        "z": "17040f2b.d4a821",
+        "x": 1223,
+        "y": 1239,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "b31b1f14.b450e",
-                "31c0814c.e11a0e"
+                "1b911a1d.a19f46",
+                "ab8d3cb8.cfa08"
             ]
         ]
     },
     {
-        "id": "cb912ed0.0c0a3",
+        "id": "84d1cb1a.eb2fc8",
         "type": "execute",
-        "name": "execute RestconfApiCallNode Create ethernet Service without token",
+        "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\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1205,
-        "y": 584,
-        "z": "17040f2b.d4a821",
+        "x": 1235,
+        "y": 1162,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "31c0814c.e11a0e",
-                "b31b1f14.b450e"
+                "ab8d3cb8.cfa08",
+                "1b911a1d.a19f46"
             ]
         ]
     },
     {
-        "id": "b31b1f14.b450e",
+        "id": "1b911a1d.a19f46",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1626.5,
-        "y": 652,
-        "z": "17040f2b.d4a821",
+        "x": 1656.5,
+        "y": 1230,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "6b799b05.9369c4"
+                "21fe6b2e.6608f4"
             ]
         ]
     },
     {
-        "id": "6b799b05.9369c4",
+        "id": "21fe6b2e.6608f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1821,
-        "y": 645,
-        "z": "17040f2b.d4a821",
+        "x": 1851,
+        "y": 1223,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "401bdd4e.60ff34",
+        "id": "3680634b.3b9a5c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
         "comments": "",
-        "x": 1795.5,
-        "y": 583,
-        "z": "17040f2b.d4a821",
+        "x": 1825.5,
+        "y": 1161,
+        "z": "3b47dc40.0a0c44",
         "wires": []
     },
     {
-        "id": "31c0814c.e11a0e",
+        "id": "ab8d3cb8.cfa08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1611.5,
-        "y": 587,
-        "z": "17040f2b.d4a821",
+        "x": 1641.5,
+        "y": 1165,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "401bdd4e.60ff34"
+                "3680634b.3b9a5c"
             ]
         ]
     },
     {
-        "id": "f1e66bd.f624698",
+        "id": "161d9ba6.9cb994",
         "type": "switchNode",
         "name": "switch eth topo's provider-id",
         "xml": "<switch test='`$oof.vpn.access-provider-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 594,
-        "y": 173,
-        "z": "17040f2b.d4a821",
+        "x": 627,
+        "y": 212,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "daa01201.b40fe",
-                "ffd4b2da.f2213"
+                "5e06ab69.dbc5bc",
+                "85ad793.798f588"
             ]
         ]
     },
     {
-        "id": "daa01201.b40fe",
+        "id": "5e06ab69.dbc5bc",
         "type": "outcome",
         "name": "domain A's OTN topo's provider ID",
-        "xml": "<outcome value='`$domain-A.provider-id`'>\n\u0001",
+        "xml": "<outcome value='`$domain-A.provider-id`'>",
         "comments": "",
         "outputs": 1,
-        "x": 897.285888671875,
-        "y": 108.82177734375,
-        "z": "17040f2b.d4a821",
+        "x": 930.285888671875,
+        "y": 147.82177734375,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "647bcb79.cd9c24"
+                "319f4a6b.cd0bbe"
             ]
         ]
     },
     {
-        "id": "647bcb79.cd9c24",
+        "id": "319f4a6b.cd0bbe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1154.117431640625,
-        "y": 107.34027099609375,
-        "z": "17040f2b.d4a821",
+        "x": 1187.117431640625,
+        "y": 146.34027099609375,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "7c841c48.339f24"
+                "a3bb1ab9.1257c"
             ]
         ]
     },
     {
-        "id": "ffd4b2da.f2213",
+        "id": "85ad793.798f588",
         "type": "outcome",
         "name": "domain B's OTN topo's provider ID",
-        "xml": "<outcome value='`$domain-B.provider-id`'>\n\u0001",
+        "xml": "<outcome value='`$domain-B.provider-id`'>",
         "comments": "",
         "outputs": 1,
-        "x": 895,
-        "y": 212,
-        "z": "17040f2b.d4a821",
+        "x": 928,
+        "y": 251,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "ada6a164.5b7e9"
+                "91623acb.3dd5b"
             ]
         ]
     },
     {
-        "id": "7c841c48.339f24",
+        "id": "a3bb1ab9.1257c",
         "type": "set",
         "name": "set otn domain node",
         "xml": "<set>\n<parameter name='tmp.otn-domain.' value='`$domain-A.`' />\n",
         "comments": "",
-        "x": 1359,
-        "y": 106,
-        "z": "17040f2b.d4a821",
+        "x": 1392,
+        "y": 145,
+        "z": "3b47dc40.0a0c44",
         "wires": []
     },
     {
-        "id": "ada6a164.5b7e9",
+        "id": "91623acb.3dd5b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1150,
-        "y": 209,
-        "z": "17040f2b.d4a821",
+        "x": 1183,
+        "y": 248,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "24ca0ba6.6ddfe4"
+                "95015654.a72998"
             ]
         ]
     },
     {
-        "id": "24ca0ba6.6ddfe4",
+        "id": "95015654.a72998",
         "type": "set",
         "name": "set otn domain node",
         "xml": "<set>\n<parameter name='$tmp.otn-domain.' value='`$domain-B.`' />\n",
         "comments": "",
-        "x": 1354.882568359375,
-        "y": 207.65972900390625,
-        "z": "17040f2b.d4a821",
+        "x": 1387.882568359375,
+        "y": 246.65972900390625,
+        "z": "3b47dc40.0a0c44",
         "wires": []
     },
     {
-        "id": "386c8b8a.515584",
+        "id": "990d58ad.7400d8",
         "type": "switchNode",
         "name": "switch eth node ID",
         "xml": "<switch test='`$oof.vpn.access-node-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 600,
-        "y": 427,
-        "z": "17040f2b.d4a821",
+        "x": 639,
+        "y": 711,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "d91602b.4cd09",
-                "c018f42b.2b1a68"
+                "2ce24094.f713b",
+                "7ec071d2.b7a1f8"
             ]
         ]
     },
     {
-        "id": "d91602b.4cd09",
+        "id": "2ce24094.f713b",
         "type": "outcome",
         "name": "source eth node",
-        "xml": "<outcome value='`$oof.vpns[0].access-node-id`'>\n\u0001",
+        "xml": "<outcome value='`$oof.vpns[0].access-node-id`'>",
         "comments": "",
         "outputs": 1,
-        "x": 840.285888671875,
-        "y": 349.82177734375,
-        "z": "17040f2b.d4a821",
+        "x": 879.285888671875,
+        "y": 632.82177734375,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "fd2adb67.e7ca38"
+                "dd4b02f7.01e688"
             ]
         ]
     },
     {
-        "id": "fd2adb67.e7ca38",
+        "id": "dd4b02f7.01e688",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1044.117431640625,
-        "y": 349.34027099609375,
-        "z": "17040f2b.d4a821",
+        "x": 1083.117431640625,
+        "y": 632.3402709960938,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "ad11583e.e14ea8"
+                "aa1fe07a.cf8d18"
             ]
         ]
     },
     {
-        "id": "17b601bf.a39ace",
+        "id": "ddb0a3f1.d5a138",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1046,
-        "y": 469,
-        "z": "17040f2b.d4a821",
+        "x": 1085,
+        "y": 752,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "97fd4aa8.fd21b8"
+                "da3e33dd.52f4e8"
             ]
         ]
     },
     {
-        "id": "c018f42b.2b1a68",
+        "id": "7ec071d2.b7a1f8",
         "type": "outcome",
         "name": "dest eth node",
-        "xml": "<outcome value='`$oof.vpns[$oof.vpns_length].access-node-id`'>\n\u0001",
+        "xml": "<outcome value='`$oof.vpns[$oof.vpns_length].access-node-id`'>",
         "comments": "",
         "outputs": 1,
-        "x": 841,
-        "y": 469,
-        "z": "17040f2b.d4a821",
+        "x": 880,
+        "y": 752,
+        "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "17b601bf.a39ace"
+                "ddb0a3f1.d5a138"
             ]
         ]
     },
     {
-        "id": "ad11583e.e14ea8",
+        "id": "aa1fe07a.cf8d18",
         "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`' />",
         "comments": "",
-        "x": 1286,
-        "y": 350,
-        "z": "17040f2b.d4a821",
+        "x": 1325,
+        "y": 633,
+        "z": "3b47dc40.0a0c44",
         "wires": []
     },
     {
-        "id": "4add26c3.ec74e8",
+        "id": "163a9a7c.f94c4e",
         "type": "comment",
         "name": "cross domain OTN node is the dest of OTN tunnel",
         "info": "",
         "comments": "",
-        "x": 945,
-        "y": 306,
-        "z": "17040f2b.d4a821",
+        "x": 984,
+        "y": 589,
+        "z": "3b47dc40.0a0c44",
         "wires": []
     },
     {
-        "id": "15de3156.c96c3f",
+        "id": "295b6b41.b99cfc",
         "type": "comment",
         "name": "cross domain OTN node is the source of OTN tunnel",
         "info": "",
         "comments": "",
-        "x": 954,
-        "y": 429,
-        "z": "17040f2b.d4a821",
+        "x": 993,
+        "y": 712,
+        "z": "3b47dc40.0a0c44",
+        "wires": []
+    },
+    {
+        "id": "da3e33dd.52f4e8",
+        "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`' />",
+        "comments": "",
+        "x": 1333,
+        "y": 757,
+        "z": "3b47dc40.0a0c44",
+        "wires": []
+    },
+    {
+        "id": "78e806c9.b8028",
+        "type": "failure",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 877,
+        "y": 828,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "a1380a33.f7da"
+            ]
+        ]
+    },
+    {
+        "id": "f64991bb.7d2d3",
+        "type": "execute",
+        "name": "uni-tp-id contains src-pnf-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name='source' value='`$oof.vpn.tp-id`' />\n    <parameter name='target' value='`$tmp.oofsolutions-first-src-pnf-name`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 663,
+        "y": 827,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "78e806c9.b8028",
+                "c58e7233.0e544"
+            ]
+        ]
+    },
+    {
+        "id": "c58e7233.0e544",
+        "type": "failure",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 878,
+        "y": 876,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "716e2d25.6fe90c"
+            ]
+        ]
+    },
+    {
+        "id": "716e2d25.6fe90c",
+        "type": "execute",
+        "name": "uni-tp-id contains dst-pnf-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name='source' value='`$oof.vpn.tp-id`' />\n    <parameter name='target' value='`$tmp.oofsolutions-last-dst-pnf-name`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1087,
+        "y": 874,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "b2082b04.764078"
+            ]
+        ]
+    },
+    {
+        "id": "b2082b04.764078",
+        "type": "failure",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1301,
+        "y": 875,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "facf7dd6.b833c"
+            ]
+        ]
+    },
+    {
+        "id": "a1380a33.f7da",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1057,
+        "y": 825,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "77be498b.1e80d"
+            ]
+        ]
+    },
+    {
+        "id": "facf7dd6.b833c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1470,
+        "y": 872,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "5ad550e4.a3ef2"
+            ]
+        ]
+    },
+    {
+        "id": "2fce99ef.66ce96",
+        "type": "failure",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 858,
+        "y": 373,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "62b7c2e9.915bfc"
+            ]
+        ]
+    },
+    {
+        "id": "f13f2135.894b48",
+        "type": "execute",
+        "name": "uni-tp-id contains domain-A.network-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name='source' value='`$oof.vpn.tp-id`' />\n    <parameter name='target' value='`$domain-A.network-id`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 623,
+        "y": 372,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "2fce99ef.66ce96",
+                "c8a39e1a.853cd"
+            ]
+        ]
+    },
+    {
+        "id": "c8a39e1a.853cd",
+        "type": "failure",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 830,
+        "y": 423,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "9c03510d.95d8f8"
+            ]
+        ]
+    },
+    {
+        "id": "84bd363f.cecab",
+        "type": "failure",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1282,
+        "y": 420,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "319183ef.947ad4"
+            ]
+        ]
+    },
+    {
+        "id": "62b7c2e9.915bfc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1038,
+        "y": 370,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "feb246e9.3add2"
+            ]
+        ]
+    },
+    {
+        "id": "feb246e9.3add2",
+        "type": "set",
+        "name": "set otn domain node",
+        "xml": "<set>\n<parameter name='otn-domain.' value='`$domain-A.`' />\n",
+        "comments": "",
+        "x": 1242.882568359375,
+        "y": 368.65972900390625,
+        "z": "3b47dc40.0a0c44",
+        "wires": []
+    },
+    {
+        "id": "319183ef.947ad4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1451,
+        "y": 417,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "5f5c2180.97a72"
+            ]
+        ]
+    },
+    {
+        "id": "5f5c2180.97a72",
+        "type": "set",
+        "name": "set otn domain node",
+        "xml": "<set>\n<parameter name='$otn-domain.' value='`$domain-B.`' />\n",
+        "comments": "",
+        "x": 1655.882568359375,
+        "y": 415.65972900390625,
+        "z": "3b47dc40.0a0c44",
+        "wires": []
+    },
+    {
+        "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`' />",
+        "comments": "",
+        "x": 1269,
+        "y": 823,
+        "z": "3b47dc40.0a0c44",
         "wires": []
     },
     {
-        "id": "97fd4aa8.fd21b8",
+        "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`' />",
         "comments": "",
-        "x": 1294,
-        "y": 474,
-        "z": "17040f2b.d4a821",
+        "x": 1669,
+        "y": 872,
+        "z": "3b47dc40.0a0c44",
         "wires": []
+    },
+    {
+        "id": "9c03510d.95d8f8",
+        "type": "execute",
+        "name": "uni-tp-id contains domain-B.network-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name='source' value='`$oof.vpn.tp-id`' />\n    <parameter name='target' value='`$domain-B.network-id`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1059,
+        "y": 423,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "84bd363f.cecab"
+            ]
+        ]
     }
 ]
\ 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 10463711..58005857 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
@@ -1,1239 +1,1360 @@
-[
-  {
-    "id": "ca266b03.5b0c68",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 91.4998779296875,
-    "y": 34,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "9db70ac2.5a0448"
-      ]
-    ]
-  },
-  {
-    "id": "9db70ac2.5a0448",
-    "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
-    "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
-    "comments": "",
-    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-    "outputs": 1,
-    "x": 216.4998779296875,
-    "y": 360.00001525878906,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "f6e8674b.eb6ef8"
-      ]
-    ]
-  },
-  {
-    "id": "f6e8674b.eb6ef8",
-    "type": "method",
-    "name": "sotn-get-otn-tunnel-path-from-oof",
-    "xml": "<method rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 280.5,
-    "y": 453,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "d8a649df.dd5438"
-      ]
-    ]
-  },
-  {
-    "id": "4cb8a9dc.c82628",
-    "type": "execute",
-    "name": "execute RestApiCallNode getPath from OOF",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 763.4729614257812,
-    "y": 111.99600219726562,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c9ad9647.3c4fa8",
-        "65b028f1.fd8198"
-      ]
-    ]
-  },
-  {
-    "id": "c9ad9647.3c4fa8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1003.4731025695801,
-    "y": 135.9959716796875,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "43f1fecc.bf7f"
-      ]
-    ]
-  },
-  {
-    "id": "b1305a70.64e458",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing OOF api\" />\n",
-    "comments": "",
-    "x": 1142.4731369018555,
-    "y": 84.99606323242188,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "65b028f1.fd8198",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1002.4728889465332,
-    "y": 84.99606227874756,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "b1305a70.64e458"
-      ]
-    ]
-  },
-  {
-    "id": "13911536.3440bb",
-    "type": "comment",
-    "name": "OTN tunnel path computation",
-    "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
-    "comments": "",
-    "x": 734.9767608642578,
-    "y": 68.00000190734863,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "7480efc5.dbe2e",
-    "type": "for",
-    "name": "for vidx..otn-oof.otn-links_length[]",
-    "xml": "<for index='vidx' start='0' end='`$otn-oof.otn-links_length`' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 754.4727783203125,
-    "y": 421.2457275390625,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "b98c91e0.3766f"
-      ]
-    ]
-  },
-  {
-    "id": "689331c8.a7329",
-    "type": "comment",
-    "name": "Loop through OTN links",
-    "info": "",
-    "comments": "",
-    "x": 837.9730834960938,
-    "y": 500.74609375,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "b98c91e0.3766f",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 859,
-    "y": 612.2864990234375,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3a76e5ee.5f99aa",
-        "a8939d2.521b76"
-      ]
-    ]
-  },
-  {
-    "id": "3a76e5ee.5f99aa",
-    "type": "get-resource",
-    "name": "get-resource cross-link",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"logical-link\" \n\t\tkey=\"logical-link.link-name = $otn-oof.link-name \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.cross-link' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1126,
-    "y": 532.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "74ae6f25.c8093",
-        "d101f4ee.f9f8d8",
-        "7558125c.21685c"
-      ]
-    ]
-  },
-  {
-    "id": "74ae6f25.c8093",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1356.5,
-    "y": 477.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "a0d35b9e.4c4448"
-      ]
-    ]
-  },
-  {
-    "id": "d101f4ee.f9f8d8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1367.5,
-    "y": 534.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "aab3f9be.7515c8"
-      ]
-    ]
-  },
-  {
-    "id": "7558125c.21685c",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1361.5,
-    "y": 584.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c5929dad.e1e45"
-      ]
-    ]
-  },
-  {
-    "id": "aab3f9be.7515c8",
-    "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": 1528.5,
-    "y": 523.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "c5929dad.e1e45",
-    "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": 1526.5,
-    "y": 579.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "51d46963.f916e8",
-    "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[0].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 2318,
-    "y": 396.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "c5a99f90.0d85b",
-    "type": "comment",
-    "name": "get cross-domain-link information",
-    "info": "",
-    "comments": "",
-    "x": 1127,
-    "y": 493.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "a8939d2.521b76",
-    "type": "set",
-    "name": "set otn-oof.link-name",
-    "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].`' />",
-    "comments": "",
-    "x": 1108.5,
-    "y": 442.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "43f1fecc.bf7f",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1148.5001487731934,
-    "y": 133.74145698547363,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d8a649df.dd5438",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 521.4687614440918,
-    "y": 379.74163722991943,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "4cb8a9dc.c82628",
-        "7480efc5.dbe2e"
-      ]
-    ]
-  },
-  {
-    "id": "a0d35b9e.4c4448",
-    "type": "switchNode",
-    "name": "test cross-domain-link",
-    "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1562,
-    "y": 476,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "9c05dfa6.ba207"
-      ]
-    ]
-  },
-  {
-    "id": "9c05dfa6.ba207",
-    "type": "outcome",
-    "name": "outcome cross-domain-link",
-    "xml": "<outcome value='cross-domain-link'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1809,
-    "y": 477,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "ff68def.188c12"
-      ]
-    ]
-  },
-  {
-    "id": "1ed1e43f.527cac",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
-    "comments": "",
-    "x": 2154,
-    "y": 955,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "ff68def.188c12",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 2028,
-    "y": 479,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "1ed1e43f.527cac",
-        "51d46963.f916e8",
-        "44b19c4e.886594",
-        "5702d427.f65a4c"
-      ]
-    ]
-  },
-  {
-    "id": "2017012b.18bf6e",
-    "type": "comment",
-    "name": "setup variables",
-    "info": "",
-    "comments": "",
-    "x": 2286,
-    "y": 335,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "44b19c4e.886594",
-    "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=\"p-interface.interface-name = $tmp.src-ltpId \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2315,
-    "y": 485,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "675b31ba.fc29c",
-        "e7ba827c.7802e",
-        "3d3ce0b1.c355d"
-      ]
-    ]
-  },
-  {
-    "id": "675b31ba.fc29c",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2548.5,
-    "y": 446,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "8f945f43.0f6a1",
-        "35d184a7.0348bc"
-      ]
-    ]
-  },
-  {
-    "id": "e7ba827c.7802e",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2545.5,
-    "y": 504,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "9bcbfa8e.5a3ae8"
-      ]
-    ]
-  },
-  {
-    "id": "3d3ce0b1.c355d",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2548.5,
-    "y": 556,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c82ee5b.1546f18"
-      ]
-    ]
-  },
-  {
-    "id": "9bcbfa8e.5a3ae8",
-    "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": 2730.5,
-    "y": 508,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "c82ee5b.1546f18",
-    "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": 2718.5,
-    "y": 559,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "8f945f43.0f6a1",
-    "type": "set",
-    "name": "set tmp.src-pnf-name",
-    "xml": "<set>\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.src-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 2749,
-    "y": 393,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "35d184a7.0348bc",
-    "type": "get-resource",
-    "name": "get-resource src pnf",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2739,
-    "y": 448,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "9ea9cbf0.fa9328",
-        "aa8e1680.d1d798",
-        "dd38a5b5.866808"
-      ]
-    ]
-  },
-  {
-    "id": "9ea9cbf0.fa9328",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3022.5,
-    "y": 401,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "899a7ec6.41ab2"
-      ]
-    ]
-  },
-  {
-    "id": "aa8e1680.d1d798",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3014.5,
-    "y": 456,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "56667146.5a8cd"
-      ]
-    ]
-  },
-  {
-    "id": "dd38a5b5.866808",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3019.5,
-    "y": 513,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "49c4c4a9.a9af7c"
-      ]
-    ]
-  },
-  {
-    "id": "56667146.5a8cd",
-    "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": 3182.5,
-    "y": 459,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "49c4c4a9.a9af7c",
-    "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": 3171.5,
-    "y": 514,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "3a58b291.1cf89e",
-    "type": "set",
-    "name": "set domain A node ttp-id",
-    "xml": "<set>\n<parameter name='tmp.src-ttp-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 4234,
-    "y": 262,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "6baf1c09.23f524",
-    "type": "get-resource",
-    "name": "get-resource src TTP",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.src-ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4223,
-    "y": 333,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "e53fa55a.80c878"
-      ]
-    ]
-  },
-  {
-    "id": "e53fa55a.80c878",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4414.5,
-    "y": 330,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "fb4eb6f8.67d008"
-      ]
-    ]
-  },
-  {
-    "id": "fb4eb6f8.67d008",
-    "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",
-    "comments": "",
-    "x": 4627,
-    "y": 329,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "151d93fd.7167ec",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 4019,
-    "y": 512,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "fb4c025e.b4687",
-        "2b826247.b8392e"
-      ]
-    ]
-  },
-  {
-    "id": "a6f18660.f8abe8",
-    "type": "outcome",
-    "name": "tunnel-termination-point",
-    "xml": "<outcome value='tunnel-termination-point'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3815.16845703125,
-    "y": 325.48150634765625,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "45ebcf03.0e118"
-      ]
-    ]
-  },
-  {
-    "id": "1ff26720.4f6889",
-    "type": "for",
-    "name": "for each relationship",
-    "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3381.882568359375,
-    "y": 398.65972900390625,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "89b5166.0c594e8"
-      ]
-    ]
-  },
-  {
-    "id": "89b5166.0c594e8",
-    "type": "switchNode",
-    "name": "switch related-to",
-    "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3607.882568359375,
-    "y": 398.65972900390625,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "a6f18660.f8abe8",
-        "376f0574.e1601a"
-      ]
-    ]
-  },
-  {
-    "id": "899a7ec6.41ab2",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 3166.88232421875,
-    "y": 398.6556701660156,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "1ff26720.4f6889",
-        "29ff2ed5.ef4af2"
-      ]
-    ]
-  },
-  {
-    "id": "29ff2ed5.ef4af2",
-    "type": "set",
-    "name": "set domain A node-id and tpn",
-    "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n",
-    "comments": "",
-    "x": 3426,
-    "y": 309,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "376f0574.e1601a",
-    "type": "outcome",
-    "name": "network-resource",
-    "xml": "<outcome value='network-resource'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3806,
-    "y": 511,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "151d93fd.7167ec"
-      ]
-    ]
-  },
-  {
-    "id": "fb4c025e.b4687",
-    "type": "set",
-    "name": "set domain A network-id",
-    "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 4254,
-    "y": 442,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "45ebcf03.0e118",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 4017,
-    "y": 321,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3a58b291.1cf89e",
-        "6baf1c09.23f524"
-      ]
-    ]
-  },
-  {
-    "id": "2b826247.b8392e",
-    "type": "get-resource",
-    "name": "get-resource src network-resource",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4262,
-    "y": 523,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "f37dd233.a3308"
-      ]
-    ]
-  },
-  {
-    "id": "f37dd233.a3308",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4494.5,
-    "y": 519,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "5f1b14c5.d2a03c"
-      ]
-    ]
-  },
-  {
-    "id": "5f1b14c5.d2a03c",
-    "type": "set",
-    "name": "set domain A network-id, topo-id, client-id, etc",
-    "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n",
-    "comments": "",
-    "x": 4736,
-    "y": 513,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "5702d427.f65a4c",
-    "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=\"p-interface.interface-name = $tmp.dst-ltpId \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2269,
-    "y": 851,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "a50293a4.5e79e",
-        "b4058651.f77518",
-        "b61d9ed.988616"
-      ]
-    ]
-  },
-  {
-    "id": "a50293a4.5e79e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2502.5,
-    "y": 812,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "46502cec.4be0b4",
-        "a897aaea.70dd38"
-      ]
-    ]
-  },
-  {
-    "id": "b4058651.f77518",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2499.5,
-    "y": 870,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "da3111af.853e5"
-      ]
-    ]
-  },
-  {
-    "id": "b61d9ed.988616",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2502.5,
-    "y": 922,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c09ee4e6.15ed68"
-      ]
-    ]
-  },
-  {
-    "id": "c09ee4e6.15ed68",
-    "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": 2672.5,
-    "y": 925,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "da3111af.853e5",
-    "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": 2684.5,
-    "y": 874,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "a897aaea.70dd38",
-    "type": "get-resource",
-    "name": "get-resource dst pnf",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2693,
-    "y": 814,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "b6f4d1fe.0b8da",
-        "46d13a0d.575974",
-        "94eeb806.b26748"
-      ]
-    ]
-  },
-  {
-    "id": "46502cec.4be0b4",
-    "type": "set",
-    "name": "set tmp.dst-pnf-name",
-    "xml": "<set>\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 2703,
-    "y": 759,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "94eeb806.b26748",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2973.5,
-    "y": 879,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "efc946ae.7bf158"
-      ]
-    ]
-  },
-  {
-    "id": "46d13a0d.575974",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2968.5,
-    "y": 822,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "feb7d1d7.3486e"
-      ]
-    ]
-  },
-  {
-    "id": "b6f4d1fe.0b8da",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2976.5,
-    "y": 767,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "100cc1d.c89dc3e"
-      ]
-    ]
-  },
-  {
-    "id": "feb7d1d7.3486e",
-    "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": 3136.5,
-    "y": 825,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "efc946ae.7bf158",
-    "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": 3125.5,
-    "y": 880,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "100cc1d.c89dc3e",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 3120.88232421875,
-    "y": 764.6556701660156,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3e2a3b9f.7272c4",
-        "b6c39e63.6b538"
-      ]
-    ]
-  },
-  {
-    "id": "3e2a3b9f.7272c4",
-    "type": "for",
-    "name": "for each relationship",
-    "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3335.882568359375,
-    "y": 764.6597290039062,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c77ddef5.18c3e"
-      ]
-    ]
-  },
-  {
-    "id": "c77ddef5.18c3e",
-    "type": "switchNode",
-    "name": "switch related-to",
-    "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3561.882568359375,
-    "y": 764.6597290039062,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3576c9a1.155776",
-        "131550c4.86635f"
-      ]
-    ]
-  },
-  {
-    "id": "b6c39e63.6b538",
-    "type": "set",
-    "name": "set domain B node-id and tpn",
-    "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n",
-    "comments": "",
-    "x": 3380,
-    "y": 675,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "3f07ba63.1a2cc6",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 3973,
-    "y": 878,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "68ee333a.5e149c",
-        "57b260c0.16164"
-      ]
-    ]
-  },
-  {
-    "id": "3576c9a1.155776",
-    "type": "outcome",
-    "name": "tunnel-termination-point",
-    "xml": "<outcome value='tunnel-termination-point'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3769.16845703125,
-    "y": 691.4815063476562,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "63e95b18.c47c14"
-      ]
-    ]
-  },
-  {
-    "id": "131550c4.86635f",
-    "type": "outcome",
-    "name": "network-resource",
-    "xml": "<outcome value='network-resource'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3760,
-    "y": 877,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3f07ba63.1a2cc6"
-      ]
-    ]
-  },
-  {
-    "id": "63e95b18.c47c14",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 3971,
-    "y": 687,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "e883466f.992618",
-        "f5edbf24.92d52"
-      ]
-    ]
-  },
-  {
-    "id": "e883466f.992618",
-    "type": "set",
-    "name": "set domain B node ttp-id",
-    "xml": "<set>\n<parameter name='tmp.dst-ttp-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 4188,
-    "y": 628,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "f5edbf24.92d52",
-    "type": "get-resource",
-    "name": "get-resource dst TTP",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.dst-ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4177,
-    "y": 699,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "70320551.17869c"
-      ]
-    ]
-  },
-  {
-    "id": "70320551.17869c",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4368.5,
-    "y": 696,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "78931a0a.3bac14"
-      ]
-    ]
-  },
-  {
-    "id": "78931a0a.3bac14",
-    "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": 4581,
-    "y": 695,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "68ee333a.5e149c",
-    "type": "set",
-    "name": "set domain B network-id",
-    "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 4208,
-    "y": 808,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "57b260c0.16164",
-    "type": "get-resource",
-    "name": "get-resource dst network-resource",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4216,
-    "y": 889,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "acb8778c.80c2b8"
-      ]
-    ]
-  },
-  {
-    "id": "acb8778c.80c2b8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4448.5,
-    "y": 885,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "24fd155e.59dcba"
-      ]
-    ]
-  },
-  {
-    "id": "24fd155e.59dcba",
-    "type": "set",
-    "name": "set domain B network-id, topo-id, client-id, etc",
-    "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n",
-    "comments": "",
-    "x": 4690,
-    "y": 879,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  }
+[
+    {
+        "id": "aa75113b.2c42b8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 136,
+        "y": 78,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "ab15dc15.738968"
+            ]
+        ]
+    },
+    {
+        "id": "ab15dc15.738968",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 261,
+        "y": 404.00001525878906,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a46085e4.dea2f"
+            ]
+        ]
+    },
+    {
+        "id": "a46085e4.dea2f",
+        "type": "method",
+        "name": "sotn-get-otn-tunnel-path-from-oof",
+        "xml": "<method rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 325.0001220703125,
+        "y": 497,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "7d5a0cd3.c6dfbc"
+            ]
+        ]
+    },
+    {
+        "id": "f51f5245.de05e8",
+        "type": "execute",
+        "name": "execute RestApiCallNode getPath from OOF",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 807.9730834960938,
+        "y": 155.99600219726562,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "8059dde9.1ce2e",
+                "dd740bdc.617d78"
+            ]
+        ]
+    },
+    {
+        "id": "8059dde9.1ce2e",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1047.9732246398926,
+        "y": 179.9959716796875,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "35b68c0d.85ca94"
+            ]
+        ]
+    },
+    {
+        "id": "6c823726.8cfc2",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing OOF api\" />\n",
+        "comments": "",
+        "x": 1186.973258972168,
+        "y": 128.99606323242188,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "dd740bdc.617d78",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1046.9730110168457,
+        "y": 128.99606227874756,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "6c823726.8cfc2"
+            ]
+        ]
+    },
+    {
+        "id": "1cad6ca3.0c0a23",
+        "type": "comment",
+        "name": "OTN tunnel path computation",
+        "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
+        "comments": "",
+        "x": 779.4768829345703,
+        "y": 112.00000190734863,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "500e653c.02a91c",
+        "type": "for",
+        "name": "for vidx..otn-oof.solutions_length[]",
+        "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 798.972900390625,
+        "y": 465.2457275390625,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "6dab679f.e9004"
+            ]
+        ]
+    },
+    {
+        "id": "df52b38a.7717c",
+        "type": "comment",
+        "name": "Loop through OTN links",
+        "info": "",
+        "comments": "",
+        "x": 882.4732055664062,
+        "y": 544.74609375,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "6dab679f.e9004",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 903.5001220703125,
+        "y": 656.2864990234375,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "58b38e8f.68cb58",
+                "31a7d8e8.5f496"
+            ]
+        ]
+    },
+    {
+        "id": "58b38e8f.68cb58",
+        "type": "get-resource",
+        "name": "get-resource cross-link",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"logical-link\" \n\t\tkey=\"logical-link.link-name = $otn-oof.link-name\"\n        pfx='tmp.aai.cross-link' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1170.5001220703125,
+        "y": 576.2864685058594,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a7dfe4ca.7050a8",
+                "147899e8.194c7e",
+                "bd646a50.9ca6d"
+            ]
+        ]
+    },
+    {
+        "id": "bd646a50.9ca6d",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1362.0001220703125,
+        "y": 521.2864685058594,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "7d949923.feaea8"
+            ]
+        ]
+    },
+    {
+        "id": "a7dfe4ca.7050a8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1389.0001220703125,
+        "y": 756.2864990234375,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "6604b8e.b3db548"
+            ]
+        ]
+    },
+    {
+        "id": "147899e8.194c7e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1383.0001220703125,
+        "y": 806.2864990234375,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "61e58c1.1c151f4"
+            ]
+        ]
+    },
+    {
+        "id": "6604b8e.b3db548",
+        "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": 1550.0001220703125,
+        "y": 745.2864990234375,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "61e58c1.1c151f4",
+        "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": 1548.0001220703125,
+        "y": 801.2864990234375,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "3a661a62.460126",
+        "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[0].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`\" />\n\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`\" />\n\n\n",
+        "comments": "",
+        "x": 2362.5001220703125,
+        "y": 440.2864685058594,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "a01c1aa6.b32a",
+        "type": "comment",
+        "name": "get cross-domain-link information",
+        "info": "",
+        "comments": "",
+        "x": 1171.5001220703125,
+        "y": 537.2864685058594,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "31a7d8e8.5f496",
+        "type": "set",
+        "name": "set otn-oof.link-name",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />",
+        "comments": "",
+        "x": 1153.0001220703125,
+        "y": 486.2864685058594,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "35b68c0d.85ca94",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1193.0002708435059,
+        "y": 177.74145698547363,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7d5a0cd3.c6dfbc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 565.9688835144043,
+        "y": 423.74163722991943,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "500e653c.02a91c",
+                "f51f5245.de05e8"
+            ]
+        ]
+    },
+    {
+        "id": "40299798.13bc",
+        "type": "switchNode",
+        "name": "test cross-domain-link",
+        "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1677.5001220703125,
+        "y": 521,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "53a2c424.a12b74"
+            ]
+        ]
+    },
+    {
+        "id": "53a2c424.a12b74",
+        "type": "outcome",
+        "name": "outcome cross-domain",
+        "xml": "<outcome value='cross-domain'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1913.5001220703125,
+        "y": 522,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "7c9bf405.132f7c"
+            ]
+        ]
+    },
+    {
+        "id": "dd179bba.27e578",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2198.5001220703125,
+        "y": 999,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "7c9bf405.132f7c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2116.5001220703125,
+        "y": 523,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "dd179bba.27e578",
+                "3a661a62.460126",
+                "a736e107.ab857",
+                "51dd454b.e64094"
+            ]
+        ]
+    },
+    {
+        "id": "b97c4b80.2182d",
+        "type": "comment",
+        "name": "setup variables",
+        "info": "",
+        "comments": "",
+        "x": 2330.5001220703125,
+        "y": 379,
+        "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",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2593.0001220703125,
+        "y": 490,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "b104de88.84b78"
+            ]
+        ]
+    },
+    {
+        "id": "a603f43.0659d88",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2590.0001220703125,
+        "y": 548,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "8496f5b4.9321e8"
+            ]
+        ]
+    },
+    {
+        "id": "ed057305.d13bc",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2593.0001220703125,
+        "y": 600,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "1dbdbb79.fd0ced"
+            ]
+        ]
+    },
+    {
+        "id": "8496f5b4.9321e8",
+        "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": 2775.0001220703125,
+        "y": 552,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "1dbdbb79.fd0ced",
+        "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": 2763.0001220703125,
+        "y": 603,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "94adb9b9.7a0948",
+        "type": "set",
+        "name": "set tmp.src-pnf-name",
+        "xml": "<set>\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.src-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 2872.5,
+        "y": 445,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "a5379b59.d56668",
+        "type": "get-resource",
+        "name": "get-resource src pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2871.5,
+        "y": 488,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "fc1e5cdb.f87da8",
+                "c1dbffa0.3a6ef8",
+                "e17cdd49.4fcf08"
+            ]
+        ]
+    },
+    {
+        "id": "fc1e5cdb.f87da8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3067.0001220703125,
+        "y": 445,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "372db61f.e21a7a"
+            ]
+        ]
+    },
+    {
+        "id": "c1dbffa0.3a6ef8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3059.0001220703125,
+        "y": 500,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "8f21b6ce.dd76a"
+            ]
+        ]
+    },
+    {
+        "id": "e17cdd49.4fcf08",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3064.0001220703125,
+        "y": 557,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "e804e037.dd4f"
+            ]
+        ]
+    },
+    {
+        "id": "8f21b6ce.dd76a",
+        "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": 3227.0001220703125,
+        "y": 503,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "e804e037.dd4f",
+        "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": 3216.0001220703125,
+        "y": 558,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "e0784723.78ca28",
+        "type": "set",
+        "name": "set domain A node ttp-id",
+        "xml": "<set>\n<parameter name='tmp.src-ttp-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4278.5001220703125,
+        "y": 306,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "1b6b3639.216dba",
+        "type": "get-resource",
+        "name": "get-resource src TTP",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.src-ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4267.5001220703125,
+        "y": 377,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "ac3848e1.acfdf8"
+            ]
+        ]
+    },
+    {
+        "id": "ac3848e1.acfdf8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4459.0001220703125,
+        "y": 374,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "ebf0e7da.b09cb"
+            ]
+        ]
+    },
+    {
+        "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",
+        "comments": "",
+        "x": 4671.5001220703125,
+        "y": 373,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "ae40696e.4ae89",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4063.5001220703125,
+        "y": 556,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a860374.60c54c8",
+                "f3ee54c1.b5d84"
+            ]
+        ]
+    },
+    {
+        "id": "577de1c9.7d7528",
+        "type": "outcome",
+        "name": "tunnel-termination-point",
+        "xml": "<outcome value='tunnel-termination-point'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3859.6685791015625,
+        "y": 369.48150634765625,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "2ec73e0f.7a316a"
+            ]
+        ]
+    },
+    {
+        "id": "3f827e10.2f07d2",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3426.3826904296875,
+        "y": 442.65972900390625,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "7df05538.ae1e24"
+            ]
+        ]
+    },
+    {
+        "id": "7df05538.ae1e24",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3652.3826904296875,
+        "y": 442.65972900390625,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "577de1c9.7d7528",
+                "1569d56e.fb5f8b"
+            ]
+        ]
+    },
+    {
+        "id": "372db61f.e21a7a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3211.3824462890625,
+        "y": 442.6556701660156,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "3f827e10.2f07d2",
+                "9cbdf6a0.b391f"
+            ]
+        ]
+    },
+    {
+        "id": "9cbdf6a0.b391f",
+        "type": "set",
+        "name": "set domain A node-id and tpn",
+        "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n",
+        "comments": "",
+        "x": 3470.5001220703125,
+        "y": 353,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "1569d56e.fb5f8b",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3850.5001220703125,
+        "y": 555,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "ae40696e.4ae89"
+            ]
+        ]
+    },
+    {
+        "id": "a860374.60c54c8",
+        "type": "set",
+        "name": "set domain A network-id",
+        "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4298.5001220703125,
+        "y": 486,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "2ec73e0f.7a316a",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4061.5001220703125,
+        "y": 365,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "e0784723.78ca28",
+                "1b6b3639.216dba"
+            ]
+        ]
+    },
+    {
+        "id": "f3ee54c1.b5d84",
+        "type": "get-resource",
+        "name": "get-resource src network-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4306.5001220703125,
+        "y": 567,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "9ea34049.8c12a8"
+            ]
+        ]
+    },
+    {
+        "id": "9ea34049.8c12a8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4539.0001220703125,
+        "y": 563,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "c512a46.74a5bd8"
+            ]
+        ]
+    },
+    {
+        "id": "c512a46.74a5bd8",
+        "type": "set",
+        "name": "set domain A network-id, topo-id, client-id, etc",
+        "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n",
+        "comments": "",
+        "x": 4780.5001220703125,
+        "y": 557,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "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",
+        "comments": "",
+        "outputs": 1,
+        "x": 2313.5001220703125,
+        "y": 895,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a793d2c3.cd625",
+                "8024d4d5.2b62d8",
+                "765b5b90.f1ecd4"
+            ]
+        ]
+    },
+    {
+        "id": "a793d2c3.cd625",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2547.0001220703125,
+        "y": 856,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "75eb9694.598e48"
+            ]
+        ]
+    },
+    {
+        "id": "8024d4d5.2b62d8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2544.0001220703125,
+        "y": 914,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "612d2397.585244"
+            ]
+        ]
+    },
+    {
+        "id": "765b5b90.f1ecd4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2547.0001220703125,
+        "y": 966,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a08bb92f.3f7318"
+            ]
+        ]
+    },
+    {
+        "id": "a08bb92f.3f7318",
+        "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": 2717.0001220703125,
+        "y": 969,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "612d2397.585244",
+        "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": 2729.0001220703125,
+        "y": 918,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "670f7157.4b83f",
+        "type": "get-resource",
+        "name": "get-resource dst pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2825.5,
+        "y": 859,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "3389e479.7caf4c",
+                "a22904b1.12c91",
+                "3f4df7a2.550db8"
+            ]
+        ]
+    },
+    {
+        "id": "fbc3aa3e.92a1d",
+        "type": "set",
+        "name": "set tmp.dst-pnf-name",
+        "xml": "<set>\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 2830.5,
+        "y": 807,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "3f4df7a2.550db8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3018.0001220703125,
+        "y": 923,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a7bbc350.7f29"
+            ]
+        ]
+    },
+    {
+        "id": "a22904b1.12c91",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3013.0001220703125,
+        "y": 866,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a788922c.a2883"
+            ]
+        ]
+    },
+    {
+        "id": "3389e479.7caf4c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3021.0001220703125,
+        "y": 811,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "b1d95d9.2f8af2"
+            ]
+        ]
+    },
+    {
+        "id": "a788922c.a2883",
+        "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": 3181.0001220703125,
+        "y": 869,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "a7bbc350.7f29",
+        "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": 3170.0001220703125,
+        "y": 924,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "b1d95d9.2f8af2",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3165.3824462890625,
+        "y": 808.6556701660156,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "b971a7f5.c553f",
+                "861cb0b.d019fd"
+            ]
+        ]
+    },
+    {
+        "id": "b971a7f5.c553f",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3380.3826904296875,
+        "y": 808.6597290039062,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "ba0c1a8c.88af28"
+            ]
+        ]
+    },
+    {
+        "id": "ba0c1a8c.88af28",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3606.3826904296875,
+        "y": 808.6597290039062,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "799147c0.a8a33",
+                "f903181b.00f37"
+            ]
+        ]
+    },
+    {
+        "id": "861cb0b.d019fd",
+        "type": "set",
+        "name": "set domain B node-id and tpn",
+        "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n",
+        "comments": "",
+        "x": 3424.5001220703125,
+        "y": 719,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "802f4f2.687563",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4017.5001220703125,
+        "y": 922,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "d4d32344.490fe8",
+                "1ab02c14.0e8e64"
+            ]
+        ]
+    },
+    {
+        "id": "799147c0.a8a33",
+        "type": "outcome",
+        "name": "tunnel-termination-point",
+        "xml": "<outcome value='tunnel-termination-point'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3813.6685791015625,
+        "y": 735.4815063476562,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "9e4db8b6.012fb"
+            ]
+        ]
+    },
+    {
+        "id": "f903181b.00f37",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3804.5001220703125,
+        "y": 921,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "802f4f2.687563"
+            ]
+        ]
+    },
+    {
+        "id": "9e4db8b6.012fb",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4015.5001220703125,
+        "y": 731,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "99609484.86254",
+                "f094147a.c54bb8"
+            ]
+        ]
+    },
+    {
+        "id": "99609484.86254",
+        "type": "set",
+        "name": "set domain B node ttp-id",
+        "xml": "<set>\n<parameter name='tmp.dst-ttp-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4232.5001220703125,
+        "y": 672,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "f094147a.c54bb8",
+        "type": "get-resource",
+        "name": "get-resource dst TTP",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.dst-ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4221.5001220703125,
+        "y": 743,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "96cf01de.ff5148"
+            ]
+        ]
+    },
+    {
+        "id": "96cf01de.ff5148",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4413.0001220703125,
+        "y": 740,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "5bd66639.66f16"
+            ]
+        ]
+    },
+    {
+        "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",
+        "name": "set domain B network-id",
+        "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4252.5001220703125,
+        "y": 852,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "1ab02c14.0e8e64",
+        "type": "get-resource",
+        "name": "get-resource dst network-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4260.5001220703125,
+        "y": 933,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "e204fe22.e747c8"
+            ]
+        ]
+    },
+    {
+        "id": "e204fe22.e747c8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4493.0001220703125,
+        "y": 929,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "c2250516.6a88f"
+            ]
+        ]
+    },
+    {
+        "id": "c2250516.6a88f",
+        "type": "set",
+        "name": "set domain B network-id, topo-id, client-id, etc",
+        "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n",
+        "comments": "",
+        "x": 4734.5001220703125,
+        "y": 923,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "b104de88.84b78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2682,
+        "y": 366,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a5379b59.d56668"
+            ]
+        ]
+    },
+    {
+        "id": "75eb9694.598e48",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2637,
+        "y": 744,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "670f7157.4b83f"
+            ]
+        ]
+    },
+    {
+        "id": "c0faec82.816fb8",
+        "type": "switchNode",
+        "name": "test $vidx",
+        "xml": "<switch test='`$vidx`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1622,
+        "y": 602,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "b7d58fe7.9f74b8",
+                "dc6562ba.9ee77"
+            ]
+        ]
+    },
+    {
+        "id": "b7d58fe7.9f74b8",
+        "type": "outcome",
+        "name": "outcome first",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1787,
+        "y": 580,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "197e1ba0.21ad04"
+            ]
+        ]
+    },
+    {
+        "id": "dc6562ba.9ee77",
+        "type": "outcome",
+        "name": "outcome last",
+        "xml": "<outcome value='`$otn-oof.solutions_length - 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1786,
+        "y": 641,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "1e901248.1aaca6"
+            ]
+        ]
+    },
+    {
+        "id": "197e1ba0.21ad04",
+        "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[0].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.oofsolutions-first-src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[1].relationship-value`\" />\n\n\n\n",
+        "comments": "",
+        "x": 1980,
+        "y": 582,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "1e901248.1aaca6",
+        "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[1].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.oofsolutions-last-dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`\" />\n",
+        "comments": "",
+        "x": 1979,
+        "y": 640,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "7d949923.feaea8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1496,
+        "y": 523,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "40299798.13bc",
+                "c0faec82.816fb8"
+            ]
+        ]
+    }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json
index 811602d5..119b8fda 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "92076785.102998",
+        "id": "9fd2e6b.eda7a18",
         "type": "for",
         "name": "for each sotn-get-request-input-param",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 257,
-        "y": 366.6666383743286,
-        "z": "12466ca0.33d983",
+        "x": 323,
+        "y": 423.6666383743286,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "1481334b.aa109d"
+                "61a5fd01.4ba864"
             ]
         ]
     },
     {
-        "id": "d17e9aae.69c2d8",
+        "id": "78b38914.249678",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 89.3332290649414,
-        "y": 29,
-        "z": "12466ca0.33d983",
+        "x": 155.3332290649414,
+        "y": 86,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "28ba91d2.47447e"
+                "2dca576b.96f79"
             ]
         ]
     },
     {
-        "id": "28ba91d2.47447e",
+        "id": "2dca576b.96f79",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -38,206 +38,206 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 234.33323287963867,
-        "y": 110.0000171661377,
-        "z": "12466ca0.33d983",
+        "x": 300.3332328796387,
+        "y": 167.0000171661377,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "bfc0526a.9023d"
+                "be702e8f.3597d"
             ]
         ]
     },
     {
-        "id": "bfc0526a.9023d",
+        "id": "be702e8f.3597d",
         "type": "method",
         "name": "sotn-get-vf-module-uni-param",
         "xml": "<method rpc='sotn-get-vf-module-uni-param' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 222.3333511352539,
-        "y": 198,
-        "z": "12466ca0.33d983",
+        "x": 288.3333511352539,
+        "y": 255,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "b8fc2441.d8f338"
+                "66dbd2c2.e849f4"
             ]
         ]
     },
     {
-        "id": "b8fc2441.d8f338",
+        "id": "66dbd2c2.e849f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 229.33324432373047,
-        "y": 284.0000581741333,
-        "z": "12466ca0.33d983",
+        "x": 295.33324432373047,
+        "y": 341.0000581741333,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "92076785.102998"
+                "9fd2e6b.eda7a18"
             ]
         ]
     },
     {
-        "id": "1481334b.aa109d",
+        "id": "61a5fd01.4ba864",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 513.2326469421387,
-        "y": 369.0103905200958,
-        "z": "12466ca0.33d983",
+        "x": 579.2326469421387,
+        "y": 426.0103905200958,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "397c4a4d.4ed016",
-                "2bdd888b.6d1ef8",
-                "595a4395.a6883c",
-                "ea4e21ab.628e5"
+                "5dbf7bde.42db34",
+                "74aefc5a.45af6c",
+                "7bedb246.58597c",
+                "a67a2d36.3001e"
             ]
         ]
     },
     {
-        "id": "397c4a4d.4ed016",
+        "id": "5dbf7bde.42db34",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 733.7332763671875,
-        "y": 478.0107421875,
-        "z": "12466ca0.33d983",
+        "x": 799.7332763671875,
+        "y": 535.0107421875,
+        "z": "f05faea.fedcdd",
         "wires": []
     },
     {
-        "id": "595a4395.a6883c",
+        "id": "7bedb246.58597c",
         "type": "switchNode",
-        "name": "switch tpId",
-        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tpId'`\">\n",
+        "name": "switch tp-id",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tp-id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.7326431274414,
-        "y": 296.01042914390564,
-        "z": "12466ca0.33d983",
+        "x": 801.7326431274414,
+        "y": 353.01042914390564,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "7907fc56.fc4374"
+                "2c679a4f.e5d4f6"
             ]
         ]
     },
     {
-        "id": "7907fc56.fc4374",
+        "id": "2c679a4f.e5d4f6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 910.7330360412598,
-        "y": 294.01051592826843,
-        "z": "12466ca0.33d983",
+        "x": 976.7330360412598,
+        "y": 351.01051592826843,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "6a4f5caf.0f6f14"
+                "8c700565.606b5"
             ]
         ]
     },
     {
-        "id": "6a4f5caf.0f6f14",
+        "id": "8c700565.606b5",
         "type": "set",
-        "name": "set tpId",
-        "xml": "<set>\n<parameter name='prop.uni.tpId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
+        "name": "set tp-id",
+        "xml": "<set>\n<parameter name='prop.uni.tp-id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1085.7331199645996,
-        "y": 295.61056327819824,
-        "z": "12466ca0.33d983",
+        "x": 1151.7331199645996,
+        "y": 352.61056327819824,
+        "z": "f05faea.fedcdd",
         "wires": []
     },
     {
-        "id": "2bdd888b.6d1ef8",
+        "id": "74aefc5a.45af6c",
         "type": "switchNode",
         "name": "switch id",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 719.7319984436035,
-        "y": 247.3970763683319,
-        "z": "12466ca0.33d983",
+        "x": 785.7319984436035,
+        "y": 304.3970763683319,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "7b22e7e.bf6e718"
+                "4134909c.9e2bb"
             ]
         ]
     },
     {
-        "id": "7b22e7e.bf6e718",
+        "id": "4134909c.9e2bb",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 911.7319221496582,
-        "y": 247.39708304405212,
-        "z": "12466ca0.33d983",
+        "x": 977.7319221496582,
+        "y": 304.3970830440521,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "ab2d859f.6acac8"
+                "9aa99334.9686f"
             ]
         ]
     },
     {
-        "id": "ab2d859f.6acac8",
+        "id": "9aa99334.9686f",
         "type": "set",
         "name": "set id",
         "xml": "<set>\n<parameter name='prop.uni.id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1055.7321891784668,
-        "y": 246.99721121788025,
-        "z": "12466ca0.33d983",
+        "x": 1121.7321891784668,
+        "y": 303.99721121788025,
+        "z": "f05faea.fedcdd",
         "wires": []
     },
     {
-        "id": "ea4e21ab.628e5",
+        "id": "a67a2d36.3001e",
         "type": "switchNode",
         "name": "switch cVLAN",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'cVLAN'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 738,
-        "y": 374,
-        "z": "12466ca0.33d983",
+        "x": 804,
+        "y": 431,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "c123c0b4.3c868"
+                "acaffd98.694c98"
             ]
         ]
     },
     {
-        "id": "c123c0b4.3c868",
+        "id": "acaffd98.694c98",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 906,
-        "y": 371,
-        "z": "12466ca0.33d983",
+        "x": 972,
+        "y": 428,
+        "z": "f05faea.fedcdd",
         "wires": [
             [
-                "5bf6b706.8b8148"
+                "abb07b4b.b62dc8"
             ]
         ]
     },
     {
-        "id": "5bf6b706.8b8148",
+        "id": "abb07b4b.b62dc8",
         "type": "set",
         "name": "set cVLAN",
         "xml": "<set>\n<parameter name='prop.uni.cVLAN' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1081.0000839233398,
-        "y": 372.6000473499298,
-        "z": "12466ca0.33d983",
+        "x": 1147.0000839233398,
+        "y": 429.6000473499298,
+        "z": "f05faea.fedcdd",
         "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-l2vpn-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json
index dd1ba06d..95961a02 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "f06d79a.4f13a08",
+        "id": "c0a79856.b8a9a8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 120,
-        "y": 66,
-        "z": "62554968.e321b8",
+        "x": 129,
+        "y": 75,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "e698fb0d.22ccb"
+                "f23fb4.004e985"
             ]
         ]
     },
     {
-        "id": "e698fb0d.22ccb",
+        "id": "f23fb4.004e985",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,350 +22,346 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 251.2856903076172,
-        "y": 115.23810863494873,
-        "z": "62554968.e321b8",
+        "x": 260.2856903076172,
+        "y": 124.23810863494873,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "c77e5b12.74fa8"
+                "16bd01d7.cde55e"
             ]
         ]
     },
     {
-        "id": "c77e5b12.74fa8",
+        "id": "16bd01d7.cde55e",
         "type": "method",
         "name": "method sotn-vf-operation-l2vpn-activate",
         "xml": "<method rpc='sotn-vf-operation-l2vpn-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 254.42861938476562,
-        "y": 200.00003242492676,
-        "z": "62554968.e321b8",
+        "x": 263.4286193847656,
+        "y": 209.00003242492676,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "dc8a4134.633b38"
+                "4bca7263.f9b50c"
             ]
         ]
     },
     {
-        "id": "dc8a4134.633b38",
+        "id": "4bca7263.f9b50c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 622.2380447387695,
-        "y": 414.66666814964265,
-        "z": "62554968.e321b8",
+        "x": 631.2380447387695,
+        "y": 423.66666814964265,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "6485c0f8.91ce08",
-                "a02d1e2f.e50b18",
-                "c0d6a6a1.052f28",
-                "aff44c8.fd218b",
-                "cdefed21.97b52",
-                "ef33383b.0eb5c8",
-                "6bb0bfe6.f5358"
+                "89ba9e4f.322f08",
+                "b6b036c1.4e053",
+                "a1814ef6.4e6ba"
             ]
         ]
     },
     {
-        "id": "6485c0f8.91ce08",
+        "id": "213a5120.a6687e",
         "type": "set",
         "name": "set vnf-level-oper-status to Active",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",
         "comments": "",
-        "x": 1037.3850173950195,
-        "y": 601.6705513000488,
-        "z": "62554968.e321b8",
+        "x": 1046.3850173950195,
+        "y": 610.6705513000488,
+        "z": "498236f1.856f48",
         "wires": []
     },
     {
-        "id": "a02d1e2f.e50b18",
+        "id": "89ba9e4f.322f08",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 957.5717086791992,
-        "y": 727.5970888137817,
-        "z": "62554968.e321b8",
+        "x": 966.5717086791992,
+        "y": 736.5970888137817,
+        "z": "498236f1.856f48",
         "wires": []
     },
     {
-        "id": "c0d6a6a1.052f28",
+        "id": "b6b036c1.4e053",
         "type": "set",
         "name": "set vnf-index and vnf-object-path",
-        "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",
+        "xml": "<set>\n<!--<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />-->\n<!--<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />-->\n\n<parameter name='vnfId' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vf-module-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />\n",
         "comments": "",
-        "x": 1043.571662902832,
-        "y": 549.5968055725098,
-        "z": "62554968.e321b8",
+        "x": 1052.571662902832,
+        "y": 558.5968055725098,
+        "z": "498236f1.856f48",
         "wires": []
     },
     {
-        "id": "aff44c8.fd218b",
+        "id": "951505a8.4ab128",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1052.0000610351562,
-        "y": 304.00000545661896,
-        "z": "62554968.e321b8",
+        "x": 1061.0000610351562,
+        "y": 313.00000545661896,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "c419b86f.420228",
-                "5e5514b0.5b9124",
-                "dab73261.53c13"
+                "298b7800.074bc",
+                "302f9230.c82bc6",
+                "3ee80cd1.702c9c"
             ]
         ]
     },
     {
-        "id": "dab73261.53c13",
+        "id": "3ee80cd1.702c9c",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1310.9689559936523,
-        "y": 265.96876499336213,
-        "z": "62554968.e321b8",
+        "x": 1319.9689559936523,
+        "y": 274.96876499336213,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "ac6cfd44.a241c"
+                "bc487c7b.4684b8"
             ]
         ]
     },
     {
-        "id": "ac6cfd44.a241c",
+        "id": "bc487c7b.4684b8",
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1465.7778434753418,
-        "y": 284.88903352897614,
-        "z": "62554968.e321b8",
+        "x": 1474.7778434753418,
+        "y": 293.88903352897614,
+        "z": "498236f1.856f48",
         "wires": []
     },
     {
-        "id": "c419b86f.420228",
+        "id": "298b7800.074bc",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1304.0000953674316,
-        "y": 305.00008651893586,
-        "z": "62554968.e321b8",
+        "x": 1313.0000953674316,
+        "y": 314.00008651893586,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "ac6cfd44.a241c"
+                "bc487c7b.4684b8"
             ]
         ]
     },
     {
-        "id": "5e5514b0.5b9124",
+        "id": "302f9230.c82bc6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1297.000503540039,
-        "y": 338.0000903336331,
-        "z": "62554968.e321b8",
+        "x": 1306.000503540039,
+        "y": 347.0000903336331,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "639a074f.493e98"
+                "3aa4324.564e84e"
             ]
         ]
     },
     {
-        "id": "639a074f.493e98",
+        "id": "3aa4324.564e84e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1444.2700462341309,
-        "y": 338.55473539512604,
-        "z": "62554968.e321b8",
+        "x": 1453.2700462341309,
+        "y": 347.55473539512604,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "6fa946fa.ca1978"
+                "ea8cd4e1.da014"
             ]
         ]
     },
     {
-        "id": "6fa946fa.ca1978",
+        "id": "ea8cd4e1.da014",
         "type": "for",
         "name": "for vidx..service-data.vnfs.vnf_length[]",
         "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1690.2861633300781,
-        "y": 345.4286558357999,
-        "z": "62554968.e321b8",
+        "x": 1699.2861633300781,
+        "y": 354.4286558357999,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "154eb41a.640b64"
+                "6be80779.f9067"
             ]
         ]
     },
     {
-        "id": "154eb41a.640b64",
+        "id": "6be80779.f9067",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1909.6357955932617,
-        "y": 344.9687359062955,
-        "z": "62554968.e321b8",
+        "x": 1918.6357955932617,
+        "y": 353.9687359062955,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "330022d0.830a2e"
+                "e37eb61b.35117"
             ]
         ]
     },
     {
-        "id": "330022d0.830a2e",
+        "id": "e37eb61b.35117",
         "type": "switchNode",
         "name": "switch vnfid found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
+        "xml": "<!--<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">-->\n\n<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vf-topology-operation-input.vf-module-information.vf-module-id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2063.7153930664062,
-        "y": 344.67881796043366,
-        "z": "62554968.e321b8",
+        "x": 2072.7153930664062,
+        "y": 353.67881796043366,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "fcbe4c85.417af"
+                "b5cfadba.1f4aa"
             ]
         ]
     },
     {
-        "id": "fcbe4c85.417af",
+        "id": "b5cfadba.1f4aa",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2239.6675148010254,
-        "y": 344.57150003593415,
-        "z": "62554968.e321b8",
+        "x": 2248.6675148010254,
+        "y": 353.57150003593415,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "2fb9529b.c7be6e"
+                "bd36402c.584f38"
             ]
         ]
     },
     {
-        "id": "2fb9529b.c7be6e",
+        "id": "bd36402c.584f38",
         "type": "set",
         "name": "set tmp.vidx and ctx.vnf-data",
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
         "comments": "",
-        "x": 2449.1998901367188,
-        "y": 346.3216001717374,
-        "z": "62554968.e321b8",
+        "x": 2458.1998901367188,
+        "y": 355.3216001717374,
+        "z": "498236f1.856f48",
         "wires": []
     },
     {
-        "id": "cdefed21.97b52",
+        "id": "a1814ef6.4e6ba",
         "type": "save",
         "name": "update AnAI - l2vpn.operational-status",
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"   \n\t\tkey=\"connectivity.connectivity-id = $vnfId\" >\n<parameter name=\"operational-status\" value=\"Active\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1063.0000228881836,
-        "y": 668.0103769302368,
-        "z": "62554968.e321b8",
+        "x": 1072.0000228881836,
+        "y": 677.0103769302368,
+        "z": "498236f1.856f48",
         "wires": [
             []
         ]
     },
     {
-        "id": "ef33383b.0eb5c8",
+        "id": "fa4a7cef.4c643",
         "type": "set",
         "name": "copy input data to service data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
         "comments": "",
-        "x": 1042.0001373291016,
-        "y": 499.010338306427,
-        "z": "62554968.e321b8",
+        "x": 1051.0001373291016,
+        "y": 508.010338306427,
+        "z": "498236f1.856f48",
         "wires": []
     },
     {
-        "id": "6bb0bfe6.f5358",
+        "id": "d491e887.81b538",
         "type": "switchNode",
         "name": "switch vnf-level-oper-status",
         "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1028.75,
-        "y": 404.00390815734863,
-        "z": "62554968.e321b8",
+        "x": 1037.75,
+        "y": 413.00390815734863,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "5c7bc43a.bb701c",
-                "b67194e3.094198"
+                "2e735695.8a522a",
+                "9667f59f.7676c8"
             ]
         ]
     },
     {
-        "id": "5c7bc43a.bb701c",
+        "id": "2e735695.8a522a",
         "type": "outcome",
         "name": "outcome Created",
         "xml": "<outcome value='Created'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1274.583293914795,
-        "y": 405.1150059700012,
-        "z": "62554968.e321b8",
+        "x": 1283.583293914795,
+        "y": 414.1150059700012,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "914253cd.1c469"
+                "a29cc418.229998"
             ]
         ]
     },
     {
-        "id": "b67194e3.094198",
+        "id": "9667f59f.7676c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1252.5833129882812,
-        "y": 455.115017414093,
-        "z": "62554968.e321b8",
+        "x": 1261.5833129882812,
+        "y": 464.115017414093,
+        "z": "498236f1.856f48",
         "wires": [
             [
-                "b6453bfb.a302f"
+                "aa583cbc.e62958"
             ]
         ]
     },
     {
-        "id": "b6453bfb.a302f",
+        "id": "aa583cbc.e62958",
         "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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
         "comments": "",
-        "x": 1412.083080291748,
-        "y": 458.1150164604187,
-        "z": "62554968.e321b8",
+        "x": 1421.083080291748,
+        "y": 467.1150164604187,
+        "z": "498236f1.856f48",
         "wires": []
     },
     {
-        "id": "914253cd.1c469",
+        "id": "a29cc418.229998",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1484.8896675109863,
-        "y": 416.4401812553406,
-        "z": "62554968.e321b8",
+        "x": 1493.8896675109863,
+        "y": 425.4401812553406,
+        "z": "498236f1.856f48",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
index 951a18f4..1f85f4c8 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
@@ -1,20 +1,35 @@
 [
     {
-        "id": "ed294889.e18cd8",
-        "type": "dgstart",
-        "name": "DGSTART",
+        "id": "7b71bd92.fd2814",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
         "outputs": 1,
-        "x": 117,
-        "y": 57,
-        "z": "a8db409e.810378",
+        "x": 459,
+        "y": 325.0000009536743,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "d573cd56.a0362"
+                "cd94e5aa.ecbb7",
+                "2023e2ef.c2aaae",
+                "b67caacf.835018",
+                "dc45507c.2c758",
+                "404d2254.b54cb4",
+                "f8f7ecd5.33f1b",
+                "192e11b1.7d71e6",
+                "a92fbbfb.a65698",
+                "19fc51d8.0cda46",
+                "14342bec.b0bb44",
+                "eaf312a9.dac698",
+                "657f9098.60c5e8",
+                "d49f5116.ef68d8"
             ]
         ]
     },
     {
-        "id": "d573cd56.a0362",
+        "id": "9fc16420.cc4ed8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,466 +37,511 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 248.2856903076172,
-        "y": 106.23810863494873,
-        "z": "a8db409e.810378",
+        "x": 301.00001525878906,
+        "y": 108.99999237060547,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "ab294e07.a9e7f"
+                "5abbcf9c.c62d48"
             ]
         ]
     },
     {
-        "id": "ab294e07.a9e7f",
+        "id": "5abbcf9c.c62d48",
         "type": "method",
-        "name": "method sotn-vf-operation-l2vpn-create",
+        "name": "sotn-vf-operation-l2vpn-create",
         "xml": "<method rpc='sotn-vf-operation-l2vpn-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 251.42861938476562,
-        "y": 191.00003242492676,
-        "z": "a8db409e.810378",
+        "x": 300.00001525878906,
+        "y": 208.99999237060547,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "3b2ee2be.0d5776"
+                "7b71bd92.fd2814"
             ]
         ]
     },
     {
-        "id": "3b2ee2be.0d5776",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "ad2ea8c5.fcd77",
+        "type": "dgstart",
+        "name": "DGSTART",
         "outputs": 1,
-        "x": 664.2380447387695,
-        "y": 394.6666717529297,
-        "z": "a8db409e.810378",
+        "x": 130.50001525878906,
+        "y": 20,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "7075470e.ead518",
-                "a887fb8.23d1908",
-                "c96cd735.589ad8",
-                "6d0e8b42.1f8964",
-                "49bfb25c.1c60ac",
-                "3b8acefc.66b31a",
-                "6eb961ad.5ae338",
-                "adbadf0e.275b3",
-                "c0c21f0e.1b5958",
-                "f1922be.86c2058",
-                "d0ca9568.fe847",
-                "5bbdffcc.b3f3b8"
+                "9fc16420.cc4ed8"
             ]
         ]
     },
     {
-        "id": "a887fb8.23d1908",
-        "type": "set",
-        "name": "set vnf-level-oper-status to Created",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
+        "id": "2023e2ef.c2aaae",
+        "type": "for",
+        "name": "for loop idx - VF input parameters",
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
         "comments": "",
-        "x": 1086.3848571777344,
-        "y": 758.6706044944003,
-        "z": "a8db409e.810378",
-        "wires": []
+        "outputs": 1,
+        "x": 834.2502317428589,
+        "y": 333.66668009757996,
+        "z": "8baeaca1.28233",
+        "wires": [
+            [
+                "cf0ba013.1e08c8"
+            ]
+        ]
     },
     {
-        "id": "7075470e.ead518",
-        "type": "set",
-        "name": "copy input data to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
+        "id": "cf0ba013.1e08c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
-        "x": 1078.2380447387695,
-        "y": 653.6668565543368,
-        "z": "a8db409e.810378",
-        "wires": []
+        "outputs": 1,
+        "x": 1049.0285749435425,
+        "y": 331.2222640514374,
+        "z": "8baeaca1.28233",
+        "wires": [
+            [
+                "38f94a22.124166",
+                "7ae6315a.90c6e8"
+            ]
+        ]
     },
     {
-        "id": "49bfb25c.1c60ac",
+        "id": "38f94a22.124166",
         "type": "execute",
-        "name": "execute generate-vnf-index",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-id\"/>\n",
+        "name": "execute split parameterName",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1066.571548461914,
-        "y": 603.3334405692294,
-        "z": "a8db409e.810378",
+        "x": 1245.2847776412964,
+        "y": 308.97040247917175,
+        "z": "8baeaca1.28233",
         "wires": [
             []
         ]
     },
     {
-        "id": "c0c21f0e.1b5958",
+        "id": "7ae6315a.90c6e8",
         "type": "set",
-        "name": "set vnf-index to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",
+        "name": "set parameterName",
+        "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
+        "comments": "",
+        "x": 1214.7292051315308,
+        "y": 345.97051882743835,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "5639a33f.aee984",
+        "type": "comment",
+        "name": "Take the parameter names by removing prefix",
+        "info": "",
         "comments": "",
-        "x": 1077.5716247558594,
-        "y": 710.3334443839267,
-        "z": "a8db409e.810378",
+        "x": 1218.250433921814,
+        "y": 268.33334851264954,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "c96cd735.589ad8",
+        "id": "cd94e5aa.ecbb7",
         "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "name": "switch vf-modules.vf-module_length",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1093.5713653564453,
-        "y": 273.3333633216098,
-        "z": "a8db409e.810378",
+        "x": 816.0000305175781,
+        "y": 187.00001692771912,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "9138e1fa.f1d37",
-                "bf45ff7d.c852e"
+                "543dc8c7.d54a4",
+                "7bbfeaa9.0bd62c"
             ]
         ]
     },
     {
-        "id": "9138e1fa.f1d37",
+        "id": "543dc8c7.d54a4",
         "type": "other",
-        "name": "NULL",
+        "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1328.2857513427734,
-        "y": 268.47618367988616,
-        "z": "a8db409e.810378",
+        "x": 1047.0000410079956,
+        "y": 163.00001406669617,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "4dbced61.ca9034"
+                "be09761b.de8e3"
             ]
         ]
     },
     {
-        "id": "4dbced61.ca9034",
-        "type": "set",
-        "name": "set vnf-index=0",
-        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
-        "comments": "",
-        "x": 1488.5714569091797,
-        "y": 268.47627523262054,
-        "z": "a8db409e.810378",
-        "wires": []
-    },
-    {
-        "id": "bf45ff7d.c852e",
+        "id": "7bbfeaa9.0bd62c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1324.7142906188965,
-        "y": 301.7620151313022,
-        "z": "a8db409e.810378",
+        "x": 1047.0000410079956,
+        "y": 203.00001406669617,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "dbddb28c.bce1e8"
+                "655e11f8.e1faa8"
             ]
         ]
     },
     {
-        "id": "33a0ff35.932e78",
+        "id": "be09761b.de8e3",
         "type": "set",
-        "name": "set vnf-index = vnf_length",
-        "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
+        "name": "set vf-index",
+        "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1717.571533203125,
-        "y": 280.0477407248691,
-        "z": "a8db409e.810378",
+        "x": 1189.5000410079956,
+        "y": 163.00001406669617,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "36e21bba.2e2ef4",
-        "type": "for",
-        "name": "for each existing VNF",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "id": "655e11f8.e1faa8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1706.0001525878906,
-        "y": 315.04771259147674,
-        "z": "a8db409e.810378",
+        "x": 1191.3570852279663,
+        "y": 202.93652606010437,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "7dde789c.f76928"
+                "4b883294.d65484",
+                "b58a8196.c8fd18"
             ]
         ]
     },
     {
-        "id": "dbddb28c.bce1e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "b58a8196.c8fd18",
+        "type": "set",
+        "name": "set vf-index",
+        "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
+        "comments": "",
+        "x": 1344.0555601119995,
+        "y": 172.5556247527711,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "4b883294.d65484",
+        "type": "for",
+        "name": "for each existing vf-index",
+        "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1459.4285736083984,
-        "y": 303.76198461372405,
-        "z": "a8db409e.810378",
+        "x": 1400.4840650558472,
+        "y": 225.7777545452118,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "33a0ff35.932e78",
-                "36e21bba.2e2ef4"
+                "46919469.ed5074"
             ]
         ]
     },
     {
-        "id": "7dde789c.f76928",
+        "id": "23d12f2a.b840a8",
+        "type": "comment",
+        "name": "make sure this network doesn't exist already",
+        "info": "",
+        "comments": "",
+        "x": 1624.1347951889038,
+        "y": 184.03181195259094,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "46919469.ed5074",
         "type": "switchNode",
-        "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
+        "name": "switch vf-module-id found",
+        "xml": "<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`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2099.285888671875,
-        "y": 315.61919668037444,
-        "z": "a8db409e.810378",
+        "x": 1675.7697858810425,
+        "y": 225.34925723075867,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "5924827c.34c2fc"
+                "9a5788e3.06116"
             ]
         ]
     },
     {
-        "id": "5924827c.34c2fc",
+        "id": "9a5788e3.06116",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2380.571590423584,
-        "y": 314.19060209114105,
-        "z": "a8db409e.810378",
+        "x": 1576.4999837875366,
+        "y": 283.9206883907318,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "46ba128f.50acd4"
+                "1914f90.a238b87"
             ]
         ]
     },
     {
-        "id": "88b8e912.2900e8",
-        "type": "comment",
-        "name": "make sure this vnf-id doesn't exist already",
-        "info": "",
+        "id": "1914f90.a238b87",
+        "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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
         "comments": "",
-        "x": 2068.4285049438477,
-        "y": 279.1905887397006,
-        "z": "a8db409e.810378",
+        "x": 1724.2500867843628,
+        "y": 283.7778804595582,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "6d0e8b42.1f8964",
+        "id": "f8f7ecd5.33f1b",
         "type": "set",
-        "name": "set new vnf_length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
+        "name": "copy input data to service data",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n<!--<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />-->\n\n\n\n",
         "comments": "",
-        "x": 1038.571548461914,
-        "y": 551.3334372313693,
-        "z": "a8db409e.810378",
+        "x": 829.8532209396362,
+        "y": 636.4962680339813,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "3b8acefc.66b31a",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "id": "404d2254.b54cb4",
+        "type": "execute",
+        "name": "execute generate-vf-module-index",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 841.1867933273315,
+        "y": 589.1629703044891,
+        "z": "8baeaca1.28233",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dc45507c.2c758",
+        "type": "set",
+        "name": "set new vf-module_length",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
         "comments": "",
-        "x": 1025.5715103149414,
-        "y": 1021.5969560416415,
-        "z": "a8db409e.810378",
+        "x": 813.1868543624878,
+        "y": 540.1629703044891,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "6eb961ad.5ae338",
+        "id": "b67caacf.835018",
         "type": "set",
-        "name": "set vnf-index and vnf-object-path",
-        "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",
+        "name": "set vf-module-request-input.",
+        "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
         "comments": "",
-        "x": 1079.5715408325195,
-        "y": 799.5968749793246,
-        "z": "a8db409e.810378",
+        "x": 813.1863813400269,
+        "y": 486.15425848960876,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "46ba128f.50acd4",
-        "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=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",
+        "id": "192e11b1.7d71e6",
+        "type": "set",
+        "name": "set vf-module-level-oper-status",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
         "comments": "",
-        "x": 2509.1429595947266,
-        "y": 365.1906163962558,
-        "z": "a8db409e.810378",
+        "x": 823.5002088546753,
+        "y": 734.0000891089439,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "adbadf0e.275b3",
+        "id": "eaf312a9.dac698",
         "type": "save",
-        "name": "save AnAI - l2vpn.operational-status",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"   \n\t\tkey='connectivity.connectivity-id = $prop.connectivity-id' >\n<parameter name=\"operational-status\" value=\"Created\" />\n",
+        "name": "save connectivity resource in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.vpn-vf-index'>\n<parameter name='connectivity-id' value='`$prop.vpn-vf-index`' />\n<parameter name='operational-status' value='Created' />\n\n\n<!--<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />-->\n<!--<parameter name='sdwan-vpn-name' value='`$prop.name`' />-->\n<!--<parameter name='topology' value='`$prop.topology`' />-->\n<!--<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />-->\n<!--<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` \" />-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1134.5458450317383,
-        "y": 909.247092035599,
-        "z": "a8db409e.810378",
+        "x": 830.0000696182251,
+        "y": 779.5000369548798,
+        "z": "8baeaca1.28233",
         "wires": [
             []
         ]
     },
     {
-        "id": "204db5a4.c326da",
-        "type": "comment",
-        "name": "TODO: change AAI models",
-        "info": "",
+        "id": "a92fbbfb.a65698",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1068.1821060180664,
-        "y": 868.9743078025058,
-        "z": "a8db409e.810378",
+        "x": 777.7225427627563,
+        "y": 872.6739275455475,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "e76c21c2.4a838",
-        "type": "execute",
-        "name": "execute split parameterName",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
+        "id": "19fc51d8.0cda46",
+        "type": "for",
+        "name": "for loop i - Network input parameters",
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1494.7395935058594,
-        "y": 362.7500076564029,
-        "z": "a8db409e.810378",
+        "x": 841.2539472579956,
+        "y": 422.5039279460907,
+        "z": "8baeaca1.28233",
         "wires": [
-            []
+            [
+                "757b8d75.3d0a94"
+            ]
         ]
     },
     {
-        "id": "11945653.6c33ba",
+        "id": "757b8d75.3d0a94",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1298.4833908081055,
-        "y": 367.0018806727603,
-        "z": "a8db409e.810378",
+        "x": 1128.476824760437,
+        "y": 422.7262418270111,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "e76c21c2.4a838",
-                "e0fb04c6.a15c88"
+                "8a7ad1b3.ba99a8",
+                "597f978e.f5f578"
             ]
         ]
     },
     {
-        "id": "f1922be.86c2058",
-        "type": "for",
-        "name": "for loop idx - VNF input parameters",
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
+        "id": "8a7ad1b3.ba99a8",
+        "type": "switchNode",
+        "name": "switch name",
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1083.7050476074219,
-        "y": 369.4462967189029,
-        "z": "a8db409e.810378",
+        "x": 1316.6986684799194,
+        "y": 405.05954599380493,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "11945653.6c33ba"
+                "f3762745.5848d8"
             ]
         ]
     },
     {
-        "id": "d0ca9568.fe847",
-        "type": "set",
-        "name": "set vnf-request-input.",
-        "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",
-        "comments": "",
-        "x": 1040.7046813964844,
-        "y": 439.7710037501529,
-        "z": "a8db409e.810378",
-        "wires": []
-    },
-    {
-        "id": "e0fb04c6.a15c88",
-        "type": "set",
-        "name": "set parameterName",
-        "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
-        "comments": "",
-        "x": 1471.7395935058594,
-        "y": 408.7500076564029,
-        "z": "a8db409e.810378",
-        "wires": []
-    },
-    {
-        "id": "5bbdffcc.b3f3b8",
-        "type": "for",
-        "name": "for each sdwan-get-request-input-param",
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
+        "id": "597f978e.f5f578",
+        "type": "switchNode",
+        "name": "switch topology",
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 1096.7395935058594,
-        "y": 491.7500076564029,
-        "z": "a8db409e.810378",
+        "x": 1327.5383291244507,
+        "y": 445.0595440864563,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "e0f56e7c.d34a1"
+                "751a61f6.1024c8"
             ]
         ]
     },
     {
-        "id": "e0f56e7c.d34a1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "f3762745.5848d8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1322.9722595214844,
-        "y": 490.0937576564029,
-        "z": "a8db409e.810378",
+        "x": 1503.6986684799194,
+        "y": 401.05954599380493,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "5be518f3.e26978"
+                "254d198b.dac90e"
             ]
         ]
     },
     {
-        "id": "5be518f3.e26978",
-        "type": "switchNode",
-        "name": "switch vnf name",
-        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
+        "id": "751a61f6.1024c8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479.4722595214844,
-        "y": 488.09381869155914,
-        "z": "a8db409e.810378",
+        "x": 1497.5383291244507,
+        "y": 441.0595440864563,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "3bfa8dc2.ee3a5a"
+                "bd2b112e.cf89f"
             ]
         ]
     },
     {
-        "id": "3bfa8dc2.ee3a5a",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "254d198b.dac90e",
+        "type": "set",
+        "name": "set name",
+        "xml": "<set>\n<parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n\n",
+        "comments": "",
+        "x": 1653.6987981796265,
+        "y": 399.6595525741577,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "bd2b112e.cf89f",
+        "type": "set",
+        "name": "set topology",
+        "xml": "<set>\n<parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 1684.8717699050903,
+        "y": 439.5207009315491,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "14342bec.b0bb44",
+        "type": "set",
+        "name": "set vf-module-object-path",
+        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vpn-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
+        "comments": "",
+        "x": 815.5000867843628,
+        "y": 685.0313085913658,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "657f9098.60c5e8",
+        "type": "save",
+        "name": "save service relationship in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $vf-module-topology-operation-input.vnf-information.vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n<!--key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1640.4726257324219,
-        "y": 488.0938797267154,
-        "z": "a8db409e.810378",
+        "x": 830.000147819519,
+        "y": 827.0001780986786,
+        "z": "8baeaca1.28233",
         "wires": [
-            [
-                "5f201fd1.6acc3"
-            ]
+            []
         ]
     },
     {
-        "id": "5f201fd1.6acc3",
+        "id": "d49f5116.ef68d8",
         "type": "set",
-        "name": "set vnf name",
-        "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "name": "set vnf-index",
+        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n\n\n",
         "comments": "",
-        "x": 1798.4727478027344,
-        "y": 486.69391634780914,
-        "z": "a8db409e.810378",
+        "x": 739,
+        "y": 124,
+        "z": "8baeaca1.28233",
         "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 b8646972..658a04cd 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
@@ -1,20 +1,20 @@
 [
     {
-        "id": "ea193d8f.e165e",
+        "id": "7a5b2247.76a96c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 112,
-        "y": 70,
-        "z": "5c3e2071.30fcf",
+        "x": 115,
+        "y": 61,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "45143e5e.12cef"
+                "8f393b9e.9e17b"
             ]
         ]
     },
     {
-        "id": "45143e5e.12cef",
+        "id": "8f393b9e.9e17b",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1333 +22,1342 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 243.2856903076172,
-        "y": 119.23810863494873,
-        "z": "5c3e2071.30fcf",
+        "x": 246.2856903076172,
+        "y": 110.23810863494873,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "22fb039d.719e1c"
+                "eff67602.0d4e4"
             ]
         ]
     },
     {
-        "id": "22fb039d.719e1c",
+        "id": "eff67602.0d4e4",
         "type": "method",
         "name": "method sotn-vf-operation-uni-activate",
         "xml": "<method rpc='sotn-vf-operation-uni-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 246.42861938476562,
-        "y": 204.00003242492676,
-        "z": "5c3e2071.30fcf",
+        "x": 249.42861938476562,
+        "y": 195.00003242492676,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "bbe79441.cda0b"
+                "c03d71cc.6719d8"
             ]
         ]
     },
     {
-        "id": "8dca40ca.b6cbc8",
+        "id": "b1251334.94c658",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 718.9959564208984,
-        "y": 384.99998915195465,
-        "z": "5c3e2071.30fcf",
+        "x": 721.9959564208984,
+        "y": 375.99998915195465,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "66f88853.0801a8",
-                "5f34a2a5.ce0fbc",
-                "37779f9b.3e84f8"
+                "2185890c.41cf5e",
+                "7887ee8e.f7ad9",
+                "bf0b3d3b.de1c1"
             ]
         ]
     },
     {
-        "id": "bbe79441.cda0b",
+        "id": "c03d71cc.6719d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 337.6626205444336,
-        "y": 489.66670763492584,
-        "z": "5c3e2071.30fcf",
+        "x": 340.6626205444336,
+        "y": 480.66670763492584,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "8dca40ca.b6cbc8",
-                "b28368bd.88b17",
-                "91b62864.f184c8",
-                "b0f3fc53.5db61",
-                "b5422f78.9d3e4",
-                "f2975c47.fb694",
-                "aeddedc2.f06158",
-                "5950f717.b81e28"
+                "b1251334.94c658",
+                "e40d5cd3.6df488",
+                "77bef901.3c81f",
+                "f1780b76.81d518",
+                "5733466d.dcbb88",
+                "6d51d616.88647",
+                "aab160b4.f76088",
+                "48dc3a93.b23a44",
+                "672fc75a.1e91b"
             ]
         ]
     },
     {
-        "id": "91b62864.f184c8",
+        "id": "77bef901.3c81f",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 684.0273170471191,
-        "y": 255.269144654274,
-        "z": "5c3e2071.30fcf",
+        "x": 687.0273170471191,
+        "y": 246.269144654274,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "3d5e06d8.9791c2"
+                "c9d21017.2aa0b8"
             ]
         ]
     },
     {
-        "id": "b28368bd.88b17",
+        "id": "e40d5cd3.6df488",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 688.9959716796875,
-        "y": 194.00001394748688,
-        "z": "5c3e2071.30fcf",
+        "x": 691.9959716796875,
+        "y": 185.00001394748688,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "746b74df.fbc48c"
+                "eb024dbb.2172c"
             ]
         ]
     },
     {
-        "id": "746b74df.fbc48c",
+        "id": "eb024dbb.2172c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 868.9959526062012,
-        "y": 193.0000034570694,
-        "z": "5c3e2071.30fcf",
+        "x": 871.9959526062012,
+        "y": 184.0000034570694,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "62ebea71.fce5b4"
+                "9467f8cc.185d38"
             ]
         ]
     },
     {
-        "id": "62ebea71.fce5b4",
+        "id": "9467f8cc.185d38",
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1018.4246788024902,
-        "y": 194.14292109012604,
-        "z": "5c3e2071.30fcf",
+        "x": 1021.4246788024902,
+        "y": 185.14292109012604,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "3d5e06d8.9791c2",
+        "id": "c9d21017.2aa0b8",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 906.9959678649902,
-        "y": 256.00000965595245,
-        "z": "5c3e2071.30fcf",
+        "x": 909.9959678649902,
+        "y": 247.00000965595245,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "fccff52.827ec08"
+                "5eb86cb5.aa0e34"
             ]
         ]
     },
     {
-        "id": "fccff52.827ec08",
+        "id": "5eb86cb5.aa0e34",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1121.9959526062012,
-        "y": 254.0000034570694,
-        "z": "5c3e2071.30fcf",
+        "x": 1124.9959526062012,
+        "y": 245.0000034570694,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "fc0c6263.7f4b58"
+                "eb010427.42f398"
             ]
         ]
     },
     {
-        "id": "46df70e6.cbb32",
+        "id": "8fe487a9.faab98",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1462.9959716796875,
-        "y": 222,
-        "z": "5c3e2071.30fcf",
+        "x": 1465.9959716796875,
+        "y": 213,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "5f34a2a5.ce0fbc",
+        "id": "7887ee8e.f7ad9",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.9959716796875,
-        "y": 409,
-        "z": "5c3e2071.30fcf",
+        "x": 981.9959716796875,
+        "y": 400,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "b65ac05a.92d3b8"
+                "6182e795.96a958"
             ]
         ]
     },
     {
-        "id": "66f88853.0801a8",
+        "id": "2185890c.41cf5e",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 975.9959716796875,
-        "y": 337,
-        "z": "5c3e2071.30fcf",
+        "x": 978.9959716796875,
+        "y": 328,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "b65ac05a.92d3b8"
+                "6182e795.96a958"
             ]
         ]
     },
     {
-        "id": "b65ac05a.92d3b8",
+        "id": "6182e795.96a958",
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1147.9959716796875,
-        "y": 371,
-        "z": "5c3e2071.30fcf",
+        "x": 1150.9959716796875,
+        "y": 362,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "37779f9b.3e84f8",
+        "id": "bf0b3d3b.de1c1",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 940.9959487915039,
-        "y": 479.9999986886978,
-        "z": "5c3e2071.30fcf",
+        "x": 943.9959487915039,
+        "y": 470.9999986886978,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "8619e619.b5b6f"
+                "f14d9e8b.d52ee8"
             ]
         ]
     },
     {
-        "id": "b4807db5.ce3f18",
+        "id": "13dbecad.5f9583",
         "type": "set",
         "name": "set vf-module_length",
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
         "comments": "",
-        "x": 1294.995964050293,
-        "y": 478.0000126361847,
-        "z": "5c3e2071.30fcf",
+        "x": 1297.995964050293,
+        "y": 469.0000126361847,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "8619e619.b5b6f",
+        "id": "f14d9e8b.d52ee8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1101.995994567871,
-        "y": 476.99999010562897,
-        "z": "5c3e2071.30fcf",
+        "x": 1104.995994567871,
+        "y": 467.99999010562897,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "b4807db5.ce3f18",
-                "b7112b63.fa666"
+                "13dbecad.5f9583",
+                "76e7a061.215fe"
             ]
         ]
     },
     {
-        "id": "b7112b63.fa666",
+        "id": "76e7a061.215fe",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1313.9959335327148,
-        "y": 530.9999891519547,
-        "z": "5c3e2071.30fcf",
+        "x": 1316.9959335327148,
+        "y": 521.9999891519547,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "207d79b0.f0396e"
+                "4d4229cc.870928"
             ]
         ]
     },
     {
-        "id": "207d79b0.f0396e",
+        "id": "4d4229cc.870928",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "xml": "<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`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1556.995948791504,
-        "y": 525.9999986886978,
-        "z": "5c3e2071.30fcf",
+        "x": 1559.995948791504,
+        "y": 516.9999986886978,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "f2b976ec.55b34"
+                "235f500c.adb2d8"
             ]
         ]
     },
     {
-        "id": "f2b976ec.55b34",
+        "id": "235f500c.adb2d8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1754.9959774017334,
-        "y": 513.000005364418,
-        "z": "5c3e2071.30fcf",
+        "x": 1757.9959774017334,
+        "y": 504.00000536441803,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "eab205c1.ee7e8"
+                "b98c0673.7d62f8"
             ]
         ]
     },
     {
-        "id": "eab205c1.ee7e8",
+        "id": "b98c0673.7d62f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1906.995948791504,
-        "y": 514.9999986886978,
-        "z": "5c3e2071.30fcf",
+        "x": 1909.995948791504,
+        "y": 505.9999986886978,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "7cce5705.9b51",
-                "b161a727.31db88",
-                "8cc64f67.5de4c"
+                "9c359698.db3d68",
+                "1962516c.e21167"
             ]
         ]
     },
     {
-        "id": "7cce5705.9b51",
+        "id": "9c359698.db3d68",
         "type": "set",
         "name": "set tmp.vidx and ctx.vnf-data",
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
         "comments": "",
-        "x": 2134.996063232422,
-        "y": 457.0000025033951,
-        "z": "5c3e2071.30fcf",
+        "x": 2137.996063232422,
+        "y": 448.0000025033951,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "b161a727.31db88",
+        "id": "1962516c.e21167",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
         "comments": "",
-        "x": 2138.996063232422,
-        "y": 511.0000025033951,
-        "z": "5c3e2071.30fcf",
+        "x": 2141.996063232422,
+        "y": 502.0000025033951,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "b0f3fc53.5db61",
+        "id": "f1780b76.81d518",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 612.9961547851562,
-        "y": 1684.501220703125,
-        "z": "5c3e2071.30fcf",
+        "x": 615.9961547851562,
+        "y": 1675.501220703125,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "8cc64f67.5de4c",
+        "id": "29a9aeb.30d1952",
         "type": "call",
         "name": "call sotn-get-vf-module-uni-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2169.45108795166,
-        "y": 562.0104948282242,
-        "z": "5c3e2071.30fcf",
+        "x": 2172.45108795166,
+        "y": 553.0104948282242,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5422f78.9d3e4",
+        "id": "5733466d.dcbb88",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 698.9959564208984,
-        "y": 324.5039049386978,
-        "z": "5c3e2071.30fcf",
+        "x": 701.9959564208984,
+        "y": 315.5039049386978,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc0c6263.7f4b58",
+        "id": "eb010427.42f398",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1285,
-        "y": 264,
-        "z": "5c3e2071.30fcf",
+        "x": 1288,
+        "y": 255,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "46df70e6.cbb32",
-                "868e2384.9bd088"
+                "8fe487a9.faab98",
+                "c2b0533e.d5b1d"
             ]
         ]
     },
     {
-        "id": "868e2384.9bd088",
+        "id": "c2b0533e.d5b1d",
         "type": "set",
         "name": "set tmp.vnf-id",
         "xml": "<set>\n<parameter name='tmp.vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\n",
         "comments": "",
-        "x": 1470,
-        "y": 279,
-        "z": "5c3e2071.30fcf",
+        "x": 1473,
+        "y": 270,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "5950f717.b81e28",
+        "id": "48dc3a93.b23a44",
         "type": "get-resource",
         "name": "get-resource generic-vnf",
-        "xml": "<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' >\n\n\n",
+        "xml": "<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        pfx='tmp.aai.generic-vnf' local-only='false' >\n\n<!--AND depth = '0'\"-->\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 591,
-        "y": 543,
-        "z": "5c3e2071.30fcf",
+        "x": 594,
+        "y": 534,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "25602afb.1d9cfe"
+                "28391a2c.3321fe"
             ]
         ]
     },
     {
-        "id": "8bfca5dd.ccec38",
+        "id": "6a811cc0.b174ac",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 821,
-        "y": 591,
-        "z": "5c3e2071.30fcf",
+        "x": 824,
+        "y": 582,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "3fb86113.9bfd2e",
-                "cea6f99d.9fa3f8"
+                "1afc6101.b3a3ff",
+                "6ac23f85.2f3a38"
             ]
         ]
     },
     {
-        "id": "cea6f99d.9fa3f8",
+        "id": "6ac23f85.2f3a38",
         "type": "for",
         "name": "for each relationship in gen-vnf",
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1033,
-        "y": 594,
-        "z": "5c3e2071.30fcf",
+        "x": 1036,
+        "y": 585,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "380b3b11.1fc39c"
+                "5e0bc542.fea784"
             ]
         ]
     },
     {
-        "id": "380b3b11.1fc39c",
+        "id": "5e0bc542.fea784",
         "type": "switchNode",
         "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
+        "xml": "<switch test='`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1259,
-        "y": 598,
-        "z": "5c3e2071.30fcf",
+        "x": 1262,
+        "y": 589,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "6ce242f7.50a224"
+                "ad3f5adb.0bf5b8"
             ]
         ]
     },
     {
-        "id": "6ce242f7.50a224",
+        "id": "ad3f5adb.0bf5b8",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1448.285888671875,
-        "y": 606.82177734375,
-        "z": "5c3e2071.30fcf",
+        "x": 1451.285888671875,
+        "y": 597.82177734375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "8f0c299e.76aa68"
+                "4a0655ab.fa2fa4"
             ]
         ]
     },
     {
-        "id": "8f0c299e.76aa68",
+        "id": "4a0655ab.fa2fa4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1623.117431640625,
-        "y": 609.3402709960938,
-        "z": "5c3e2071.30fcf",
+        "x": 1626.117431640625,
+        "y": 600.3402709960938,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "9cc6d571.b014d8",
-                "8d29ebb2.4924b",
-                "1b814ca6.da0c53"
+                "2cd069f4.1bd85e",
+                "e85654b4.901fd",
+                "596112fe.dbc0a4"
             ]
         ]
     },
     {
-        "id": "9cc6d571.b014d8",
+        "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",
+        "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",
         "comments": "",
-        "x": 1840.117431640625,
-        "y": 607.3402709960938,
-        "z": "5c3e2071.30fcf",
+        "x": 1843.117431640625,
+        "y": 598.3402709960938,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "3fb86113.9bfd2e",
+        "id": "1afc6101.b3a3ff",
         "type": "switchNode",
         "name": "switch number of unis  less than two",
         "xml": "<switch test='`$tmp.unis.uni_length &lt; 2`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1008,
-        "y": 758,
-        "z": "5c3e2071.30fcf",
+        "x": 1011,
+        "y": 749,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "ca909120.1610f"
+                "3398154f.dabcca"
             ]
         ]
     },
     {
-        "id": "6807aab1.3361f4",
+        "id": "f0dacaa2.3f6d9",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n\n",
         "comments": "",
-        "x": 1416,
-        "y": 760,
-        "z": "5c3e2071.30fcf",
+        "x": 1419,
+        "y": 751,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "ca909120.1610f",
+        "id": "3398154f.dabcca",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1224,
-        "y": 759,
-        "z": "5c3e2071.30fcf",
+        "x": 1227,
+        "y": 750,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "6807aab1.3361f4"
+                "f0dacaa2.3f6d9"
             ]
         ]
     },
     {
-        "id": "8d29ebb2.4924b",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 1879,
-        "y": 682,
-        "z": "5c3e2071.30fcf",
+        "x": 1882,
+        "y": 673,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "8df25e56.70ef2",
-                "5281d33f.6cf23c"
+                "fb92d303.a6d858",
+                "3b07d667.72d91a"
             ]
         ]
     },
     {
-        "id": "5281d33f.6cf23c",
+        "id": "3b07d667.72d91a",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2102,
-        "y": 637,
-        "z": "5c3e2071.30fcf",
+        "x": 2105,
+        "y": 628,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "98c7bac7.1f7b2"
+                "9111f685.17b2e8"
             ]
         ]
     },
     {
-        "id": "8df25e56.70ef2",
+        "id": "fb92d303.a6d858",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2104,
-        "y": 701,
-        "z": "5c3e2071.30fcf",
+        "x": 2107,
+        "y": 692,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "538dd561.19c994"
+                "1432f6d2.d75751"
             ]
         ]
     },
     {
-        "id": "98c7bac7.1f7b2",
+        "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]`' />",
         "comments": "",
-        "x": 2324,
-        "y": 639,
-        "z": "5c3e2071.30fcf",
+        "x": 2327,
+        "y": 630,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "538dd561.19c994",
+        "id": "1432f6d2.d75751",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 2263,
-        "y": 720,
-        "z": "5c3e2071.30fcf",
+        "x": 2266,
+        "y": 711,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "1b814ca6.da0c53",
+        "id": "596112fe.dbc0a4",
         "type": "get-resource",
         "name": "get-resource pnf",
         "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": 1809,
-        "y": 819,
-        "z": "5c3e2071.30fcf",
+        "x": 1812,
+        "y": 810,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "a9afb163.16d81"
+                "51c3744a.753414"
             ]
         ]
     },
     {
-        "id": "6d7469b.d065118",
+        "id": "796d1bdc.d65e9c",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2168.88232421875,
-        "y": 827.6556396484375,
-        "z": "5c3e2071.30fcf",
+        "x": 2171.88232421875,
+        "y": 818.6556396484375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "d8ebfcdc.d7e228",
-                "e363b1ad.6cf518"
+                "9e81136f.40f158",
+                "3a607f75.56a9d"
             ]
         ]
     },
     {
-        "id": "d8ebfcdc.d7e228",
+        "id": "9e81136f.40f158",
         "type": "set",
         "name": "set node-id",
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].node-id`' value=\"`$tmp.aai.pnf.pnf-id`\" />\n",
         "comments": "",
-        "x": 2348,
-        "y": 781,
-        "z": "5c3e2071.30fcf",
+        "x": 2351,
+        "y": 772,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "e363b1ad.6cf518",
+        "id": "3a607f75.56a9d",
         "type": "for",
         "name": "for each relationship in pnf",
         "xml": "<for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2360.882568359375,
-        "y": 867.6597290039062,
-        "z": "5c3e2071.30fcf",
+        "x": 2363.882568359375,
+        "y": 858.6597290039062,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "95c7940c.2b5948"
+                "709c4d83.a869b4"
             ]
         ]
     },
     {
-        "id": "95c7940c.2b5948",
+        "id": "709c4d83.a869b4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2586.882568359375,
-        "y": 867.6597290039062,
-        "z": "5c3e2071.30fcf",
+        "x": 2589.882568359375,
+        "y": 858.6597290039062,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "a1776b53.b80d",
-                "af94fb8e.80dfb8"
+                "8cbba6bb.ad862",
+                "dd673476.c308f"
             ]
         ]
     },
     {
-        "id": "af94fb8e.80dfb8",
+        "id": "dd673476.c308f",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2785,
-        "y": 980,
-        "z": "5c3e2071.30fcf",
+        "x": 2788,
+        "y": 971,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "127afd4b.34da43"
+                "2c8cb3cb.28eeec"
             ]
         ]
     },
     {
-        "id": "127afd4b.34da43",
+        "id": "2c8cb3cb.28eeec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2998,
-        "y": 981,
-        "z": "5c3e2071.30fcf",
+        "x": 3001,
+        "y": 972,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "9a33ae38.4ad288",
-                "b1e1b5aa.ff6b18"
+                "8af5221c.7c91b",
+                "47206fa6.e312e"
             ]
         ]
     },
     {
-        "id": "9a33ae38.4ad288",
+        "id": "8af5221c.7c91b",
         "type": "set",
         "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": 3233,
-        "y": 911,
-        "z": "5c3e2071.30fcf",
+        "x": 3236,
+        "y": 902,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "b1e1b5aa.ff6b18",
+        "id": "47206fa6.e312e",
         "type": "get-resource",
         "name": "get-resource network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"'network-resource.network-id = $tmp.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": 3241,
-        "y": 992,
-        "z": "5c3e2071.30fcf",
+        "x": 3244,
+        "y": 983,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "7923986a.2dfdb"
+                "4ad04544.d0fad4"
             ]
         ]
     },
     {
-        "id": "7923986a.2dfdb",
+        "id": "4ad04544.d0fad4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3473.5,
-        "y": 988,
-        "z": "5c3e2071.30fcf",
+        "x": 3476.5,
+        "y": 979,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "e1de0e95.dce97"
+                "d8cca786.0614f8"
             ]
         ]
     },
     {
-        "id": "e1de0e95.dce97",
+        "id": "d8cca786.0614f8",
         "type": "set",
         "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": 3742,
-        "y": 987,
-        "z": "5c3e2071.30fcf",
+        "x": 3745,
+        "y": 978,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "aeddedc2.f06158",
+        "id": "aab160b4.f76088",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 797,
-        "y": 905,
-        "z": "5c3e2071.30fcf",
+        "x": 800,
+        "y": 896,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             []
         ]
     },
     {
-        "id": "a1776b53.b80d",
+        "id": "8cbba6bb.ad862",
         "type": "outcome",
         "name": "thirdparty-controller",
         "xml": "<outcome value='thirdparty-controller'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2812,
-        "y": 845,
-        "z": "5c3e2071.30fcf",
+        "x": 2815,
+        "y": 836,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "4c01f776.c87b7"
+                "8b43ac76.263cd"
             ]
         ]
     },
     {
-        "id": "4c01f776.c87b7",
+        "id": "8b43ac76.263cd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3025,
-        "y": 846,
-        "z": "5c3e2071.30fcf",
+        "x": 3028,
+        "y": 837,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "583e9b05.f6eef4"
+                "9b5d5673.27be38"
             ]
         ]
     },
     {
-        "id": "583e9b05.f6eef4",
+        "id": "9b5d5673.27be38",
         "type": "set",
         "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": 3252,
-        "y": 845,
-        "z": "5c3e2071.30fcf",
+        "x": 3255,
+        "y": 836,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "d059a84d.8e506",
+        "id": "4ddb604c.658b08",
         "type": "comment",
         "name": "when we reach here, we have 2 UNIs, so do ACTN operations",
         "info": "",
         "comments": "",
-        "x": 810,
-        "y": 851,
-        "z": "5c3e2071.30fcf",
+        "x": 813,
+        "y": 842,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "f2975c47.fb694",
+        "id": "6d51d616.88647",
         "type": "for",
         "name": "for vidx..unis.uni_length[]",
         "xml": "<for index='vidx' start='0' end='`$tmp.unis.uni_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 663,
-        "y": 1097,
-        "z": "5c3e2071.30fcf",
+        "x": 666,
+        "y": 1088,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "de539d0a.26596"
+                "8a72c5de.69f39"
             ]
         ]
     },
     {
-        "id": "3b0a5525.2ac102",
+        "id": "f7756434.d014e",
         "type": "set",
         "name": "set oof.vpn",
         "xml": "<set>\n<parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />",
         "comments": "",
-        "x": 1089.0272216796875,
-        "y": 1036.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 1092.0272216796875,
+        "y": 1027.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "29b92baa.41f5cc",
+        "id": "8e5c8d32.64abe8",
         "type": "set",
         "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 1569.0272216796875,
-        "y": 1149.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1572.0272216796875,
+        "y": 1140.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "82572a7a.757f1",
+        "id": "58b223b2.226b5c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1399.0272216796875,
-        "y": 1149.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1402.0272216796875,
+        "y": 1140.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "29b92baa.41f5cc"
+                "8e5c8d32.64abe8"
             ]
         ]
     },
     {
-        "id": "7ff0b8e4.d0edd",
+        "id": "74cd1f0b.113038",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1403.0272216796875,
-        "y": 1189.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1406.0272216796875,
+        "y": 1180.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "d2605932.de72d8"
+                "50f33a59.7393a4"
             ]
         ]
     },
     {
-        "id": "bcaaab5e.f760b",
+        "id": "4f39f2a5.5bd5fc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1395.0272216796875,
-        "y": 1229.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1398.0272216796875,
+        "y": 1220.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "c5af9444.32cba8"
+                "4b579e44.4ec6b"
             ]
         ]
     },
     {
-        "id": "d2605932.de72d8",
+        "id": "50f33a59.7393a4",
         "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": 1553.0272216796875,
-        "y": 1189.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1556.0272216796875,
+        "y": 1180.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "c5af9444.32cba8",
+        "id": "4b579e44.4ec6b",
         "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": 1553.0272216796875,
-        "y": 1229.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1556.0272216796875,
+        "y": 1220.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "dc15d354.485648",
+        "id": "66a971fa.46a568",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1399.0272216796875,
-        "y": 1269.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1402.0272216796875,
+        "y": 1260.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "189365cc.5aa2da"
+                "9aeb59cf.e4f488"
             ]
         ]
     },
     {
-        "id": "36cada17.d60606",
+        "id": "3bf26416.4deddc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1395.0272216796875,
-        "y": 1309.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1398.0272216796875,
+        "y": 1300.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "436f764c.14ed4"
+                "e227ce38.6755d"
             ]
         ]
     },
     {
-        "id": "436f764c.14ed4",
+        "id": "e227ce38.6755d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
         "comments": "",
-        "x": 1553.0272216796875,
-        "y": 1309.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1556.0272216796875,
+        "y": 1300.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "189365cc.5aa2da",
+        "id": "9aeb59cf.e4f488",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1549.5272216796875,
-        "y": 1269.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1552.5272216796875,
+        "y": 1260.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "bce6bff8.ae1f18",
+        "id": "ac6d44a1.0c401",
         "type": "comment",
         "name": "Get controller info and send request",
         "info": "",
         "comments": "",
-        "x": 1161.0272216796875,
-        "y": 1149.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1164.0272216796875,
+        "y": 1140.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "8c2f104c.2ab35",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 1153.0272216796875,
-        "y": 1189.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1156.0272216796875,
+        "y": 1180.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "82572a7a.757f1",
-                "7ff0b8e4.d0edd",
-                "bcaaab5e.f760b"
+                "58b223b2.226b5c",
+                "74cd1f0b.113038",
+                "4f39f2a5.5bd5fc"
             ]
         ]
     },
     {
-        "id": "e9d11d4a.ea432",
+        "id": "c6d53bc.53f5bc8",
         "type": "execute",
         "name": "execute RestApiCallNode Get token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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": 1165.5272216796875,
-        "y": 1289.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 1168.5272216796875,
+        "y": 1280.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "dc15d354.485648",
-                "36cada17.d60606"
+                "66a971fa.46a568",
+                "3bf26416.4deddc"
             ]
         ]
     },
     {
-        "id": "81bac551.cc757",
+        "id": "787bd09.8ff59b",
         "type": "comment",
         "name": "call domain controller to  create underlay OTN tunnel",
         "info": "",
         "comments": "",
-        "x": 1214.5272216796875,
-        "y": 1374.49560546875,
-        "z": "5c3e2071.30fcf",
+        "x": 1217.5272216796875,
+        "y": 1365.49560546875,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "f9c270fa.7abd5",
+        "id": "ee991e0.ab6b36",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-create-otn-tunnel",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1234.5272216796875,
-        "y": 1418.49560546875,
-        "z": "5c3e2071.30fcf",
+        "x": 1237.5272216796875,
+        "y": 1409.49560546875,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             []
         ]
     },
     {
-        "id": "de539d0a.26596",
+        "id": "8a72c5de.69f39",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 816.5272216796875,
-        "y": 1429.0407409667969,
-        "z": "5c3e2071.30fcf",
+        "x": 819.5272216796875,
+        "y": 1420.0407409667969,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "8c2f104c.2ab35",
-                "3b0a5525.2ac102",
-                "2c3edd05.477cca",
-                "543dd31e.1a6c4c",
-                "e9d11d4a.ea432",
-                "ab256b41.e2d9b8",
-                "f9c270fa.7abd5"
+                "124c6957.e07dc7",
+                "3ce3b19a.7c10c6",
+                "d661efba.3fa238",
+                "ee991e0.ab6b36",
+                "f7756434.d014e"
             ]
         ]
     },
     {
-        "id": "641e0b16.a7aa44",
+        "id": "ab7e4ea9.e8e178",
         "type": "comment",
         "name": "Loop through UNIs and configure domain controllers",
         "info": "",
         "comments": "",
-        "x": 751.5003662109375,
-        "y": 1237.5003662109375,
-        "z": "5c3e2071.30fcf",
+        "x": 754.5003662109375,
+        "y": 1228.5003662109375,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "2c3edd05.477cca",
+        "id": "124c6957.e07dc7",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<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' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<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' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<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' />",
         "comments": "",
-        "x": 1080.52734375,
-        "y": 1497.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 1083.52734375,
+        "y": 1488.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "543dd31e.1a6c4c",
+        "id": "3ce3b19a.7c10c6",
         "type": "set",
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<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`' />\n<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`' />\n<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`' />\n<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`' />\n\n",
         "comments": "",
-        "x": 1105.02734375,
-        "y": 1537.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 1108.02734375,
+        "y": 1528.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "ab256b41.e2d9b8",
+        "id": "d661efba.3fa238",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1140.52734375,
-        "y": 1577.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 1143.52734375,
+        "y": 1568.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "7aea425d.d2ac8c",
-                "c6896fdc.d8f088"
+                "f63083b5.0624b",
+                "fbf2273e.fbe678"
             ]
         ]
     },
     {
-        "id": "e7a0edea.212a28",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1657.52734375,
-        "y": 1597.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 1660.52734375,
+        "y": 1588.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "dc79f422.6ffec8",
-                "fce6e76c.ef0f5"
+                "72a042fd.6a9e5c",
+                "4ae2509c.7d19b8"
             ]
         ]
     },
     {
-        "id": "dc79f422.6ffec8",
+        "id": "72a042fd.6a9e5c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2001.02734375,
-        "y": 1597.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 2004.02734375,
+        "y": 1588.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "e78610af.f485d"
+                "743fa383.cc94fc"
             ]
         ]
     },
     {
-        "id": "e78610af.f485d",
+        "id": "743fa383.cc94fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2158.52734375,
-        "y": 1597.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 2161.52734375,
+        "y": 1588.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             []
         ]
     },
     {
-        "id": "3c748274.94d126",
+        "id": "7e01ab8f.069484",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
         "comments": "",
-        "x": 2155.02734375,
-        "y": 1557.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 2158.02734375,
+        "y": 1548.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": []
     },
     {
-        "id": "fce6e76c.ef0f5",
+        "id": "4ae2509c.7d19b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1997.02734375,
-        "y": 1557.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 2000.02734375,
+        "y": 1548.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "3c748274.94d126"
+                "7e01ab8f.069484"
             ]
         ]
     },
     {
-        "id": "7aea425d.d2ac8c",
+        "id": "f63083b5.0624b",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1353.3711738586426,
-        "y": 1557.162670135498,
-        "z": "5c3e2071.30fcf",
+        "x": 1356.3711738586426,
+        "y": 1548.162670135498,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "7a6c581b.b1ed5"
+                "42cb8b06.e7daec"
             ]
         ]
     },
     {
-        "id": "c6896fdc.d8f088",
+        "id": "fbf2273e.fbe678",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1357.02734375,
-        "y": 1597.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 1360.02734375,
+        "y": 1588.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "e7a0edea.212a28"
+                "678c3911.078e2"
             ]
         ]
     },
     {
-        "id": "7a6c581b.b1ed5",
+        "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\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1667.52734375,
-        "y": 1557.040771484375,
-        "z": "5c3e2071.30fcf",
+        "x": 1670.52734375,
+        "y": 1548.040771484375,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "fce6e76c.ef0f5",
-                "dc79f422.6ffec8"
+                "4ae2509c.7d19b8",
+                "72a042fd.6a9e5c"
             ]
         ]
     },
     {
-        "id": "25602afb.1d9cfe",
+        "id": "28391a2c.3321fe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 722,
-        "y": 672,
-        "z": "5c3e2071.30fcf",
+        "x": 725,
+        "y": 663,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "8bfca5dd.ccec38"
+                "6a811cc0.b174ac"
             ]
         ]
     },
     {
-        "id": "a9afb163.16d81",
+        "id": "51c3744a.753414",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1992,
-        "y": 826,
-        "z": "5c3e2071.30fcf",
+        "x": 1995,
+        "y": 817,
+        "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "6d7469b.d065118"
+                "796d1bdc.d65e9c"
             ]
         ]
+    },
+    {
+        "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",
+        "comments": "",
+        "x": 655,
+        "y": 1015,
+        "z": "9b26c8a0.a64c1",
+        "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-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
index 191456bd..0a95efc3 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "41bcd68b.3b187",
+        "id": "bdabd9df.2798c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 117,
-        "y": 66,
-        "z": "c1f3ee3d.7e867",
+        "x": 134,
+        "y": 76,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "68ff8d75.08d6bc"
+                "37325ab3.a584e6"
             ]
         ]
     },
     {
-        "id": "68ff8d75.08d6bc",
+        "id": "37325ab3.a584e6",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,600 +22,608 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 248.2856903076172,
-        "y": 115.23810863494873,
-        "z": "c1f3ee3d.7e867",
+        "x": 265.2856903076172,
+        "y": 125.23810863494873,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "e9c8e7da.08db58"
+                "89aa288e.14e82"
             ]
         ]
     },
     {
-        "id": "e9c8e7da.08db58",
+        "id": "89aa288e.14e82",
         "type": "method",
         "name": "method sotn-vf-operation-uni-create",
         "xml": "<method rpc='sotn-vf-operation-uni-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 251.42861938476562,
-        "y": 200.00003242492676,
-        "z": "c1f3ee3d.7e867",
+        "x": 268.4286193847656,
+        "y": 210.00003242492676,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "9b876278.69aec"
+                "6a0993ac.72dd54"
             ]
         ]
     },
     {
-        "id": "b6719136.d1d408",
+        "id": "a9a04009.84cea",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 625.5273399353027,
-        "y": 85,
-        "z": "c1f3ee3d.7e867",
+        "x": 642.5273399353027,
+        "y": 95,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "de455676.bfc4b8"
+                "61b0d7e5.2d7618"
             ]
         ]
     },
     {
-        "id": "de455676.bfc4b8",
+        "id": "61b0d7e5.2d7618",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 812.194019317627,
-        "y": 84.33329772949219,
-        "z": "c1f3ee3d.7e867",
+        "x": 829.194019317627,
+        "y": 94.33329772949219,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "caff06c1.7f0ea8"
+                "bd3df9dd.cbfcb"
             ]
         ]
     },
     {
-        "id": "caff06c1.7f0ea8",
+        "id": "bd3df9dd.cbfcb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",
         "comments": "",
-        "x": 993.8606452941895,
-        "y": 84.33329772949219,
-        "z": "c1f3ee3d.7e867",
+        "x": 1010.8606452941895,
+        "y": 94.33329772949219,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "2806a3d2.9200ac",
+        "id": "4ccd346e.b2fa8c",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 615.1067600250244,
-        "y": 139.50003504753113,
-        "z": "c1f3ee3d.7e867",
+        "x": 632.1067600250244,
+        "y": 149.50003504753113,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "baaa4638.c65"
+                "a043ea5a.d72c3"
             ]
         ]
     },
     {
-        "id": "baaa4638.c65",
+        "id": "a043ea5a.d72c3",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 866.106855392456,
-        "y": 135.1666555404663,
-        "z": "c1f3ee3d.7e867",
+        "x": 883.106855392456,
+        "y": 145.1666555404663,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "ac6af028.e56f6"
+                "1c9dfc9b.785bf3"
             ]
         ]
     },
     {
-        "id": "ac6af028.e56f6",
+        "id": "1c9dfc9b.785bf3",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1084.4401721954346,
-        "y": 137.1666374206543,
-        "z": "c1f3ee3d.7e867",
+        "x": 1101.4401721954346,
+        "y": 147.1666374206543,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "8e9b59f5.9fbff8"
+                "969f295d.058158"
             ]
         ]
     },
     {
-        "id": "8e9b59f5.9fbff8",
+        "id": "969f295d.058158",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1237.773344039917,
-        "y": 137.16665840148926,
-        "z": "c1f3ee3d.7e867",
+        "x": 1254.773344039917,
+        "y": 147.16665840148926,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "e32594d8.14f33",
+        "id": "40f51cac.5aaffc",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 629.1067790985107,
-        "y": 200.5000331401825,
-        "z": "c1f3ee3d.7e867",
+        "x": 646.1067790985107,
+        "y": 210.5000331401825,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "5097b64f.8e649"
+                "7872a8f4.e17f28"
             ]
         ]
     },
     {
-        "id": "5097b64f.8e649",
+        "id": "7872a8f4.e17f28",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 791.1068248748779,
-        "y": 199.50003218650818,
-        "z": "c1f3ee3d.7e867",
+        "x": 808.1068248748779,
+        "y": 209.50003218650818,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "f8a1475e.8d7dc8"
+                "ecf654ed.ac8c08"
             ]
         ]
     },
     {
-        "id": "f8a1475e.8d7dc8",
+        "id": "ecf654ed.ac8c08",
         "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=\"vnf id not found in service-data\" />\n",
         "comments": "",
-        "x": 940.3569164276123,
-        "y": 197.27790999412537,
-        "z": "c1f3ee3d.7e867",
+        "x": 957.3569164276123,
+        "y": 207.27790999412537,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "7c723171.97826",
+        "id": "1bbfcdc4.cfc1ea",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 663.777361869812,
-        "y": 261.9999940395355,
-        "z": "c1f3ee3d.7e867",
+        "x": 680.777361869812,
+        "y": 271.9999940395355,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "d3dcde48.41f3",
-                "9c9a7796.629b6"
+                "76a0bc4c.3ecaac",
+                "7c11fc12.2ce60c"
             ]
         ]
     },
     {
-        "id": "d3dcde48.41f3",
+        "id": "76a0bc4c.3ecaac",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 894.7773723602295,
-        "y": 237.99999117851257,
-        "z": "c1f3ee3d.7e867",
+        "x": 911.7773723602295,
+        "y": 247.99999117851257,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "eb2b3da4.ac3bf"
+                "dcfece83.e40b18"
             ]
         ]
     },
     {
-        "id": "9c9a7796.629b6",
+        "id": "7c11fc12.2ce60c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 894.7773723602295,
-        "y": 277.9999911785126,
-        "z": "c1f3ee3d.7e867",
+        "x": 911.7773723602295,
+        "y": 287.9999911785126,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "9e326ce7.36ba2"
+                "5a1242b8.d2d7dc"
             ]
         ]
     },
     {
-        "id": "eb2b3da4.ac3bf",
+        "id": "dcfece83.e40b18",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1037.2773723602295,
-        "y": 237.99999117851257,
-        "z": "c1f3ee3d.7e867",
+        "x": 1054.2773723602295,
+        "y": 247.99999117851257,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "9e326ce7.36ba2",
+        "id": "5a1242b8.d2d7dc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1039.1344165802002,
-        "y": 277.9365031719208,
-        "z": "c1f3ee3d.7e867",
+        "x": 1056.1344165802002,
+        "y": 287.9365031719208,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "bb4f26d0.2b52f8",
-                "c6144a09.68351"
+                "fc192c7c.c666c",
+                "3d110b04.3f7cfc"
             ]
         ]
     },
     {
-        "id": "c6144a09.68351",
+        "id": "3d110b04.3f7cfc",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
         "comments": "",
-        "x": 1191.8328914642334,
-        "y": 247.55560186458752,
-        "z": "c1f3ee3d.7e867",
+        "x": 1208.8328914642334,
+        "y": 257.5556018645875,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "bb4f26d0.2b52f8",
+        "id": "fc192c7c.c666c",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1248.261396408081,
-        "y": 300.7777316570282,
-        "z": "c1f3ee3d.7e867",
+        "x": 1265.261396408081,
+        "y": 310.7777316570282,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "cadc9be5.e759e"
+                "88b73d6e.6d468"
             ]
         ]
     },
     {
-        "id": "fcf618d7.ce2b98",
+        "id": "442e188e.f803c",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1471.9121265411377,
-        "y": 259.03178906440735,
-        "z": "c1f3ee3d.7e867",
+        "x": 1488.9121265411377,
+        "y": 269.03178906440735,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "cadc9be5.e759e",
+        "id": "88b73d6e.6d468",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "xml": "<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`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1523.5471172332764,
-        "y": 300.3492343425751,
-        "z": "c1f3ee3d.7e867",
+        "x": 1540.5471172332764,
+        "y": 310.3492343425751,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "c1e99eff.0e5d48"
+                "ea98d10d.89934"
             ]
         ]
     },
     {
-        "id": "c1e99eff.0e5d48",
+        "id": "ea98d10d.89934",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1424.2773151397705,
-        "y": 358.9206655025482,
-        "z": "c1f3ee3d.7e867",
+        "x": 1441.2773151397705,
+        "y": 368.9206655025482,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "840dd033.d02e68"
+                "acd8ea2b.eae8b8"
             ]
         ]
     },
     {
-        "id": "840dd033.d02e68",
+        "id": "acd8ea2b.eae8b8",
         "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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
         "comments": "",
-        "x": 1572.0274181365967,
-        "y": 358.7778575713746,
-        "z": "c1f3ee3d.7e867",
+        "x": 1589.0274181365967,
+        "y": 368.7778575713746,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "425e7a20.0b25dc",
+        "id": "59edc1a3.014a68",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 708.3571338653564,
-        "y": 334.8294517993927,
-        "z": "c1f3ee3d.7e867",
+        "x": 725.3571338653564,
+        "y": 344.8294517993927,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "26fdcf88.d41188",
+        "id": "848c6001.e3ca1",
         "type": "for",
         "name": "for loop idx - VF input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 670.3569316864014,
-        "y": 378.16278433799744,
-        "z": "c1f3ee3d.7e867",
+        "x": 687.3569316864014,
+        "y": 388.16278433799744,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "d2a88646.f84f6"
+                "502abba1.49866c"
             ]
         ]
     },
     {
-        "id": "d2a88646.f84f6",
+        "id": "502abba1.49866c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 885.135274887085,
-        "y": 375.71836829185486,
-        "z": "c1f3ee3d.7e867",
+        "x": 902.135274887085,
+        "y": 385.71836829185486,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "6ee856f3.a6b1a",
-                "7919b72e.9e665"
+                "e8577fea.dc9eb",
+                "c88b6740.086e48"
             ]
         ]
     },
     {
-        "id": "6ee856f3.a6b1a",
+        "id": "e8577fea.dc9eb",
         "type": "execute",
         "name": "execute split parameterName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1081.3914775848389,
-        "y": 353.46650671958923,
-        "z": "c1f3ee3d.7e867",
+        "x": 1098.3914775848389,
+        "y": 363.46650671958923,
+        "z": "d9929d00.bfba4",
         "wires": [
             []
         ]
     },
     {
-        "id": "7919b72e.9e665",
+        "id": "c88b6740.086e48",
         "type": "set",
         "name": "set parameterName",
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
         "comments": "",
-        "x": 1050.8359050750732,
-        "y": 390.46662306785583,
-        "z": "c1f3ee3d.7e867",
+        "x": 1067.8359050750732,
+        "y": 400.46662306785583,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "9b876278.69aec",
+        "id": "6a0993ac.72dd54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 324.1067714691162,
-        "y": 395.4961154460907,
-        "z": "c1f3ee3d.7e867",
+        "x": 341.1067714691162,
+        "y": 405.4961154460907,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "26fdcf88.d41188",
-                "b6719136.d1d408",
-                "7c723171.97826",
-                "6c8900d6.0d8e58",
-                "49bfdced.7c2bbc",
-                "bf7bb77.41be8c8",
-                "abc1f25f.e43c08",
-                "8c309fdb.0398f",
-                "91a89d7a.a0f178",
-                "2806a3d2.9200ac",
-                "e32594d8.14f33",
-                "2b448345.aa142c",
-                "d1e54672.f82058",
-                "abd09dc6.c02b78",
-                "4b4cd818.a8df08",
-                "a0154eab.2fbc7"
+                "848c6001.e3ca1",
+                "1bbfcdc4.cfc1ea",
+                "53255108.3aa87",
+                "eb87c476.701828",
+                "60cc5c3c.7af384",
+                "6cc42136.9a456",
+                "18de011.772867f",
+                "56659886.9d87b",
+                "46813925.b275b",
+                "4dcd3e86.6f4288",
+                "1e2320ca.16ae1f",
+                "922a3600.fd199",
+                "d21f4a10.58364"
             ]
         ]
     },
     {
-        "id": "8c309fdb.0398f",
+        "id": "18de011.772867f",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 611.3292503356934,
-        "y": 933.00732421875,
-        "z": "c1f3ee3d.7e867",
+        "x": 628.3292503356934,
+        "y": 943.00732421875,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "abc1f25f.e43c08",
+        "id": "6cc42136.9a456",
         "type": "save",
         "name": "save service relationship in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-to`\" value=\"uni\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-link`\" value=\"`'/network/unis/uni/' + $prop.vf-id`\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`\" value=\"id\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`\" value=\"`$prop.vf-id`\" />\n",
+        "xml": "<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' -->\n<!--      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-to`\" value=\"uni\" />-->\n<!--<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-link`\" value=\"`'/network/unis/uni/' + $prop.vf-id`\" />-->\n<!--<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`\" value=\"id\" />-->\n<!--<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`\" value=\"`$prop.vf-id`\" />-->\n\n<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 666.606746673584,
-        "y": 891.83349609375,
-        "z": "c1f3ee3d.7e867",
+        "x": 683.606746673584,
+        "y": 901.83349609375,
+        "z": "d9929d00.bfba4",
         "wires": [
             []
         ]
     },
     {
-        "id": "bf7bb77.41be8c8",
+        "id": "60cc5c3c.7af384",
         "type": "save",
         "name": "save uni resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $prop.vf-id' >\n<parameter name=\"id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"tpId\" value='`$prop.uni.tpId`' />\n<parameter name='cVLAN' value='`$prop.uni.vlanId`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $prop.vf-id' >\n<parameter name=\"id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"tp-id\" value='`$prop.uni.tp-id`' />\n<parameter name='cVLAN' value='`$prop.uni.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 648.6068077087402,
-        "y": 787.83349609375,
-        "z": "c1f3ee3d.7e867",
+        "x": 665.6068077087402,
+        "y": 797.83349609375,
+        "z": "d9929d00.bfba4",
         "wires": [
             []
         ]
     },
     {
-        "id": "91a89d7a.a0f178",
+        "id": "56659886.9d87b",
         "type": "set",
         "name": "set vf-module-level-oper-status",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
         "comments": "",
-        "x": 666.1067790985107,
-        "y": 738.5000331401825,
-        "z": "c1f3ee3d.7e867",
+        "x": 683.1067790985107,
+        "y": 748.5000331401825,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "49bfdced.7c2bbc",
+        "id": "eb87c476.701828",
         "type": "set",
         "name": "set vf-module-object-path",
-        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
+        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vf-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n\n\n <!--+ $vf-module-topology-operation-input.vf-module-information.vf-module-id-->\n",
         "comments": "",
-        "x": 649.6068153381348,
-        "y": 696.3335154056549,
-        "z": "c1f3ee3d.7e867",
+        "x": 666.6068153381348,
+        "y": 706.3335154056549,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "6c8900d6.0d8e58",
+        "id": "53255108.3aa87",
         "type": "set",
         "name": "copy input data to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\n",
         "comments": "",
-        "x": 661.4598903656006,
-        "y": 644.8296692371368,
-        "z": "c1f3ee3d.7e867",
+        "x": 678.4598903656006,
+        "y": 654.8296692371368,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "abd09dc6.c02b78",
+        "id": "1e2320ca.16ae1f",
         "type": "set",
         "name": "set new vf-module_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
         "comments": "",
-        "x": 641.5273399353027,
-        "y": 537,
-        "z": "c1f3ee3d.7e867",
+        "x": 658.5273399353027,
+        "y": 547,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "2b448345.aa142c",
+        "id": "46813925.b275b",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
         "comments": "",
-        "x": 648.526927947998,
-        "y": 431.9912657737732,
-        "z": "c1f3ee3d.7e867",
+        "x": 665.526927947998,
+        "y": 441.9912657737732,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "d1e54672.f82058",
+        "id": "4dcd3e86.6f4288",
         "type": "call",
         "name": "call sotn-get-vf-module-uni-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-vf-module-uni-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 687.3406028747559,
-        "y": 484.83709144592285,
-        "z": "c1f3ee3d.7e867",
+        "x": 704.3406028747559,
+        "y": 494.83709144592285,
+        "z": "d9929d00.bfba4",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b4cd818.a8df08",
+        "id": "922a3600.fd199",
         "type": "execute",
         "name": "execute generate-vf-id",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 640.3406181335449,
-        "y": 593.3409690856934,
-        "z": "c1f3ee3d.7e867",
+        "x": 657.3406181335449,
+        "y": 603.3409690856934,
+        "z": "d9929d00.bfba4",
         "wires": [
             []
         ]
     },
     {
-        "id": "a0154eab.2fbc7",
+        "id": "f8f11492.e98458",
         "type": "get-resource",
         "name": "get-resource generic-vnf",
         "xml": "<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' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 638.5273399353027,
-        "y": 843,
-        "z": "c1f3ee3d.7e867",
+        "x": 655.5273399353027,
+        "y": 853,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "288ce8e3.088cd"
+                "3535eafb.6a02f6"
             ]
         ]
     },
     {
-        "id": "42b83e22.53c9",
+        "id": "670e04c7.7b4c04",
         "type": "set",
         "name": "set tmp.relationship_length",
         "xml": "<set>\n<parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\n",
         "comments": "",
-        "x": 1154.52734375,
-        "y": 801,
-        "z": "c1f3ee3d.7e867",
+        "x": 1171.52734375,
+        "y": 811,
+        "z": "d9929d00.bfba4",
         "wires": []
     },
     {
-        "id": "288ce8e3.088cd",
+        "id": "3535eafb.6a02f6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 868,
-        "y": 821,
-        "z": "c1f3ee3d.7e867",
+        "x": 885,
+        "y": 831,
+        "z": "d9929d00.bfba4",
         "wires": [
             [
-                "42b83e22.53c9"
+                "670e04c7.7b4c04"
             ]
         ]
+    },
+    {
+        "id": "d21f4a10.58364",
+        "type": "set",
+        "name": "set vnf-index",
+        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n\n\n",
+        "comments": "",
+        "x": 626,
+        "y": 33,
+        "z": "d9929d00.bfba4",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
index 9730d51f..ce7f41ad 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "f8944be3.096ab8",
+        "id": "e012ce90.0e58e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 111,
-        "y": 56,
-        "z": "9dcfec88.5f292",
+        "x": 154,
+        "y": 93,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "68420034.5c6d98"
+                "971026a6.52ce9"
             ]
         ]
     },
     {
-        "id": "68420034.5c6d98",
+        "id": "971026a6.52ce9",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,350 +22,350 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 242.2856903076172,
-        "y": 105.23810863494873,
-        "z": "9dcfec88.5f292",
+        "x": 285.2856903076172,
+        "y": 142.23810863494873,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "9e33642a.9ab6b8"
+                "424280.3e7be58"
             ]
         ]
     },
     {
-        "id": "9e33642a.9ab6b8",
+        "id": "424280.3e7be58",
         "type": "method",
         "name": "method sotn-vnf-topology-operation-underlay-activate",
         "xml": "<method rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 245.42861938476562,
-        "y": 190.00003242492676,
-        "z": "9dcfec88.5f292",
+        "x": 288.4286193847656,
+        "y": 227.00003242492676,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "f3fc4610.118298"
+                "15b1d170.c6c3bf"
             ]
         ]
     },
     {
-        "id": "f3fc4610.118298",
+        "id": "15b1d170.c6c3bf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 395.238037109375,
-        "y": 319.6666564941406,
-        "z": "9dcfec88.5f292",
+        "x": 438.238037109375,
+        "y": 356.6666564941406,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "321f78ca.ccdc38",
-                "47a0d8c5.66ef38",
-                "30a9bb6d.ac3de4",
-                "470fa21f.c90dac",
-                "a9e79f17.0260f",
-                "79db1524.d2b97c",
-                "47e6b5ed.41cf1c"
+                "d341e8da.386dc8",
+                "7757d326.0ab11c",
+                "28b09a42.4448ee",
+                "3ec3b54e.f18002",
+                "363c01cb.431f2e",
+                "b58db0f2.2bd788",
+                "78a6cae.62d4c34"
             ]
         ]
     },
     {
-        "id": "321f78ca.ccdc38",
+        "id": "d341e8da.386dc8",
         "type": "set",
         "name": "set vnf-level-oper-status to Active",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",
         "comments": "",
-        "x": 738.3849563598633,
-        "y": 556.6705458434299,
-        "z": "9dcfec88.5f292",
+        "x": 781.3849563598633,
+        "y": 593.6705458434299,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "47a0d8c5.66ef38",
+        "id": "7757d326.0ab11c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 658.571647644043,
-        "y": 682.5970833571628,
-        "z": "9dcfec88.5f292",
+        "x": 701.571647644043,
+        "y": 719.5970833571628,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "30a9bb6d.ac3de4",
+        "id": "28b09a42.4448ee",
         "type": "set",
         "name": "set vnf-index and vnf-object-path",
         "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",
         "comments": "",
-        "x": 744.5716018676758,
-        "y": 504.5968001158908,
-        "z": "9dcfec88.5f292",
+        "x": 787.5716018676758,
+        "y": 541.5968001158908,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "470fa21f.c90dac",
+        "id": "3ec3b54e.f18002",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 753,
-        "y": 259,
-        "z": "9dcfec88.5f292",
+        "x": 796,
+        "y": 296,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "bde1ee44.7683d",
-                "2e788e91.c6a1c2",
-                "946699e9.3b5b1"
+                "2a1b5222.0a12ce",
+                "7071c692.fef0f",
+                "f5af0773.6ebfd8"
             ]
         ]
     },
     {
-        "id": "946699e9.3b5b1",
+        "id": "f5af0773.6ebfd8",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1145.968994140625,
-        "y": 224.96875,
-        "z": "9dcfec88.5f292",
+        "x": 1188.968994140625,
+        "y": 261.96875,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "5b4e6761.75d918"
+                "deb6d8c5.8a0d18"
             ]
         ]
     },
     {
-        "id": "5b4e6761.75d918",
+        "id": "deb6d8c5.8a0d18",
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1300.7778816223145,
-        "y": 243.889018535614,
-        "z": "9dcfec88.5f292",
+        "x": 1343.7778816223145,
+        "y": 280.889018535614,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "bde1ee44.7683d",
+        "id": "2a1b5222.0a12ce",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1139.0001335144043,
-        "y": 264.00007152557373,
-        "z": "9dcfec88.5f292",
+        "x": 1182.0001335144043,
+        "y": 301.00007152557373,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "5b4e6761.75d918"
+                "deb6d8c5.8a0d18"
             ]
         ]
     },
     {
-        "id": "2e788e91.c6a1c2",
+        "id": "7071c692.fef0f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1132.0005416870117,
-        "y": 297.000075340271,
-        "z": "9dcfec88.5f292",
+        "x": 1175.0005416870117,
+        "y": 334.000075340271,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "ebf17a44.2210a8"
+                "16d2cb29.ef702d"
             ]
         ]
     },
     {
-        "id": "ebf17a44.2210a8",
+        "id": "16d2cb29.ef702d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1279.2700843811035,
-        "y": 297.5547204017639,
-        "z": "9dcfec88.5f292",
+        "x": 1322.2700843811035,
+        "y": 334.5547204017639,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "e3ab2fd7.ebbf08"
+                "ed1ae4ee.47337"
             ]
         ]
     },
     {
-        "id": "e3ab2fd7.ebbf08",
+        "id": "ed1ae4ee.47337",
         "type": "for",
         "name": "for vidx..service-data.vnfs.vnf_length[]",
         "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1525.2862014770508,
-        "y": 304.42864084243774,
-        "z": "9dcfec88.5f292",
+        "x": 1568.2862014770508,
+        "y": 341.42864084243774,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "18572251.98d83e"
+                "3d63efba.81c87"
             ]
         ]
     },
     {
-        "id": "18572251.98d83e",
+        "id": "3d63efba.81c87",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1744.6358337402344,
-        "y": 303.96872091293335,
-        "z": "9dcfec88.5f292",
+        "x": 1787.6358337402344,
+        "y": 340.96872091293335,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "4a39ea58.7fb184"
+                "db2db94d.9596f8"
             ]
         ]
     },
     {
-        "id": "4a39ea58.7fb184",
+        "id": "db2db94d.9596f8",
         "type": "switchNode",
         "name": "switch vnfid found",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1898.715431213379,
-        "y": 303.67880296707153,
-        "z": "9dcfec88.5f292",
+        "x": 1941.715431213379,
+        "y": 340.67880296707153,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "669b0d11.8a0824"
+                "b38b8c2b.ab959"
             ]
         ]
     },
     {
-        "id": "669b0d11.8a0824",
+        "id": "b38b8c2b.ab959",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2109.6675758361816,
-        "y": 306.571494102478,
-        "z": "9dcfec88.5f292",
+        "x": 2152.6675758361816,
+        "y": 343.571494102478,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "e89a8750.1f8e18"
+                "f56ad8f6.f25e88"
             ]
         ]
     },
     {
-        "id": "e89a8750.1f8e18",
+        "id": "f56ad8f6.f25e88",
         "type": "set",
         "name": "set tmp.vidx and ctx.vnf-data",
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
         "comments": "",
-        "x": 2319.199951171875,
-        "y": 308.32159423828125,
-        "z": "9dcfec88.5f292",
+        "x": 2362.199951171875,
+        "y": 345.32159423828125,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "a9e79f17.0260f",
+        "id": "363c01cb.431f2e",
         "type": "save",
         "name": "update AnAI - vnf-instance.orchestration-status",
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"Active\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
         "comments": "",
         "outputs": 1,
-        "x": 763.9999618530273,
-        "y": 623.0103714736179,
-        "z": "9dcfec88.5f292",
+        "x": 806.9999618530273,
+        "y": 660.0103714736179,
+        "z": "770d39a2.206bf8",
         "wires": [
             []
         ]
     },
     {
-        "id": "79db1524.d2b97c",
+        "id": "b58db0f2.2bd788",
         "type": "set",
         "name": "copy input data to service data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
         "comments": "",
-        "x": 743.0000762939453,
-        "y": 454.01033284980804,
-        "z": "9dcfec88.5f292",
+        "x": 786.0000762939453,
+        "y": 491.01033284980804,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "47e6b5ed.41cf1c",
+        "id": "78a6cae.62d4c34",
         "type": "switchNode",
         "name": "switch vnf-level-oper-status",
         "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 729.7499389648438,
-        "y": 359.00390270072967,
-        "z": "9dcfec88.5f292",
+        "x": 772.7499389648438,
+        "y": 396.00390270072967,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "3e2d00ea.214d9",
-                "ed7ee56e.298fc8"
+                "d6917198.13129",
+                "178db909.328e8f"
             ]
         ]
     },
     {
-        "id": "3e2d00ea.214d9",
+        "id": "d6917198.13129",
         "type": "outcome",
         "name": "outcome Created",
         "xml": "<outcome value='Created'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1109.5833320617676,
-        "y": 364.1149909766391,
-        "z": "9dcfec88.5f292",
+        "x": 1152.5833320617676,
+        "y": 401.1149909766391,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "34b25335.603514"
+                "6cd721df.116148"
             ]
         ]
     },
     {
-        "id": "ed7ee56e.298fc8",
+        "id": "178db909.328e8f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1087.583351135254,
-        "y": 414.1150024207309,
-        "z": "9dcfec88.5f292",
+        "x": 1130.583351135254,
+        "y": 451.1150024207309,
+        "z": "770d39a2.206bf8",
         "wires": [
             [
-                "4a64950b.2e4a84"
+                "ff0fdf62.38c4c"
             ]
         ]
     },
     {
-        "id": "4a64950b.2e4a84",
+        "id": "ff0fdf62.38c4c",
         "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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
         "comments": "",
-        "x": 1247.0831184387207,
-        "y": 417.1150014670566,
-        "z": "9dcfec88.5f292",
+        "x": 1290.0831184387207,
+        "y": 454.1150014670566,
+        "z": "770d39a2.206bf8",
         "wires": []
     },
     {
-        "id": "34b25335.603514",
+        "id": "6cd721df.116148",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1319.889705657959,
-        "y": 375.44016626197845,
-        "z": "9dcfec88.5f292",
+        "x": 1362.889705657959,
+        "y": 412.44016626197845,
+        "z": "770d39a2.206bf8",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json
index fe1d70f2..f834495c 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "630403de.7c4dfc",
+        "id": "c51171cf.967f48",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 130,
-        "y": 71,
-        "z": "adc7d7d7.2ba55",
+        "x": 215,
+        "y": 61,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "80c50a18.8d75c"
+                "dc4fe414.ffc068"
             ]
         ]
     },
     {
-        "id": "80c50a18.8d75c",
+        "id": "dc4fe414.ffc068",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,481 +22,481 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 414.2856903076172,
-        "y": 132.23810863494873,
-        "z": "adc7d7d7.2ba55",
+        "x": 499.2856903076172,
+        "y": 122.23810863494873,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "2da8c00e.5874f"
+                "7bc6b10b.958808"
             ]
         ]
     },
     {
-        "id": "2da8c00e.5874f",
+        "id": "7bc6b10b.958808",
         "type": "method",
         "name": "method sotn-vnf-topology-operation-underlay-create",
         "xml": "<method rpc='sotn-vnf-topology-operation-underlay-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 420.42860412597656,
-        "y": 217.00003051757812,
-        "z": "adc7d7d7.2ba55",
+        "x": 505.42860412597656,
+        "y": 207.00003051757812,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "c4830870.f71be"
+                "abdb94c8.92ca2"
             ]
         ]
     },
     {
-        "id": "c4830870.f71be",
+        "id": "abdb94c8.92ca2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 790.238037109375,
-        "y": 241.66668701171875,
-        "z": "adc7d7d7.2ba55",
+        "x": 875.238037109375,
+        "y": 231.66668701171875,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "d09b0487.d267f8",
-                "4e465113.c34b3",
-                "6d4651f1.9a44a",
-                "b93f8dee.f542a",
-                "18feff02.43bff9",
-                "e9275990.6ea4e",
-                "273e48bf.25ca5",
-                "4b57404f.d373b8",
-                "4822a493.73c54c",
-                "567e338.a899b4c",
-                "616296b0.6f36",
-                "cdecd2ad.ea2458",
-                "9b5e953e.0822e8"
+                "ebb673b7.95bb08",
+                "b3e2958c.9ee52",
+                "e1a71481.b347c",
+                "824a2826.fb7a5",
+                "23822c5.535c954",
+                "db0823f0.79d838",
+                "9d444bb6.e5cc7",
+                "d8fc2b2b.da9d38",
+                "7de6e31b.ca690c",
+                "37ce30ff.3ae068",
+                "a026f709.be666",
+                "d3e90ee2.8cdb8",
+                "4530b43d.793bcc"
             ]
         ]
     },
     {
-        "id": "4e465113.c34b3",
+        "id": "b3e2958c.9ee52",
         "type": "set",
         "name": "set vnf-level-oper-status to Created",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
         "comments": "",
-        "x": 1212.3848495483398,
-        "y": 605.6706197531894,
-        "z": "adc7d7d7.2ba55",
+        "x": 1297.3848495483398,
+        "y": 595.6706197531894,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "d09b0487.d267f8",
+        "id": "ebb673b7.95bb08",
         "type": "set",
         "name": "copy input data to service data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
         "comments": "",
-        "x": 1204.238037109375,
-        "y": 500.6668718131259,
-        "z": "adc7d7d7.2ba55",
+        "x": 1289.238037109375,
+        "y": 490.6668718131259,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "18feff02.43bff9",
+        "id": "23822c5.535c954",
         "type": "execute",
         "name": "execute generate-vnf-index",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1192.5715408325195,
-        "y": 450.3334558280185,
-        "z": "adc7d7d7.2ba55",
+        "x": 1277.5715408325195,
+        "y": 440.3334558280185,
+        "z": "2acad42e.98ae6c",
         "wires": [
             []
         ]
     },
     {
-        "id": "567e338.a899b4c",
+        "id": "37ce30ff.3ae068",
         "type": "set",
         "name": "set vnf-index to service data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",
         "comments": "",
-        "x": 1203.5716171264648,
-        "y": 557.3334596427158,
-        "z": "adc7d7d7.2ba55",
+        "x": 1288.5716171264648,
+        "y": 547.3334596427158,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "6d4651f1.9a44a",
+        "id": "e1a71481.b347c",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1219.5713577270508,
-        "y": 120.33337858039886,
-        "z": "adc7d7d7.2ba55",
+        "x": 1304.5713577270508,
+        "y": 110.33337858039886,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "c4be7092.54bab",
-                "bebf6c90.f10358"
+                "2aa8bb99.a4b4cc",
+                "2ff8b11d.a3a30e"
             ]
         ]
     },
     {
-        "id": "c4be7092.54bab",
+        "id": "2aa8bb99.a4b4cc",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1454.285743713379,
-        "y": 115.47619893867522,
-        "z": "adc7d7d7.2ba55",
+        "x": 1539.285743713379,
+        "y": 105.47619893867522,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "55302818.0621f"
+                "9f14dc9.0335b2"
             ]
         ]
     },
     {
-        "id": "55302818.0621f",
+        "id": "9f14dc9.0335b2",
         "type": "set",
         "name": "set vnf-index=0",
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
         "comments": "",
-        "x": 1614.5714492797852,
-        "y": 115.4762904914096,
-        "z": "adc7d7d7.2ba55",
+        "x": 1699.5714492797852,
+        "y": 105.4762904914096,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "bebf6c90.f10358",
+        "id": "2ff8b11d.a3a30e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1450.714282989502,
-        "y": 148.76203039009124,
-        "z": "adc7d7d7.2ba55",
+        "x": 1535.714282989502,
+        "y": 138.76203039009124,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "d6fccb24.04a71"
+                "c07d0fb1.6b3d1"
             ]
         ]
     },
     {
-        "id": "543cefe7.718a7",
+        "id": "1270cfd.bc37b3",
         "type": "set",
         "name": "set vnf-index = vnf_length",
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
         "comments": "",
-        "x": 1843.5715255737305,
-        "y": 127.04775598365813,
-        "z": "adc7d7d7.2ba55",
+        "x": 1928.5715255737305,
+        "y": 117.04775598365813,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "5d18757b.848c24",
+        "id": "41d9a632.4f7ff",
         "type": "for",
         "name": "for each existing VNF",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1832.000144958496,
-        "y": 162.0477278502658,
-        "z": "adc7d7d7.2ba55",
+        "x": 1917.000144958496,
+        "y": 152.0477278502658,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "8ce4ca7d.ffb71"
+                "648fa43a.d20ca4"
             ]
         ]
     },
     {
-        "id": "d6fccb24.04a71",
+        "id": "c07d0fb1.6b3d1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1585.428565979004,
-        "y": 150.76199987251312,
-        "z": "adc7d7d7.2ba55",
+        "x": 1670.428565979004,
+        "y": 140.76199987251312,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "543cefe7.718a7",
-                "5d18757b.848c24"
+                "1270cfd.bc37b3",
+                "41d9a632.4f7ff"
             ]
         ]
     },
     {
-        "id": "8ce4ca7d.ffb71",
+        "id": "648fa43a.d20ca4",
         "type": "switchNode",
         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2225.2858810424805,
-        "y": 162.6192119391635,
-        "z": "adc7d7d7.2ba55",
+        "x": 2310.2858810424805,
+        "y": 152.6192119391635,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "46146016.cb5b58"
+                "fcc42c1e.bc5548"
             ]
         ]
     },
     {
-        "id": "46146016.cb5b58",
+        "id": "fcc42c1e.bc5548",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2506.5715827941895,
-        "y": 161.1906173499301,
-        "z": "adc7d7d7.2ba55",
+        "x": 2591.5715827941895,
+        "y": 151.1906173499301,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "14fd2dd2.04e2ea"
+                "51470afc.fd843c"
             ]
         ]
     },
     {
-        "id": "fac5d84d.dacdb8",
+        "id": "75fcb25e.311ddc",
         "type": "comment",
         "name": "make sure this vnf-id doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 2194.428497314453,
-        "y": 126.19060399848968,
-        "z": "adc7d7d7.2ba55",
+        "x": 2279.428497314453,
+        "y": 116.19060399848968,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "b93f8dee.f542a",
+        "id": "824a2826.fb7a5",
         "type": "set",
         "name": "set new vnf_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
         "comments": "",
-        "x": 1150.571533203125,
-        "y": 398.33343505859375,
-        "z": "adc7d7d7.2ba55",
+        "x": 1235.571533203125,
+        "y": 388.33343505859375,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "e9275990.6ea4e",
+        "id": "db0823f0.79d838",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1151.5715026855469,
-        "y": 868.5969713004306,
-        "z": "adc7d7d7.2ba55",
+        "x": 1236.5715026855469,
+        "y": 858.5969713004306,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "4822a493.73c54c",
+        "id": "7de6e31b.ca690c",
         "type": "save",
         "name": "save service relationship in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n\n<!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--key='service-instance.service-instance-id = $service-data.service-instance-id -->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1184.2382736206055,
-        "y": 817.5968644889072,
-        "z": "adc7d7d7.2ba55",
+        "x": 1269.2382736206055,
+        "y": 807.5968644889072,
+        "z": "2acad42e.98ae6c",
         "wires": [
             []
         ]
     },
     {
-        "id": "273e48bf.25ca5",
+        "id": "9d444bb6.e5cc7",
         "type": "set",
         "name": "set vnf-index and vnf-object-path",
         "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",
         "comments": "",
-        "x": 1205.571533203125,
-        "y": 646.5968902381137,
-        "z": "adc7d7d7.2ba55",
+        "x": 1290.571533203125,
+        "y": 636.5968902381137,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "14fd2dd2.04e2ea",
+        "id": "51470afc.fd843c",
         "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=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",
         "comments": "",
-        "x": 2635.142951965332,
-        "y": 212.19063165504485,
-        "z": "adc7d7d7.2ba55",
+        "x": 2720.142951965332,
+        "y": 202.19063165504485,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "4b57404f.d373b8",
+        "id": "d8fc2b2b.da9d38",
         "type": "save",
         "name": "save AnAI - vnf-instance.orchestration-status",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey='generic-vnf.vnf-id = $prop.vnf-id' >\n<parameter name=\"orchestration-status\" value=\"Created\" />\n<parameter name=\"in-maint\" value = \"true\" />\n<parameter name=\"vnf-type\" value='`$prop.vnfName`' />\n<parameter name=\"vnf-name\" value = \"`$prop.vnfName`\"/>\n<parameter name=\"model-invariant-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name=\"model-version-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`\"/>\n<parameter name=\"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1260.5458374023438,
-        "y": 756.2471072943881,
-        "z": "adc7d7d7.2ba55",
+        "x": 1345.5458374023438,
+        "y": 746.2471072943881,
+        "z": "2acad42e.98ae6c",
         "wires": [
             []
         ]
     },
     {
-        "id": "1ddf67d5.b35a7",
+        "id": "766790a.b9c79f",
         "type": "comment",
         "name": "TODO: change AAI models",
         "info": "",
         "comments": "",
-        "x": 1194.1820983886719,
-        "y": 715.9743230612949,
-        "z": "adc7d7d7.2ba55",
+        "x": 1279.1820983886719,
+        "y": 705.9743230612949,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "eb3e5b54.ee7cc8",
+        "id": "a966163d.bdafe8",
         "type": "execute",
         "name": "execute split parameterName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1620.7395858764648,
-        "y": 209.75002291519195,
-        "z": "adc7d7d7.2ba55",
+        "x": 1705.7395858764648,
+        "y": 199.75002291519195,
+        "z": "2acad42e.98ae6c",
         "wires": [
             []
         ]
     },
     {
-        "id": "a93d9d55.574d98",
+        "id": "1dc30465.a19184",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1424.483383178711,
-        "y": 214.00189593154937,
-        "z": "adc7d7d7.2ba55",
+        "x": 1509.483383178711,
+        "y": 204.00189593154937,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "eb3e5b54.ee7cc8",
-                "34cb35bb.2ef0aa"
+                "a966163d.bdafe8",
+                "a75d0084.0dea2"
             ]
         ]
     },
     {
-        "id": "616296b0.6f36",
+        "id": "a026f709.be666",
         "type": "for",
         "name": "for loop idx - VNF input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1209.7050399780273,
-        "y": 216.44631197769195,
-        "z": "adc7d7d7.2ba55",
+        "x": 1294.7050399780273,
+        "y": 206.44631197769195,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "a93d9d55.574d98"
+                "1dc30465.a19184"
             ]
         ]
     },
     {
-        "id": "cdecd2ad.ea2458",
+        "id": "d3e90ee2.8cdb8",
         "type": "set",
         "name": "set vnf-request-input.",
         "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",
         "comments": "",
-        "x": 1166.7046737670898,
-        "y": 286.77101900894195,
-        "z": "adc7d7d7.2ba55",
+        "x": 1251.7046737670898,
+        "y": 276.77101900894195,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "34cb35bb.2ef0aa",
+        "id": "a75d0084.0dea2",
         "type": "set",
         "name": "set parameterName",
         "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
         "comments": "",
-        "x": 1597.7395858764648,
-        "y": 255.75002291519195,
-        "z": "adc7d7d7.2ba55",
+        "x": 1682.7395858764648,
+        "y": 245.75002291519195,
+        "z": "2acad42e.98ae6c",
         "wires": []
     },
     {
-        "id": "9b5e953e.0822e8",
+        "id": "4530b43d.793bcc",
         "type": "for",
         "name": "for each sdwan-get-request-input-param",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1222.7395858764648,
-        "y": 338.75002291519195,
-        "z": "adc7d7d7.2ba55",
+        "x": 1307.7395858764648,
+        "y": 328.75002291519195,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "42766226.3db64c"
+                "dc4ef169.09fde8"
             ]
         ]
     },
     {
-        "id": "42766226.3db64c",
+        "id": "dc4ef169.09fde8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1448.9722518920898,
-        "y": 337.09377291519195,
-        "z": "adc7d7d7.2ba55",
+        "x": 1533.9722518920898,
+        "y": 327.09377291519195,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "85dff1eb.0e22b8"
+                "b619e27a.688618"
             ]
         ]
     },
     {
-        "id": "85dff1eb.0e22b8",
+        "id": "b619e27a.688618",
         "type": "switchNode",
         "name": "switch vnf name",
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1605.4722518920898,
-        "y": 335.0938339503482,
-        "z": "adc7d7d7.2ba55",
+        "x": 1690.4722518920898,
+        "y": 325.0938339503482,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "2f903a44.280976"
+                "91d21a65.20ca"
             ]
         ]
     },
     {
-        "id": "2f903a44.280976",
+        "id": "91d21a65.20ca",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1766.4726181030273,
-        "y": 335.09389498550445,
-        "z": "adc7d7d7.2ba55",
+        "x": 1851.4726181030273,
+        "y": 325.09389498550445,
+        "z": "2acad42e.98ae6c",
         "wires": [
             [
-                "55b726c2.cd02d"
+                "9c25080f.021b"
             ]
         ]
     },
     {
-        "id": "55b726c2.cd02d",
+        "id": "9c25080f.021b",
         "type": "set",
         "name": "set vnf name",
         "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1924.4727401733398,
-        "y": 333.6939316065982,
-        "z": "adc7d7d7.2ba55",
+        "x": 2009.4727401733398,
+        "y": 323.6939316065982,
+        "z": "2acad42e.98ae6c",
         "wires": []
     }
 ]
\ 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 4527b788..c6505ad1 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
@@ -3,27 +3,34 @@
     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-create-otn-tunnel' mode='sync'>
         <block atomic="true">
-            <switch test='`$oof.vpn.access-provider-id`'>
-                <outcome value='`$domain-A.provider-id`'>
-

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                <parameter name='source' value='`$oof.vpn.tp-id`' />
+                <parameter name='target' value='`$domain-A.network-id`' />
+                <outcome value='true'>
                     <block atomic="true">
                         <set>
-                            <parameter name='tmp.otn-domain.' value='`$domain-A.`' />
+                            <parameter name='otn-domain.' value='`$domain-A.`' />
                         </set>
                     </block>
                 </outcome>
-                <outcome value='`$domain-B.provider-id`'>
-

-                    <block atomic="true">
-                        <set>
-                            <parameter name='$tmp.otn-domain.' value='`$domain-B.`' />
-                        </set>
-                    </block>
+                <outcome value='false'>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                        <parameter name='source' value='`$oof.vpn.tp-id`' />
+                        <parameter name='target' value='`$domain-B.network-id`' />
+                        <outcome value='true'>
+                            <block atomic="true">
+                                <set>
+                                    <parameter name='$otn-domain.' value='`$domain-B.`' />
+                                </set>
+                            </block>
+                        </outcome>
+                    </execute>
                 </outcome>
-            </switch>
-            <switch test='`$oof.vpn.access-node-id`'>
-                <outcome value='`$oof.vpns[0].access-node-id`'>
-

+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                <parameter name='source' value='`$oof.vpn.tp-id`' />
+                <parameter name='target' value='`$tmp.oofsolutions-first-src-pnf-name`' />
+                <outcome value='true'>
                     <block atomic="true">
                         <set>
                             <parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />
@@ -44,29 +51,34 @@
                         </set>
                     </block>
                 </outcome>
-                <outcome value='`$oof.vpns[$oof.vpns_length].access-node-id`'>
-

-                    <block atomic="true">
-                        <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 value='false'>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                        <parameter name='source' value='`$oof.vpn.tp-id`' />
+                        <parameter name='target' value='`$tmp.oofsolutions-last-dst-pnf-name`' />
+                        <outcome value='true'>
+                            <block atomic="true">
+                                <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>
+                    </execute>
                 </outcome>
-            </switch>
+            </execute>
             <switch test="`$prop.sdncRestApi.token_id`">
                 <outcome value=''>
                     <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
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 9a86f933..7159b23a 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
@@ -27,222 +27,240 @@
                     <block></block>
                 </outcome>
             </execute>
-            <for index='vidx' start='0' end='`$otn-oof.otn-links_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].`' />
+                        <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 
-		AND depth = '0'"
+		key="logical-link.link-name = $otn-oof.link-name"
         pfx='tmp.aai.cross-link' local-only='false' >
+                        <!--AND depth = '0'"-->
                         <outcome value='success'>
-                            <switch test='`$tmp.aai.cross-link.link-role`'>
-                                <outcome value='cross-domain-link'>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                            <parameter name='tmp.cross-link.dst-ltpId' 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" 
+                            <block>
+                                <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="p-interface.interface-name = $tmp.src-ltpId 
-		AND depth = '0'"
+		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' >
-                                            <outcome value='success'>
-                                                <set>
-                                                    <parameter name='tmp.src-pnf-name' value="`$tmp.aai.src-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                                </set>
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                                                <!--AND depth = '0'"-->
+                                                <outcome value='success'>
+                                                    <block>
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="pnf" 
-		key="pnf.pnf-name = $tmp.src-pnf-name 
-		AND depth = '0'"
+		key="pnf.pnf-name = $tmp.src-pnf-name"
         pfx='tmp.aai.src-pnf' local-only='false' >
-                                                    <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' />
-                                                            </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'>
-                                                                        <block atomic="true">
-                                                                            <set>
-                                                                                <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" 
+                                                            <!--AND depth = '0'"-->
+                                                            <outcome value='success'>
+                                                                <block>
+                                                                    <set>
+                                                                        <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                        <parameter name='domain-A.tpn' value='1' />
+                                                                    </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'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <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'>
+                                                                                        <outcome value='success'>
+                                                                                            <set>
+                                                                                                <parameter name='domain-A.ttp-id' value="`$tmp.aai.src-ttp.ttp-id`" />
+                                                                                            </set>
+                                                                                        </outcome>
+                                                                                    </get-resource>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='network-resource'>
+                                                                                <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='domain-A.ttp-id' value="`$tmp.aai.src-ttp.ttp-id`" />
+                                                                                        <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
                                                                                     </set>
-                                                                                </outcome>
-                                                                            </get-resource>
-                                                                        </block>
-                                                                    </outcome>
-                                                                    <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`" />
-                                                                            </set>
-                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                                                                                    <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`" />
-                                                                                    </set>
-                                                                                </outcome>
-                                                                            </get-resource>
-                                                                        </block>
-                                                                    </outcome>
-                                                                </switch>
-                                                            </for>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='Other'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                        </return>
-                                                    </outcome>
-                                                </get-resource>
-                                            </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" 
+                                                                                        <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`" />
+                                                                                            </set>
+                                                                                        </outcome>
+                                                                                    </get-resource>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </for>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='not-found'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                </return>
+                                                            </outcome>
+                                                            <outcome value='Other'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                </return>
+                                                            </outcome>
+                                                        </get-resource>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="p-interface" 
-		key="p-interface.interface-name = $tmp.dst-ltpId 
-		AND depth = '0'"
+		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' >
-                                            <outcome value='success'>
-                                                <set>
-                                                    <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.dst-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                                </set>
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                                                <!--AND depth = '0'"-->
+                                                <outcome value='success'>
+                                                    <block>
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="pnf" 
-		key="pnf.pnf-name = $tmp.dst-pnf-name 
-		AND depth = '0'"
+		key="pnf.pnf-name = $tmp.dst-pnf-name"
         pfx='tmp.aai.dst-pnf' local-only='false' >
-                                                    <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' />
-                                                            </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'>
-                                                                        <block atomic="true">
-                                                                            <set>
-                                                                                <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" 
+                                                            <!--AND depth = '0'"-->
+                                                            <outcome value='success'>
+                                                                <block>
+                                                                    <set>
+                                                                        <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                        <parameter name='domain-B.tpn' value='1' />
+                                                                    </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'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <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'>
+                                                                                        <outcome value='success'>
+                                                                                            <set>
+                                                                                                <parameter name='domain-B.ttp-id' value="`$tmp.aai.dst-ttp.ttp-id`" />
+                                                                                            </set>
+                                                                                        </outcome>
+                                                                                    </get-resource>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='network-resource'>
+                                                                                <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='domain-B.ttp-id' value="`$tmp.aai.dst-ttp.ttp-id`" />
+                                                                                        <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
                                                                                     </set>
-                                                                                </outcome>
-                                                                            </get-resource>
-                                                                        </block>
-                                                                    </outcome>
-                                                                    <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`" />
-                                                                            </set>
-                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                                                                                    <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`" />
-                                                                                    </set>
-                                                                                </outcome>
-                                                                            </get-resource>
-                                                                        </block>
-                                                                    </outcome>
-                                                                </switch>
-                                                            </for>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='Other'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                        </return>
-                                                    </outcome>
-                                                </get-resource>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                </return>
-                                            </outcome>
-                                            <outcome value='Other'>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                </return>
-                                            </outcome>
-                                        </get-resource>
-                                        <break/>
-                                    </block>
-                                </outcome>
-                            </switch>
+                                                                                        <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`" />
+                                                                                            </set>
+                                                                                        </outcome>
+                                                                                    </get-resource>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </for>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='not-found'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                </return>
+                                                            </outcome>
+                                                            <outcome value='Other'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                </return>
+                                                            </outcome>
+                                                        </get-resource>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                            <break/>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                                <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>
+                                    </outcome>
+                                </switch>
+                            </block>
                         </outcome>
                         <outcome value='not-found'>
                             <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml
index 8629403f..5297297a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml
@@ -12,10 +12,10 @@
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tpId'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tp-id'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.uni.tpId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.uni.tp-id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
index e2e61c6c..1f3e0f7f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
@@ -1,69 +1,17 @@
 <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}'>
+    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-l2vpn-activate' mode='sync'>
         <block atomic="true">
-            <switch test='`$service-data.vnfs.vnf_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" />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                            <block>
-                                <switch test="`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='tmp.vidx' value='`$vidx`' />
-                                            <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </for>
-                    </block>
-                </outcome>
-            </switch>
-            <switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>
-                <outcome value='Created'>
-                    <block atomic="true"></block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
-                    </return>
-                </outcome>
-            </switch>
             <set>
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
+                <!--<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />-->
+                <!--<parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />-->
+                <parameter name='vnfId' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
+                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vf-module-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />
             </set>
-            <set>
-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />
-            </set>
-            <set>
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
-            </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                    resource="connectivity"
-                    key="connectivity.connectivity-id = $vnfId" >
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="connectivity"   
+		key="connectivity.connectivity-id = $vnfId" >
                 <parameter name="operational-status" value="Active" />
             </update>
             <return status='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml
index 94e218b0..98ca621f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml
@@ -1,27 +1,29 @@
 <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}'>
+    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-l2vpn-create' mode='sync'>
         <block atomic="true">
-            <switch test='`$service-data.vnfs.vnf_length`'>
+            <set>
+                <parameter name='vnf-index' value='0' />
+            </set>
+            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
                 <outcome value=''>
                     <set>
-                        <parameter name='vnf-index' value='0' />
+                        <parameter name='vf-index' value='0' />
                     </set>
                 </outcome>
                 <outcome value='Other'>
                     <block>
                         <set>
-                            <parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />
+                            <parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />
                         </set>
-                        <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                            <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>
+                        <for index='idx' start='0' end='`$vf-index`' >
+                            <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'>
                                     <return status='failure'>
                                         <parameter name='ack-final' value='Y'/>
                                         <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id
-      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`" />
+                                        <parameter name="error-message" value="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data" />
                                     </return>
                                 </outcome>
                             </switch>
@@ -29,62 +31,102 @@
                     </block>
                 </outcome>
             </switch>
-            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">
+            <for index="idx" start="0" end="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">
                 <block>
                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                        <parameter name="original_string" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>
+                        <parameter name="original_string" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>
                         <parameter name="regex" value="_"/>
                         <parameter name="ctx_memory_result_key" value="param-prefix"/>
                     </execute>
                     <set>
-                        <parameter name="`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
+                        <parameter name="`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
                     </set>
                 </block>
             </for>
-            <set>
-                <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />
-            </set>
-            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">
+            <for index="idx" start="0" end="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">
                 <block>
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">
+                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
                 </block>
             </for>
             <set>
-                <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />
+                <parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />
             </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                <parameter name="ctx-destination" value="prop.connectivity-id"/>
-            </execute>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />
             </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="prop.vpn-vf-index"/>
+            </execute>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />
+                <!--<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />-->
             </set>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
+                <parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />
+                <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $vf-module-topology-operation-input.service-information.service-instance-id
+ + '/service-data/vnfs/vnf/'
+ + $service-data.vnfs.vnf[$vnf-index].vnf-id
+ + '/vnf-data/vf-modules/vf-module/'
+ + $prop.vpn-vf-index
+ + '/vf-module-data/vf-module-topology/'`"/>
+                <parameter name='vnf-object-path'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $vf-module-topology-operation-input.service-information.service-instance-id
+ + '/service-data/vnfs/vnf/'
+ + $service-data.vnfs.vnf[$vnf-index].vnf-id
+ + '/vnf-data/vnf-topology/'`"/>
+                <parameter name='service-object-path'
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $vf-module-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
             </set>
             <set>
-                <parameter name='vnfId' value='`$prop.vnf-id`' />
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
             </set>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                  resource="connectivity"
-                  key='connectivity.connectivity-id = $prop.connectivity-id' >
-                <parameter name="operational-status" value="Created" />
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $prop.vpn-vf-index'>
+                <parameter name='connectivity-id' value='`$prop.vpn-vf-index`' />
+                <parameter name='operational-status' value='Created' />
+                <!--<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />-->
+                <!--<parameter name='sdwan-vpn-name' value='`$prop.name`' />-->
+                <!--<parameter name='topology' value='`$prop.topology`' />-->
+                <!--<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />-->
+                <!--<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />-->
+                <!--<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />-->
+                <!--<parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` " />-->
+            </save>
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
+      key='generic-vnf.vnf-id = $vf-module-topology-operation-input.vnf-information.vnf-id' 
+      force="true" pfx="tmp.AnAI-data">
+                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.vpn-vf-index`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.id" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vpn-vf-index`" />
+                <!--key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->
             </save>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
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 ec76dae8..406f52c0 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
@@ -61,7 +61,6 @@
                                         <set>
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
                                         </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>
                                     </block>
                                 </outcome>
                             </switch>
@@ -71,17 +70,18 @@
             </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' 
-		AND depth = '0'"
+		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'>
                     <block>
                         <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >
-                            <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+                            <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.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`'/>
@@ -168,61 +168,30 @@
                 </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`' >
                 <block atomic="true">
                     <set>
                         <parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />
                     </set>
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $oof.vpn.thirdparty-sdnc-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`" />
-                            </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' ></call>
                     <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' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
index e582fb7e..9648bb69 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
@@ -3,33 +3,9 @@
     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-create' 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="404" />
-                        <parameter name="error-message" value="There are no VNFs in MD-SAL" />
-                    </return>
-                </outcome>
-            </switch>
-            <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'>
-                        <set>
-                            <parameter name='vnf-index' value='`$idx`' />
-                        </set>
-                    </outcome>
-                </switch>
-            </for>
-            <switch test='`$vnf-index`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf id not found in service-data" />
-                    </return>
-                </outcome>
-            </switch>
+            <set>
+                <parameter name='vnf-index' value='0' />
+            </set>
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
                 <outcome value=''>
                     <set>
@@ -87,6 +63,7 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />
             </set>
             <set>
                 <parameter name='vf-module-id' value='`$prop.vf-id`'/>
@@ -95,7 +72,7 @@
  + '/service-data/vnfs/vnf/'
  + $service-data.vnfs.vnf[$vnf-index].vnf-id
  + '/vnf-data/vf-modules/vf-module/'
- + $vf-module-topology-operation-input.vf-module-information.vf-module-id
+ + $prop.vf-id
  + '/vf-module-data/vf-module-topology/'`"/>
                 <parameter name='vnf-object-path'
  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
@@ -107,6 +84,7 @@
  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $vf-module-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
+                <!--+ $vf-module-topology-operation-input.vf-module-information.vf-module-id-->
             </set>
             <set>
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />
@@ -116,32 +94,28 @@
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' 
       key='uni.id = $prop.vf-id' >
                 <parameter name="id" value="`$prop.vf-id`" />
-                <parameter name="tpId" value='`$prop.uni.tpId`' />
-                <parameter name='cVLAN' value='`$prop.uni.vlanId`' />
+                <parameter name="tp-id" value='`$prop.uni.tp-id`' />
+                <parameter name='cVLAN' value='`$prop.uni.cVLAN`' />
                 <parameter name='operational-status' value='Created' />
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
                 <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />
             </save>
-            <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'>
-                    <set>
-                        <parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>
-                    </set>
-                </outcome>
-            </get-resource>
+            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' -->
+            <!--      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->
+            <!--      force="true" pfx="tmp.AnAI-data">-->
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].related-to`" value="uni" />-->
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].related-link`" value="`'/network/unis/uni/' + $prop.vf-id`" />-->
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`" value="id" />-->
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`" value="`$prop.vf-id`" />-->
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
       key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' 
       force="true" pfx="tmp.AnAI-data">
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].related-to`" value="uni" />
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].related-link`" value="`'/network/unis/uni/' + $prop.vf-id`" />
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`" value="id" />
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`" value="`$prop.vf-id`" />
+                <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $prop.vf-id`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="id" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vf-id`" />
             </save>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml
index 69344e8a..3210405e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml
@@ -1,6 +1,6 @@
 <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}'>
+    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-vnf-topology-operation-underlay-activate' mode='sync'>
         <block atomic="true">
             <switch test='`$service-data.vnfs.vnf_length`'>
@@ -61,9 +61,9 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
             </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                    resource="generic-vnf"
-                    key="generic-vnf.vnf-id = $vnfId" >
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="generic-vnf"   
+		key="generic-vnf.vnf-id = $vnfId" >
                 <parameter name="orchestration-status" value="Active" />
                 <parameter name="vnf-type" value="some vnf-type" />
             </update>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml
index ba1c3cdd..07ba2028 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml
@@ -1,7 +1,7 @@
 <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='vnf-topology-operation-vpn-site-resource-create' mode='sync'>
+    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-vnf-topology-operation-underlay-create' mode='sync'>
         <block atomic="true">
             <switch test='`$service-data.vnfs.vnf_length`'>
                 <outcome value=''>
@@ -81,9 +81,9 @@
                 <parameter name='vnfId' value='`$prop.vnf-id`' />
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />
             </set>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                  resource="generic-vnf"
-                  key='generic-vnf.vnf-id = $prop.vnf-id' >
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="generic-vnf"   
+		key='generic-vnf.vnf-id = $prop.vnf-id' >
                 <parameter name="orchestration-status" value="Created" />
                 <parameter name="in-maint" value = "true" />
                 <parameter name="vnf-type" value='`$prop.vnfName`' />
@@ -92,11 +92,11 @@
                 <parameter name="model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>
                 <parameter name="model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>
             </save>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                  key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
-                  force="true" pfx="tmp.AnAI-data">
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
+      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
+         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
+         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' 
+      force="true" pfx="tmp.AnAI-data">
                 <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
-- 
cgit 1.2.3-korg