From 3bd83a42221c4f5c0cbaf586657e5310c8516018 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Mon, 6 May 2019 12:03:42 +0530
Subject: [PATCH] Fix SDWAN peer wise integration testing issues

SDWAN lan-port-config create,activate DGs are
fixed with valid request-action and updated
service-data with response-id returned from
SDWAN controller

Change-Id: Ib4067d4de257c64f81b4e70584bcf26c87bbaa04
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: 08d1ca8e484cab832ce1f54cc36539888d77b08a
---
 ...CE-API_sdwan-vf-operation-lanport-activate.json |  86 ++++-
 ...URCE-API_sdwan-vf-operation-lanport-create.json | 399 ++++++++++-----------
 ...opology-operation-vpn-site-resource-create.json | 371 ++++++++++++-------
 ...RCE-API_sdwan-vf-operation-lanport-activate.xml | 161 +++++----
 ...OURCE-API_sdwan-vf-operation-lanport-create.xml |  25 +-
 ...topology-operation-vpn-site-resource-create.xml |  35 +-
 6 files changed, 629 insertions(+), 448 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
index 710748fc..722e5c12 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
@@ -557,8 +557,8 @@
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1243.008186340332,
-        "y": 773.003986954689,
+        "x": 1251.008171081543,
+        "y": 817.0040302276611,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -573,8 +573,8 @@
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 889.0080261230469,
-        "y": 740.0040270090103,
+        "x": 1256.0080871582031,
+        "y": 730.0041098594666,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -594,7 +594,7 @@
         "z": "8f678717.6ce918",
         "wires": [
             [
-                "752f257f.d5098c"
+                "f8bad303.dbe7d"
             ]
         ]
     },
@@ -605,8 +605,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1465.0081024169922,
-        "y": 773.0040684938431,
+        "x": 1501.0082206726074,
+        "y": 811.0041122436523,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -2086,8 +2086,8 @@
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1949.2583618164062,
-        "y": 755.5041704177856,
+        "x": 1961.2583961486816,
+        "y": 799.5041923522949,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -2119,8 +2119,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1663.5312805175781,
-        "y": 781.0312776565552,
+        "x": 1693.531337738037,
+        "y": 804.0312929153442,
         "z": "8f678717.6ce918",
         "wires": [
             [
@@ -2241,5 +2241,69 @@
         "y": 2197.2225341796875,
         "z": "8f678717.6ce918",
         "wires": []
+    },
+    {
+        "id": "f8bad303.dbe7d",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 875,
+        "y": 666.6666870117188,
+        "z": "8f678717.6ce918",
+        "wires": [
+            [
+                "8c2d8bf6.5cda78"
+            ]
+        ]
+    },
+    {
+        "id": "8c2d8bf6.5cda78",
+        "type": "switchNode",
+        "name": "switch vf-modules.vf-module_length",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 708.7500152587891,
+        "y": 790.9167098999023,
+        "z": "8f678717.6ce918",
+        "wires": [
+            [
+                "fd56a113.86307"
+            ]
+        ]
+    },
+    {
+        "id": "fd56a113.86307",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 877,
+        "y": 734.6666870117188,
+        "z": "8f678717.6ce918",
+        "wires": [
+            [
+                "341d8e5.7253272"
+            ]
+        ]
+    },
+    {
+        "id": "341d8e5.7253272",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1024.2500305175781,
+        "y": 733.416708946228,
+        "z": "8f678717.6ce918",
+        "wires": [
+            [
+                "752f257f.d5098c"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
index 3ce166ee..b09a059b 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
@@ -1,431 +1,431 @@
 [
     {
-        "id": "3ecdadeb.18aa62",
+        "id": "f782e37.109032",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 432.00389862060547,
-        "y": 378.9999885559082,
-        "z": "dfb806d8.8899e8",
+        "x": 583,
+        "y": 401.1628177165985,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "b1de8da9.db8a2",
-                "d704787.9944088",
-                "c4e200e6.2e02b",
-                "5f812e79.2be7e",
-                "2b234f37.76666",
-                "7dbca450.42794c",
-                "7e93696e.840218",
-                "676ec3b1.844d3c",
-                "e3e05047.2e5b8",
-                "91a71daa.ef5c2",
-                "b3c3b183.55c72",
-                "d01634bb.bb46b8",
-                "43cde2b5.87e1ac",
-                "c6fbc47.00d1938",
-                "98c6c3b2.42b6b"
+                "3a0d40d2.1b88f",
+                "fdf59618.623758",
+                "d535f520.a2b4c8",
+                "5957a088.cf332",
+                "9afb8db9.2b0d5",
+                "1b22ffce.90ac5",
+                "9c073f69.f288d",
+                "8cc9cbda.e9db18",
+                "1db1621b.e18c6e",
+                "33fd1f45.d7ff5",
+                "2ebef402.b67dec",
+                "a78628f7.4e9428",
+                "9f1428de.0587b8",
+                "69722b7c.abba54",
+                "86d99a3f.07f208"
             ]
         ]
     },
     {
-        "id": "b1de8da9.db8a2",
+        "id": "3a0d40d2.1b88f",
         "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": 778.2540588378906,
-        "y": 361.66665744781494,
-        "z": "dfb806d8.8899e8",
+        "x": 929.2501602172852,
+        "y": 383.82948660850525,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "d245ffbf.59c6c"
+                "edd147b1.5a9678"
             ]
         ]
     },
     {
-        "id": "d245ffbf.59c6c",
+        "id": "edd147b1.5a9678",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 993.0324020385742,
-        "y": 359.22224140167236,
-        "z": "dfb806d8.8899e8",
+        "x": 1144.0285034179688,
+        "y": 381.38507056236267,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "82c635c3.382618",
-                "bcda53d8.f6893"
+                "239191e9.78691e",
+                "1a76d1a9.524ade"
             ]
         ]
     },
     {
-        "id": "82c635c3.382618",
+        "id": "239191e9.78691e",
         "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": 1189.2886047363281,
-        "y": 336.97037982940674,
-        "z": "dfb806d8.8899e8",
+        "x": 1340.2847061157227,
+        "y": 359.13320899009705,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "bcda53d8.f6893",
+        "id": "1a76d1a9.524ade",
         "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": 1158.7330322265625,
-        "y": 373.97049617767334,
-        "z": "dfb806d8.8899e8",
+        "x": 1309.729133605957,
+        "y": 396.13332533836365,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "ac17a6a.af45258",
+        "id": "24f00d92.239812",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 816.2542610168457,
-        "y": 318.3333249092102,
-        "z": "dfb806d8.8899e8",
+        "x": 967.2503623962402,
+        "y": 340.4961540699005,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "c4e200e6.2e02b",
+        "id": "d535f520.a2b4c8",
         "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": 757.190673828125,
-        "y": 520.1629304885864,
-        "z": "dfb806d8.8899e8",
+        "x": 908.1867752075195,
+        "y": 542.3257596492767,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "d704787.9944088",
+        "id": "fdf59618.623758",
         "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": 764.1902618408203,
-        "y": 415.1541962623596,
-        "z": "dfb806d8.8899e8",
+        "x": 915.1863632202148,
+        "y": 437.3170254230499,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "7e93696e.840218",
+        "id": "9c073f69.f288d",
         "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",
         "comments": "",
-        "x": 769.3570175170898,
-        "y": 628.3335423469543,
-        "z": "dfb806d8.8899e8",
+        "x": 920.3531188964844,
+        "y": 650.4963715076447,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "676ec3b1.844d3c",
+        "id": "8cc9cbda.e9db18",
         "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",
         "comments": "",
-        "x": 757.503942489624,
-        "y": 679.8373885154724,
-        "z": "dfb806d8.8899e8",
+        "x": 908.5000438690186,
+        "y": 702.0002176761627,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "e3e05047.2e5b8",
+        "id": "1db1621b.e18c6e",
         "type": "save",
         "name": "save sdwan lan-port-config resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"device-id\" value='`$prop.lan.deviceName`' />\n<parameter name=\"port-switch\" value='`$prop.lan.portSwitch`' />\n<parameter name=\"port-type\" value='`$prop.lan.portType`' />\n<parameter name=\"port-number\" value='`$prop.lan.portnumber`' />\n<parameter name=\"ipv4-address\" value='`$prop.lan.ipAddress`' />\n<parameter name='vlan-tag' value='`$prop.lan.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-version`' />\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": 812.5039215087891,
-        "y": 772.3373708724976,
-        "z": "dfb806d8.8899e8",
+        "x": 963.5000228881836,
+        "y": 794.5002000331879,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "91a71daa.ef5c2",
+        "id": "33fd1f45.d7ff5",
         "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[0].related-to\" value=\"lan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"lan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 772.5038375854492,
-        "y": 819.3373589515686,
-        "z": "dfb806d8.8899e8",
+        "x": 923.4999389648438,
+        "y": 841.5001881122589,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "b3c3b183.55c72",
+        "id": "2ebef402.b67dec",
         "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": 723.2263832092285,
-        "y": 866.5112180709839,
-        "z": "dfb806d8.8899e8",
+        "x": 874.222484588623,
+        "y": 888.6740472316742,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "5f812e79.2be7e",
+        "id": "5957a088.cf332",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 733.424467086792,
-        "y": 68.5038731098175,
-        "z": "dfb806d8.8899e8",
+        "x": 884.4205684661865,
+        "y": 90.66670227050781,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "ecb5481e.49db98"
+                "26211aa4.6aca76"
             ]
         ]
     },
     {
-        "id": "ecb5481e.49db98",
+        "id": "26211aa4.6aca76",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 920.0911464691162,
-        "y": 67.83717083930969,
-        "z": "dfb806d8.8899e8",
+        "x": 1071.0872478485107,
+        "y": 90,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "5cc69be0.888194"
+                "60b9b040.3db19"
             ]
         ]
     },
     {
-        "id": "5cc69be0.888194",
+        "id": "60b9b040.3db19",
         "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": 1101.7577724456787,
-        "y": 67.83717083930969,
-        "z": "dfb806d8.8899e8",
+        "x": 1252.7538738250732,
+        "y": 90,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "2b234f37.76666",
+        "id": "9afb8db9.2b0d5",
         "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": 771.6744890213013,
-        "y": 245.50386714935303,
-        "z": "dfb806d8.8899e8",
+        "x": 922.6705904006958,
+        "y": 267.66669631004333,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "43b76269.61638c",
-                "80f9fdd1.5acfa"
+                "925220d0.8e6e8",
+                "8d034f0b.c8c8d"
             ]
         ]
     },
     {
-        "id": "43b76269.61638c",
+        "id": "925220d0.8e6e8",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1002.6744995117188,
-        "y": 221.50386428833008,
-        "z": "dfb806d8.8899e8",
+        "x": 1153.6706008911133,
+        "y": 243.66669344902039,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "30daa7e7.f7d908"
+                "f6929bd3.916468"
             ]
         ]
     },
     {
-        "id": "80f9fdd1.5acfa",
+        "id": "8d034f0b.c8c8d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1002.6744995117188,
-        "y": 261.5038642883301,
-        "z": "dfb806d8.8899e8",
+        "x": 1153.6706008911133,
+        "y": 283.6666934490204,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "15ffa14c.a3471f"
+                "28516ca8.58b9a4"
             ]
         ]
     },
     {
-        "id": "30daa7e7.f7d908",
+        "id": "f6929bd3.916468",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1145.1744995117188,
-        "y": 221.50386428833008,
-        "z": "dfb806d8.8899e8",
+        "x": 1296.1706008911133,
+        "y": 243.66669344902039,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "15ffa14c.a3471f",
+        "id": "28516ca8.58b9a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1147.0315437316895,
-        "y": 261.4403762817383,
-        "z": "dfb806d8.8899e8",
+        "x": 1298.027645111084,
+        "y": 283.6032054424286,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "81c65311.3e7fa",
-                "1c59d473.dd26bc"
+                "fe45ce64.2ccb7",
+                "e4014c75.a1a78"
             ]
         ]
     },
     {
-        "id": "1c59d473.dd26bc",
+        "id": "e4014c75.a1a78",
         "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": 1299.7300186157227,
-        "y": 231.05947497440502,
-        "z": "dfb806d8.8899e8",
+        "x": 1450.7261199951172,
+        "y": 253.22230413509533,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "81c65311.3e7fa",
+        "id": "fe45ce64.2ccb7",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1356.1585235595703,
-        "y": 284.2816047668457,
-        "z": "dfb806d8.8899e8",
+        "x": 1507.1546249389648,
+        "y": 306.444433927536,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "aaf0ab5e.460008"
+                "c9dd9d48.363c4"
             ]
         ]
     },
     {
-        "id": "85ce8231.1cc8f",
+        "id": "93986914.2633c8",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1579.809253692627,
-        "y": 242.53566217422485,
-        "z": "dfb806d8.8899e8",
+        "x": 1730.8053550720215,
+        "y": 264.69849133491516,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "aaf0ab5e.460008",
+        "id": "c9dd9d48.363c4",
         "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": 1631.4442443847656,
-        "y": 283.8531074523926,
-        "z": "dfb806d8.8899e8",
+        "x": 1782.4403457641602,
+        "y": 306.0159366130829,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "1a7eae6b.66a2b2"
+                "3a28d2c1.9fee3e"
             ]
         ]
     },
     {
-        "id": "1a7eae6b.66a2b2",
+        "id": "3a28d2c1.9fee3e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1532.1744422912598,
-        "y": 342.4245386123657,
-        "z": "dfb806d8.8899e8",
+        "x": 1683.1705436706543,
+        "y": 364.58736777305603,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "40223de2.189ee4"
+                "c7dfb468.8d2468"
             ]
         ]
     },
     {
-        "id": "40223de2.189ee4",
+        "id": "c7dfb468.8d2468",
         "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": 1679.924545288086,
-        "y": 342.28173068119213,
-        "z": "dfb806d8.8899e8",
+        "x": 1830.9206466674805,
+        "y": 364.44455984188244,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "7dbca450.42794c",
+        "id": "1b22ffce.90ac5",
         "type": "call",
         "name": "call sdwan-get-vf-module-lanport-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 803.0039367675781,
-        "y": 468.0000219345093,
-        "z": "dfb806d8.8899e8",
+        "x": 954.0000381469727,
+        "y": 490.1628510951996,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "d01634bb.bb46b8",
+        "id": "a78628f7.4e9428",
         "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": 774.00390625,
-        "y": 722.00390625,
-        "z": "dfb806d8.8899e8",
+        "x": 925.0000076293945,
+        "y": 744.1667354106903,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "80c0749d.c5b758",
+        "id": "ceaeb6e4.45d088",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 101.00390625,
-        "y": 95.00390625,
-        "z": "dfb806d8.8899e8",
+        "x": 252.00000762939453,
+        "y": 117.16673541069031,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "1e8e9be2.f38a84"
+                "b9aae3a1.4ae74"
             ]
         ]
     },
     {
-        "id": "1e8e9be2.f38a84",
+        "id": "b9aae3a1.4ae74",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -433,146 +433,145 @@
         "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": 215.50390434265137,
-        "y": 202.00389766693115,
-        "z": "dfb806d8.8899e8",
+        "x": 366.5000057220459,
+        "y": 224.16672682762146,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "441193b5.7a563c"
+                "486cfe7f.88b42"
             ]
         ]
     },
     {
-        "id": "441193b5.7a563c",
+        "id": "486cfe7f.88b42",
         "type": "method",
         "name": "sdwan-vf-operation-lanport-create",
         "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 214.50390434265137,
-        "y": 302.00389766693115,
-        "z": "dfb806d8.8899e8",
+        "x": 365.5000057220459,
+        "y": 324.16672682762146,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "3ecdadeb.18aa62"
+                "f782e37.109032"
             ]
         ]
     },
     {
-        "id": "43cde2b5.87e1ac",
+        "id": "9f1428de.0587b8",
         "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": 756.0039520263672,
-        "y": 576.5038995742798,
-        "z": "dfb806d8.8899e8",
+        "x": 907.0000534057617,
+        "y": 598.6667287349701,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6fbc47.00d1938",
+        "id": "69722b7c.abba54",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 723.0038871765137,
-        "y": 123.00390815734863,
-        "z": "dfb806d8.8899e8",
+        "x": 873.9999885559082,
+        "y": 145.16673731803894,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "a2640a51.5d0d78"
+                "c4314464.ea4888"
             ]
         ]
     },
     {
-        "id": "a2640a51.5d0d78",
+        "id": "c4314464.ea4888",
         "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": 974.0039825439453,
-        "y": 118.67052865028381,
-        "z": "dfb806d8.8899e8",
+        "x": 1125.0000839233398,
+        "y": 140.83335781097412,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "d22976f8.730608"
+                "7e2619a7.4c1a38"
             ]
         ]
     },
     {
-        "id": "d22976f8.730608",
+        "id": "7e2619a7.4c1a38",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1192.3372993469238,
-        "y": 120.6705105304718,
-        "z": "dfb806d8.8899e8",
+        "x": 1343.3334007263184,
+        "y": 142.8333396911621,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "92022bc5.0cdcc8"
+                "e7b8aabb.779c28"
             ]
         ]
     },
     {
-        "id": "92022bc5.0cdcc8",
+        "id": "e7b8aabb.779c28",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1345.6704711914062,
-        "y": 120.67053151130676,
-        "z": "dfb806d8.8899e8",
+        "x": 1496.6665725708008,
+        "y": 142.83336067199707,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     },
     {
-        "id": "98c6c3b2.42b6b",
+        "id": "86d99a3f.07f208",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 737.00390625,
-        "y": 184.00390625,
-        "z": "dfb806d8.8899e8",
+        "x": 888.0000076293945,
+        "y": 206.1667354106903,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "681068c6.40fb78"
+                "885839d2.ea1b48"
             ]
         ]
     },
     {
-        "id": "681068c6.40fb78",
+        "id": "885839d2.ea1b48",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 899.0039520263672,
-        "y": 183.00390529632568,
-        "z": "dfb806d8.8899e8",
+        "x": 1050.0000534057617,
+        "y": 205.166734457016,
+        "z": "5ddf8caa.1b92e4",
         "wires": [
             [
-                "f9b4e412.cab938"
+                "1a2b1c2a.3b4624"
             ]
         ]
     },
     {
-        "id": "f9b4e412.cab938",
+        "id": "1a2b1c2a.3b4624",
         "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": 1048.2540435791016,
-        "y": 180.78178310394287,
-        "z": "dfb806d8.8899e8",
+        "x": 1199.250144958496,
+        "y": 202.94461226463318,
+        "z": "5ddf8caa.1b92e4",
         "wires": []
     }
-]
-
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
index 65c2f0ec..3414cb9e 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "4d340fd2.1d47a",
+        "id": "aeae6125.a8d28",
         "type": "method",
         "name": "method vnf-topology-operation-vpn-site-resource-create",
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 251.00390625,
-        "y": 191.9999925820157,
-        "z": "b6e8aa45.a03d48",
+        "x": 265,
+        "y": 223.9999925820157,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "dd995ca6.5527c"
+                "10f15a6d.ba1d76"
             ]
         ]
     },
     {
-        "id": "83ce2cf0.a21b",
+        "id": "3eb5635c.ae734c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 127.57528686523438,
-        "y": 44,
-        "z": "b6e8aa45.a03d48",
+        "x": 141.57138061523438,
+        "y": 76,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "d4e5788.5ad9988"
+                "1821ad11.5dad23"
             ]
         ]
     },
     {
-        "id": "d4e5788.5ad9988",
+        "id": "1821ad11.5dad23",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -38,337 +38,432 @@
         "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": 229.86099243164062,
-        "y": 102.23810407798737,
-        "z": "b6e8aa45.a03d48",
+        "x": 243.85708618164062,
+        "y": 134.23810407798737,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "4d340fd2.1d47a"
+                "aeae6125.a8d28"
             ]
         ]
     },
     {
-        "id": "dd995ca6.5527c",
+        "id": "10f15a6d.ba1d76",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 231.24195098876953,
-        "y": 363.6666643349454,
-        "z": "b6e8aa45.a03d48",
+        "x": 245.23804473876953,
+        "y": 395.6666643349454,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "9e4483c6.3ac77",
-                "a13164e4.2addc8",
-                "3a6751cb.2db1fe",
-                "deb0deb9.10aa8",
-                "8f8480.f469fb8",
-                "f27c92ed.2a351",
-                "4152c1db.9724f",
-                "34769e57.986742",
-                "27f27223.64947e",
-                "5e423ee5.be879",
-                "dfdcb682.501ff8"
+                "175dc57.fde8c3b",
+                "3afb3c65.1ca3a4",
+                "fadde341.82f5a",
+                "9885c8cf.ded0d8",
+                "a5e91b3d.29e478",
+                "6e79157a.cf280c",
+                "fff46357.6f3ad",
+                "5da9f931.70bc48",
+                "df8e278a.898b28",
+                "3a3acb9a.529fc4",
+                "ff8a3cb6.2dc93",
+                "1bd26429.61c74c"
             ]
         ]
     },
     {
-        "id": "a13164e4.2addc8",
+        "id": "3afb3c65.1ca3a4",
         "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": 665.3887023925781,
-        "y": 617.6705932617188,
-        "z": "b6e8aa45.a03d48",
+        "x": 667.3848571777344,
+        "y": 759.670597076416,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "9e4483c6.3ac77",
+        "id": "175dc57.fde8c3b",
         "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": 657.2418899536133,
-        "y": 512.6668453216553,
-        "z": "b6e8aa45.a03d48",
+        "x": 659.2380447387695,
+        "y": 654.6668491363525,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "8f8480.f469fb8",
+        "id": "a5e91b3d.29e478",
         "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": 645.5753936767578,
-        "y": 462.33342933654785,
-        "z": "b6e8aa45.a03d48",
+        "x": 647.5715484619141,
+        "y": 604.3334331512451,
+        "z": "3deddfaf.57c2f",
         "wires": [
             []
         ]
     },
     {
-        "id": "dfdcb682.501ff8",
+        "id": "ff8a3cb6.2dc93",
         "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": 656.5754699707031,
-        "y": 569.3334331512451,
-        "z": "b6e8aa45.a03d48",
+        "x": 658.5716247558594,
+        "y": 711.3334369659424,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "3a6751cb.2db1fe",
+        "id": "fadde341.82f5a",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 660.5752716064453,
-        "y": 242.3333559036255,
-        "z": "b6e8aa45.a03d48",
+        "x": 674.5713653564453,
+        "y": 274.3333559036255,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "2c3f6b93.ddbca4",
-                "29bbdb18.cfe584"
+                "fe0779f6.a341a8",
+                "9f0ded05.d925c"
             ]
         ]
     },
     {
-        "id": "2c3f6b93.ddbca4",
+        "id": "fe0779f6.a341a8",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 895.2896575927734,
-        "y": 237.47617626190186,
-        "z": "b6e8aa45.a03d48",
+        "x": 909.2857513427734,
+        "y": 269.47617626190186,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "8e783130.b1886"
+                "e3b683ce.f47fd"
             ]
         ]
     },
     {
-        "id": "8e783130.b1886",
+        "id": "e3b683ce.f47fd",
         "type": "set",
         "name": "set vnf-index=0",
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
         "comments": "",
-        "x": 1055.5753631591797,
-        "y": 237.47626781463623,
-        "z": "b6e8aa45.a03d48",
+        "x": 1069.5714569091797,
+        "y": 269.47626781463623,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "29bbdb18.cfe584",
+        "id": "9f0ded05.d925c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 891.7181968688965,
-        "y": 270.76200771331787,
-        "z": "b6e8aa45.a03d48",
+        "x": 905.7142906188965,
+        "y": 302.76200771331787,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "64bc2d84.970e54"
+                "411ddf99.4fbb3"
             ]
         ]
     },
     {
-        "id": "c816157.792fce8",
+        "id": "b6024395.bc24",
         "type": "set",
         "name": "set vnf-index = vnf_length",
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
         "comments": "",
-        "x": 1284.575439453125,
-        "y": 249.04773330688477,
-        "z": "b6e8aa45.a03d48",
+        "x": 1298.571533203125,
+        "y": 281.04773330688477,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "a9c0fb1a.4ae688",
+        "id": "3b57b625.74c07a",
         "type": "for",
         "name": "for each existing VNF",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1273.0040588378906,
-        "y": 284.04770517349243,
-        "z": "b6e8aa45.a03d48",
+        "x": 1287.0001525878906,
+        "y": 316.04770517349243,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "e4810c54.16f7c"
+                "a7076dba.f36af"
             ]
         ]
     },
     {
-        "id": "64bc2d84.970e54",
+        "id": "411ddf99.4fbb3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1026.4324798583984,
-        "y": 272.76197719573975,
-        "z": "b6e8aa45.a03d48",
+        "x": 1040.4285736083984,
+        "y": 304.76197719573975,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "c816157.792fce8",
-                "a9c0fb1a.4ae688"
+                "b6024395.bc24",
+                "3b57b625.74c07a"
             ]
         ]
     },
     {
-        "id": "e4810c54.16f7c",
+        "id": "a7076dba.f36af",
         "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": 1666.289794921875,
-        "y": 284.61918926239014,
-        "z": "b6e8aa45.a03d48",
+        "x": 1680.285888671875,
+        "y": 316.61918926239014,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "d88564b1.978518"
+                "b4dc78a5.d896c8"
             ]
         ]
     },
     {
-        "id": "d88564b1.978518",
+        "id": "b4dc78a5.d896c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1947.575496673584,
-        "y": 283.19059467315674,
-        "z": "b6e8aa45.a03d48",
+        "x": 1961.571590423584,
+        "y": 315.19059467315674,
+        "z": "3deddfaf.57c2f",
         "wires": [
             [
-                "eb2d673c.26d6e8"
+                "51ac74f.88fd58c"
             ]
         ]
     },
     {
-        "id": "5a4256cd.31fdd8",
+        "id": "4be264b1.270e6c",
         "type": "comment",
         "name": "make sure this vnf-id doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1635.4324111938477,
-        "y": 248.1905813217163,
-        "z": "b6e8aa45.a03d48",
+        "x": 1649.4285049438477,
+        "y": 280.1905813217163,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "deb0deb9.10aa8",
+        "id": "9885c8cf.ded0d8",
         "type": "set",
         "name": "set new vnf_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
         "comments": "",
-        "x": 617.5753936767578,
-        "y": 410.33342599868774,
-        "z": "b6e8aa45.a03d48",
+        "x": 619.5715484619141,
+        "y": 552.333429813385,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "f27c92ed.2a351",
+        "id": "6e79157a.cf280c",
         "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": 604.5753555297852,
-        "y": 880.59694480896,
-        "z": "b6e8aa45.a03d48",
+        "x": 606.5715103149414,
+        "y": 1022.5969486236572,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "5e423ee5.be879",
+        "id": "3a3acb9a.529fc4",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 667.2421264648438,
-        "y": 827.5968379974365,
-        "z": "b6e8aa45.a03d48",
+        "x": 669.23828125,
+        "y": 969.5968418121338,
+        "z": "3deddfaf.57c2f",
         "wires": [
             []
         ]
     },
     {
-        "id": "4152c1db.9724f",
+        "id": "fff46357.6f3ad",
         "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": 658.5753860473633,
-        "y": 658.5968637466431,
-        "z": "b6e8aa45.a03d48",
+        "x": 660.5715408325195,
+        "y": 800.5968675613403,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "34769e57.986742",
+        "id": "5da9f931.70bc48",
         "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": 623.5750274658203,
-        "y": 361.3247985839844,
-        "z": "b6e8aa45.a03d48",
+        "x": 625.5711822509766,
+        "y": 503.32480239868164,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "eb2d673c.26d6e8",
+        "id": "51ac74f.88fd58c",
         "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": 2076.1468658447266,
-        "y": 334.1906089782715,
-        "z": "b6e8aa45.a03d48",
+        "x": 2090.1429595947266,
+        "y": 366.1906089782715,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "6aca9b4.e7d1e64",
-        "type": "comment",
-        "name": "Take the parameter names by removing prefix",
-        "info": "",
+        "id": "df8e278a.898b28",
+        "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=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
         "comments": "",
-        "x": 1369.5754776000977,
-        "y": 337.66667556762695,
-        "z": "b6e8aa45.a03d48",
-        "wires": []
+        "outputs": 1,
+        "x": 715.5458450317383,
+        "y": 910.2470846176147,
+        "z": "3deddfaf.57c2f",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "301883bc.025f5c",
+        "id": "6f579a3f.d15af4",
         "type": "comment",
         "name": "TODO: change AAI models",
         "info": "",
         "comments": "",
-        "x": 647.1859512329102,
-        "y": 727.9742965698242,
-        "z": "b6e8aa45.a03d48",
+        "x": 649.1821060180664,
+        "y": 869.9743003845215,
+        "z": "3deddfaf.57c2f",
         "wires": []
     },
     {
-        "id": "27f27223.64947e",
-        "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=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
+        "id": "1bd26429.61c74c",
+        "type": "switchNode",
+        "name": "switch service-data.vnf-request-input.vnf-name",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 693.0000152587891,
+        "y": 393.0000114440918,
+        "z": "3deddfaf.57c2f",
+        "wires": [
+            [
+                "33ff6eed.504462",
+                "e2af6995.223f28",
+                "cc14ee3a.bceeb"
+            ]
+        ]
+    },
+    {
+        "id": "33ff6eed.504462",
+        "type": "outcomeTrue",
+        "name": "SDWAN-vpn",
+        "xml": "<outcome value='SDWAN-vpn'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 990.6667137145996,
+        "y": 378.0000114440918,
+        "z": "3deddfaf.57c2f",
+        "wires": [
+            [
+                "55868aa1.2254e4"
+            ]
+        ]
+    },
+    {
+        "id": "e2af6995.223f28",
+        "type": "outcomeTrue",
+        "name": "SDWAN-site",
+        "xml": "<outcome value='SDWAN-site'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 983.6666870117188,
+        "y": 428,
+        "z": "3deddfaf.57c2f",
+        "wires": [
+            [
+                "496e33ab.398b4c"
+            ]
+        ]
+    },
+    {
+        "id": "cc14ee3a.bceeb",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 966.6666870117188,
+        "y": 478,
+        "z": "3deddfaf.57c2f",
+        "wires": [
+            [
+                "c9a98bce.5a8c88"
+            ]
+        ]
+    },
+    {
+        "id": "c9a98bce.5a8c88",
+        "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: vnf-name should be either SDWAN-vpn or SDWAN-site.\" />\n",
         "comments": "",
+        "x": 1137.333366394043,
+        "y": 476.00001335144043,
+        "z": "3deddfaf.57c2f",
+        "wires": []
+    },
+    {
+        "id": "55868aa1.2254e4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1172,
+        "y": 379,
+        "z": "3deddfaf.57c2f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "496e33ab.398b4c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 713.549690246582,
-        "y": 768.2470808029175,
-        "z": "b6e8aa45.a03d48",
+        "x": 1163,
+        "y": 427,
+        "z": "3deddfaf.57c2f",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
index d13b5db5..7a6c7273 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-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='sdwan-vf-operation-lanport-activate' mode='sync'>
         <block atomic="true">
             <switch test='`$service-data.vnfs.vnf_length`'>
@@ -104,46 +104,55 @@
                 <parameter name='prop.siteIds_length' value='0' />
             </set>
             <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
-                    <block>
-                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
-                            <outcome value='true'>
-                                <block atomic="true">
-                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">
+                <block atomic="true">
+                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">
+                        <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->
+                        <outcome value='true'>
+                            <block atomic="true">
+                                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
+                                    <block>
+                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
                                             <outcome value='true'>
                                                 <block atomic="true">
-                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`">
-                                                        <outcome value='true'>
-                                                            <set>
-                                                                <parameter name='prop.role' value="spoke" />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">
-                                                        <outcome value='true'>
-                                                            <set>
-                                                                <parameter name='prop.role' value="hub" />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                    <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
-                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">
+                                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">
                                                             <outcome value='true'>
                                                                 <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />
-                                                                    </set>
-                                                                    <set>
-                                                                        <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />
-                                                                        <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />
-                                                                    </set>
-                                                                    <set>
-                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />
-                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />
-                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />
-                                                                        <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />
-                                                                    </set>
+                                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`">
+                                                                        <outcome value='true'>
+                                                                            <set>
+                                                                                <parameter name='prop.role' value="spoke" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">
+                                                                        <outcome value='true'>
+                                                                            <set>
+                                                                                <parameter name='prop.role' value="hub" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                    <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+                                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">
+                                                                            <outcome value='true'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />
+                                                                                    </set>
+                                                                                    <set>
+                                                                                        <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />
+                                                                                        <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />
+                                                                                    </set>
+                                                                                    <set>
+                                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />
+                                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />
+                                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />
+                                                                                        <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />
+                                                                                    </set>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </for>
                                                                 </block>
                                                             </outcome>
                                                         </switch>
@@ -151,41 +160,41 @@
                                                 </block>
                                             </outcome>
                                         </switch>
-                                    </for>
-                                </block>
-                            </outcome>
-                        </switch>
-                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">
-                            <outcome value='true'>
-                                <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
-                                    <block atomic="true">
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">
-                                            <outcome value='true'>
-                                                <set>
-                                                    <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
-                                                </set>
-                                            </outcome>
-                                        </switch>
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">
-                                            <outcome value='true'>
-                                                <set>
-                                                    <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
-                                                </set>
-                                            </outcome>
-                                        </switch>
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">
+                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">
                                             <outcome value='true'>
-                                                <set>
-                                                    <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
-                                                </set>
+                                                <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >
+                                                    <block atomic="true">
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">
+                                                            <outcome value='true'>
+                                                                <set>
+                                                                    <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+                                                                </set>
+                                                            </outcome>
+                                                        </switch>
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">
+                                                            <outcome value='true'>
+                                                                <set>
+                                                                    <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+                                                                </set>
+                                                            </outcome>
+                                                        </switch>
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">
+                                                            <outcome value='true'>
+                                                                <set>
+                                                                    <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />
+                                                                </set>
+                                                            </outcome>
+                                                        </switch>
+                                                    </block>
+                                                </for>
                                             </outcome>
                                         </switch>
                                     </block>
                                 </for>
-                            </outcome>
-                        </switch>
-                    </block>
-                </for>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
             </for>
             <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >
                 <block>
@@ -225,11 +234,11 @@
                     </return>
                 </outcome>
             </execute>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND 
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="esr-thirdparty-sdnc"
+                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND
 		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                          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`" />
@@ -447,13 +456,13 @@
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id
  + '/vf-module-data/vf-module-topology/'`"/>
                 <parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+                           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/'
+                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $vf-module-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
             </set>
@@ -462,8 +471,8 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].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[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
             </set>
-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' 
-      key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
+                    key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
                 <parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
                 <parameter name='operational-status' value='Active' />
                 <!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
index d2538710..d1578ec5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.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='sdwan-vf-operation-lanport-create' mode='sync'>
         <block atomic="true">
             <switch test='`$service-data.vnfs.vnf_length`'>
@@ -85,8 +85,8 @@
                 <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-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`' />
             </set>
             <set>
                 <parameter name='vf-module-id' value='`$prop.vf-id`'/>
@@ -98,13 +98,13 @@
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id
  + '/vf-module-data/vf-module-topology/'`"/>
                 <parameter name='vnf-object-path'
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+                           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/'
+                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $vf-module-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
             </set>
@@ -113,8 +113,8 @@
                 <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='lan-port-config' 
-      key='lan-port-config.lan-port-config-id = $prop.vf-id' >
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
+                  key='lan-port-config.lan-port-config-id = $prop.vf-id' >
                 <parameter name="lan-port-config-id" value="`$prop.vf-id`" />
                 <parameter name="device-id" value='`$prop.lan.deviceName`' />
                 <parameter name="port-switch" value='`$prop.lan.portSwitch`' />
@@ -128,9 +128,9 @@
                 <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
                 <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>
-            <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">
+            <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[0].related-to" value="lan-port-config" />
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="lan-port-config-id" />
@@ -143,5 +143,4 @@
             </return>
         </block>
     </method>
-</service-logic>
-
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
index b730b324..3e8b537b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.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='vnf-topology-operation-vpn-site-resource-create' mode='sync'>
         <block atomic="true">
             <switch test='`$service-data.vnfs.vnf_length`'>
@@ -29,6 +29,21 @@
                     </block>
                 </outcome>
             </switch>
+            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>
+                <outcome value='SDWAN-vpn'>
+                    <block atomic="true"></block>
+                </outcome>
+                <outcome value='SDWAN-site'>
+                    <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="Error: vnf-name should be either SDWAN-vpn or SDWAN-site." />
+                    </return>
+                </outcome>
+            </switch>
             <set>
                 <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />
             </set>
@@ -58,17 +73,17 @@
                 <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="create" />
                 <parameter name="vnf-type" value="some vnf-type" />
             </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" />
-- 
2.16.6