From 37115b5eac1f20ea2093b523bc2eade32d689c09 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Mon, 27 May 2019 19:34:20 +0530
Subject: Fix SDNC parameters save in AAI failure

1. SDNC is fixed by passing proper UUID and version ID.
2. SDNC is fixed by removing validations for vnf
   resource creation DG
3. Fixed sdwan-wan-port-static.json template by passing generated wan-portId

Issue-ID: SDNC-773
Signed-off-by: prakash.e <prakash.e@huawei.com>
Change-Id: I0021983f0721dde6592d86bef602b8b4641215a3

Former-commit-id: 5e6ca08e7b71fa0ba6fc4a9ad9e02739e81e5e07
---
 ...OURCE-API_sdwan-vf-operation-device-create.json | 512 ++++++++++-----------
 ...URCE-API_sdwan-vf-operation-lanport-create.json | 396 ++++++++--------
 ...ESOURCE-API_sdwan-vf-operation-site-create.json | 366 +++++++--------
 ...RESOURCE-API_sdwan-vf-operation-vpn-create.json | 376 +++++++--------
 ...URCE-API_sdwan-vf-operation-wanport-create.json | 366 +++++++--------
 ...opology-operation-vpn-site-resource-create.json | 429 +++++++++--------
 ...SOURCE-API_sdwan-vf-operation-device-create.xml |   6 +-
 ...OURCE-API_sdwan-vf-operation-lanport-create.xml |  20 +-
 ...RESOURCE-API_sdwan-vf-operation-site-create.xml |   2 +-
 ...-RESOURCE-API_sdwan-vf-operation-vpn-create.xml |   2 +-
 ...OURCE-API_sdwan-vf-operation-wanport-create.xml |   2 +-
 ...topology-operation-vpn-site-resource-create.xml |  69 +--
 12 files changed, 1297 insertions(+), 1249 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json
index 4760d35a..413069e0 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "ad9a9168.e57ff",
+        "id": "a55c86e0.b5aa88",
         "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": 956.03125,
-        "y": 159.13152408599854,
-        "z": "46bf2b6e.2c0e64",
+        "x": 969.829511642456,
+        "y": 145.13152599334717,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "e7246404.3ab3d8"
+                "89879683.435e28"
             ]
         ]
     },
     {
-        "id": "6ad25904.845b18",
+        "id": "654795a8.0c14ac",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -24,720 +24,720 @@
         "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": 228.7017364501953,
-        "y": 186.96871662139893,
-        "z": "46bf2b6e.2c0e64",
+        "x": 242.49999809265137,
+        "y": 172.96871852874756,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "f16fce6c.5d5ba"
+                "9d67b8bb.5c3018"
             ]
         ]
     },
     {
-        "id": "f16fce6c.5d5ba",
+        "id": "9d67b8bb.5c3018",
         "type": "method",
         "name": "sdwan-vf-operation-device-create",
         "xml": "<method rpc='sdwan-vf-operation-device-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 227.7017364501953,
-        "y": 286.9687166213989,
-        "z": "46bf2b6e.2c0e64",
+        "x": 241.49999809265137,
+        "y": 272.96871852874756,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "c112bcf.84b4e4"
+                "b03e92e3.4a48b"
             ]
         ]
     },
     {
-        "id": "1a36f303.fc1c1d",
+        "id": "5c240948.ac8cb8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 114.20173835754395,
-        "y": 79.96872520446777,
-        "z": "46bf2b6e.2c0e64",
+        "x": 128,
+        "y": 65.9687271118164,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "6ad25904.845b18"
+                "654795a8.0c14ac"
             ]
         ]
     },
     {
-        "id": "c112bcf.84b4e4",
+        "id": "b03e92e3.4a48b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 386.70172119140625,
-        "y": 402.9687252044678,
-        "z": "46bf2b6e.2c0e64",
+        "x": 400.4999828338623,
+        "y": 388.9687271118164,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "abed0b7b.e9c438",
-                "724392ca.bd7b5c",
-                "2b72757.931558a",
-                "a49a2243.bbcb2",
-                "c992605b.552a5",
-                "40876e67.4cc8d",
-                "86ee3fd8.45a8b",
-                "414cae1d.205f6",
-                "7ba39512.c516ac",
-                "3a2a0968.648d36",
-                "7024b9ac.3160d8",
-                "fdab20c0.e8295",
-                "d3c28e8a.2aecc",
-                "b7d7095a.45e048"
+                "949786f1.863f68",
+                "ea17361a.fd7708",
+                "efdf1074.6df6a",
+                "398e0031.2e059",
+                "cb5e3f0e.d096d",
+                "759de3b6.0709dc",
+                "115eabc8.0c7c94",
+                "a28188f1.6060e8",
+                "97ec72bd.6232e",
+                "e24672d6.3f64f",
+                "56ec94bf.93da3c",
+                "9d805d88.8f8ee",
+                "64fa5b44.3987c4",
+                "8956e9de.67f788"
             ]
         ]
     },
     {
-        "id": "abed0b7b.e9c438",
+        "id": "949786f1.863f68",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 704.0311584472656,
-        "y": 160.4648609161377,
-        "z": "46bf2b6e.2c0e64",
+        "x": 717.8294200897217,
+        "y": 146.46486282348633,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "ad9a9168.e57ff"
+                "a55c86e0.b5aa88"
             ]
         ]
     },
     {
-        "id": "4ed9f1d2.fc2b7",
+        "id": "5c7606f2.618b18",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1327.697738647461,
-        "y": 161.13152694702148,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1341.496000289917,
+        "y": 147.13152885437012,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "e7246404.3ab3d8",
+        "id": "89879683.435e28",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1174.3645668029785,
-        "y": 161.13150596618652,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1188.1628284454346,
+        "y": 147.13150787353516,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "4ed9f1d2.fc2b7"
+                "5c7606f2.618b18"
             ]
         ]
     },
     {
-        "id": "2b72757.931558a",
+        "id": "efdf1074.6df6a",
         "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": 784.9518966674805,
-        "y": 561.6354055404663,
-        "z": "46bf2b6e.2c0e64",
+        "x": 798.7501583099365,
+        "y": 547.6354074478149,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "1cf539f3.af1b96"
+                "aa19f798.d86af8"
             ]
         ]
     },
     {
-        "id": "1cf539f3.af1b96",
+        "id": "aa19f798.d86af8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 999.7302398681641,
-        "y": 559.1909894943237,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1013.5285015106201,
+        "y": 545.1909914016724,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "1a9f780a.a03398",
-                "dcb3e18.352e72"
+                "5ba25a3d.6d9bd4",
+                "bcc6d89b.3d5508"
             ]
         ]
     },
     {
-        "id": "1a9f780a.a03398",
+        "id": "5ba25a3d.6d9bd4",
         "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": 1195.986442565918,
-        "y": 536.9391279220581,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1209.784704208374,
+        "y": 522.9391298294067,
+        "z": "13a3e634.05943a",
         "wires": [
             []
         ]
     },
     {
-        "id": "dcb3e18.352e72",
+        "id": "bcc6d89b.3d5508",
         "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": 1165.4308700561523,
-        "y": 573.9392442703247,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1179.2291316986084,
+        "y": 559.9392461776733,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "724392ca.bd7b5c",
+        "id": "ea17361a.fd7708",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 718.4517517089844,
-        "y": 115.96872997283936,
-        "z": "46bf2b6e.2c0e64",
+        "x": 732.2500133514404,
+        "y": 101.96873188018799,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "b66cc394.12346"
+                "fb03dd5b.a92d3"
             ]
         ]
     },
     {
-        "id": "b66cc394.12346",
+        "id": "fb03dd5b.a92d3",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 905.1184310913086,
-        "y": 115.30202770233154,
-        "z": "46bf2b6e.2c0e64",
+        "x": 918.9166927337646,
+        "y": 101.30202960968018,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "c5ad3c03.3e718"
+                "54203a8b.1592b4"
             ]
         ]
     },
     {
-        "id": "c5ad3c03.3e718",
+        "id": "54203a8b.1592b4",
         "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": 1086.785057067871,
-        "y": 115.30202770233154,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1100.5833187103271,
+        "y": 101.30202960968018,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "40876e67.4cc8d",
+        "id": "759de3b6.0709dc",
         "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\n",
         "comments": "",
-        "x": 769.5548782348633,
-        "y": 728.4649872779846,
-        "z": "46bf2b6e.2c0e64",
+        "x": 783.3531398773193,
+        "y": 714.4649891853333,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "a49a2243.bbcb2",
+        "id": "398e0031.2e059",
         "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": 775.8880348205566,
-        "y": 624.1229696273804,
-        "z": "46bf2b6e.2c0e64",
+        "x": 789.6862964630127,
+        "y": 610.122971534729,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "c992605b.552a5",
+        "id": "cb5e3f0e.d096d",
         "type": "call",
         "name": "call sdwan-get-vf-module-device-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 801.8884124755859,
-        "y": 680.1232032775879,
-        "z": "46bf2b6e.2c0e64",
+        "x": 815.686674118042,
+        "y": 666.1232051849365,
+        "z": "13a3e634.05943a",
         "wires": [
             []
         ]
     },
     {
-        "id": "86ee3fd8.45a8b",
+        "id": "115eabc8.0c7c94",
         "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 + $prop.vf-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
         "comments": "",
-        "x": 764.7017707824707,
-        "y": 778.9688324928284,
-        "z": "46bf2b6e.2c0e64",
+        "x": 778.5000324249268,
+        "y": 764.968834400177,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "414cae1d.205f6",
+        "id": "a28188f1.6060e8",
         "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": 772.2018737792969,
-        "y": 826.9687967300415,
-        "z": "46bf2b6e.2c0e64",
+        "x": 786.0001354217529,
+        "y": 812.9687986373901,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "c8a9b81e.4dea68",
+        "id": "2bd76b30.e44c14",
         "type": "save",
         "name": "save sdwan vpn resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vf-id' >\n<parameter name='device-id' value='`$prop.vf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vf-id' >\n<parameter name='device-id' value='`$prop.vf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1206.701789855957,
-        "y": 852.4687442779541,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1220.500051498413,
+        "y": 838.4687461853027,
+        "z": "13a3e634.05943a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3a2a0968.648d36",
+        "id": "e24672d6.3f64f",
         "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=\"device\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/devices/device/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"device.device-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 775.7016677856445,
-        "y": 920.4687957763672,
-        "z": "46bf2b6e.2c0e64",
+        "x": 789.4999294281006,
+        "y": 906.4687976837158,
+        "z": "13a3e634.05943a",
         "wires": [
             []
         ]
     },
     {
-        "id": "7ba39512.c516ac",
+        "id": "97ec72bd.6232e",
         "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": 724.4241981506348,
-        "y": 966.6426386833191,
-        "z": "46bf2b6e.2c0e64",
+        "x": 738.2224597930908,
+        "y": 952.6426405906677,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "faa86376.49175",
+        "id": "5aff085f.4f6678",
         "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": 1251.8685150146484,
-        "y": 240.30206966400146,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1265.6667766571045,
+        "y": 226.3020715713501,
+        "z": "13a3e634.05943a",
         "wires": [
             []
         ]
     },
     {
-        "id": "491e4f90.e2d44",
+        "id": "6d401f41.38c65",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1004.8680419921875,
-        "y": 254.95347213745117,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1018.6663036346436,
+        "y": 240.9534740447998,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "faa86376.49175",
-                "1889b968.9cafa7",
-                "c8eb51dd.8bc9f"
+                "5aff085f.4f6678",
+                "5b632a30.5bb984",
+                "3542675.5ce1998"
             ]
         ]
     },
     {
-        "id": "74ee118f.3bdb3",
+        "id": "931487e.1357f78",
         "type": "set",
         "name": "set prop.vf-id",
         "xml": "<set>\n<parameter name='prop.vf-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n",
         "comments": "",
-        "x": 1210.3999099731445,
-        "y": 457.985107421875,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1224.1981716156006,
+        "y": 443.98510932922363,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "dfbd61c4.ba851",
+        "id": "4589ca44.abd4b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1004.3995361328125,
-        "y": 410.9848394393921,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1018.1977977752686,
+        "y": 396.9848413467407,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "74ee118f.3bdb3",
-                "1889b968.9cafa7",
-                "f58396e4.0282e8"
+                "931487e.1357f78",
+                "5b632a30.5bb984",
+                "5d9e7b7e.ca4bf4"
             ]
         ]
     },
     {
-        "id": "1889b968.9cafa7",
+        "id": "5b632a30.5bb984",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1239.8996353149414,
-        "y": 334.98486328125,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1253.6978969573975,
+        "y": 320.98486518859863,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "ecce0898.ef26d8",
-                "e6c1d3e3.fb47b"
+                "66c1c6a1.0380b8",
+                "7a26fc83.04adb4"
             ]
         ]
     },
     {
-        "id": "e28abe4b.99802",
+        "id": "4aab28a9.38e418",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1701.6139278411865,
-        "y": 254.12758922576904,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1715.4121894836426,
+        "y": 240.12759113311768,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "4d6a716f.84ac8"
+                "6d61baf9.e5ff54"
             ]
         ]
     },
     {
-        "id": "4d6a716f.84ac8",
+        "id": "6d61baf9.e5ff54",
         "type": "set",
         "name": "set vf-index=0",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1849.8995761871338,
-        "y": 251.12764358520508,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1863.6978378295898,
+        "y": 237.1276454925537,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "ad9a94b.6789668",
+        "id": "31602a2e.23f6d6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1705.0424251556396,
-        "y": 299.41338062286377,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1718.8406867980957,
+        "y": 285.4133825302124,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "aa7a0bdb.e96638"
+                "794d6b8.233bf94"
             ]
         ]
     },
     {
-        "id": "aa7a0bdb.e96638",
+        "id": "794d6b8.233bf94",
         "type": "set",
         "name": "set vf-index = vf_length",
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n",
         "comments": "",
-        "x": 1888.90016746521,
-        "y": 299.6991491317749,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1902.698429107666,
+        "y": 285.69915103912354,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "ecce0898.ef26d8",
+        "id": "66c1c6a1.0380b8",
         "type": "set",
         "name": "set new vF_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />\n",
         "comments": "",
-        "x": 1417.8996391296387,
-        "y": 363.984827041626,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1431.6979007720947,
+        "y": 349.9848289489746,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "b86e63fd.fc195",
+        "id": "4261b847.26d008",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1654.471076965332,
-        "y": 394.1277618408203,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1668.269338607788,
+        "y": 380.12776374816895,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "5a9cb21d.1f494c"
+                "f7fccba6.c15138"
             ]
         ]
     },
     {
-        "id": "5a9cb21d.1f494c",
+        "id": "f7fccba6.c15138",
         "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": 1793.0424346923828,
-        "y": 394.12772274017334,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1806.8406963348389,
+        "y": 380.127724647522,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "2f10259c.95f9fa",
+        "id": "5d0b6c.7fe7e494",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 853.3991165161133,
-        "y": 378.9847173690796,
-        "z": "46bf2b6e.2c0e64",
+        "x": 867.1973781585693,
+        "y": 364.9847192764282,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "dfbd61c4.ba851"
+                "4589ca44.abd4b4"
             ]
         ]
     },
     {
-        "id": "c5868d60.4eb9c",
+        "id": "cd8f5874.903778",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 856.8679389953613,
-        "y": 318.9534797668457,
-        "z": "46bf2b6e.2c0e64",
+        "x": 870.6662006378174,
+        "y": 304.95348167419434,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "491e4f90.e2d44"
+                "6d401f41.38c65"
             ]
         ]
     },
     {
-        "id": "585f0966.3b4ab8",
+        "id": "9419aeb4.031d3",
         "type": "comment",
         "name": "if SO provide vf-id use that else create new",
         "info": "",
         "comments": "",
-        "x": 1554.3991317749023,
-        "y": 214.98472118377686,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1568.1973934173584,
+        "y": 200.9847230911255,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "fdab20c0.e8295",
+        "id": "9d805d88.8f8ee",
         "type": "switchNode",
         "name": "switch vf-id",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 715.8679351806641,
-        "y": 343.95348834991455,
-        "z": "46bf2b6e.2c0e64",
+        "x": 729.6661968231201,
+        "y": 329.9534902572632,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "c5868d60.4eb9c",
-                "2f10259c.95f9fa"
+                "cd8f5874.903778",
+                "5d0b6c.7fe7e494"
             ]
         ]
     },
     {
-        "id": "7024b9ac.3160d8",
+        "id": "56ec94bf.93da3c",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 715.7330017089844,
-        "y": 208.99999523162842,
-        "z": "46bf2b6e.2c0e64",
+        "x": 729.5312633514404,
+        "y": 194.99999713897705,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "a1384c59.cdef8"
+                "8e07f88.10c5a08"
             ]
         ]
     },
     {
-        "id": "a1384c59.cdef8",
+        "id": "8e07f88.10c5a08",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 877.7330474853516,
-        "y": 207.9999942779541,
-        "z": "46bf2b6e.2c0e64",
+        "x": 891.5313091278076,
+        "y": 193.99999618530273,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "b60890ce.7212a"
+                "33f9f4dc.b667cc"
             ]
         ]
     },
     {
-        "id": "b60890ce.7212a",
+        "id": "33f9f4dc.b667cc",
         "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": 1026.983139038086,
-        "y": 205.7778720855713,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1040.781400680542,
+        "y": 191.77787399291992,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "e6c1d3e3.fb47b",
+        "id": "7a26fc83.04adb4",
         "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": 1479.7329788208008,
-        "y": 280.0000104904175,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1493.5312404632568,
+        "y": 266.0000123977661,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "e28abe4b.99802",
-                "ad9a94b.6789668"
+                "4aab28a9.38e418",
+                "31602a2e.23f6d6"
             ]
         ]
     },
     {
-        "id": "62be0465.8c201c",
+        "id": "98ab03a3.4fb31",
         "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": 1471.7329788208008,
-        "y": 402.49998474121094,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1485.5312404632568,
+        "y": 388.49998664855957,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "b86e63fd.fc195"
+                "4261b847.26d008"
             ]
         ]
     },
     {
-        "id": "f58396e4.0282e8",
+        "id": "5d9e7b7e.ca4bf4",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1235.7329788208008,
-        "y": 406.49998474121094,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1249.5312404632568,
+        "y": 392.49998664855957,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "62be0465.8c201c"
+                "98ab03a3.4fb31"
             ]
         ]
     },
     {
-        "id": "d3c28e8a.2aecc",
+        "id": "64fa5b44.3987c4",
         "type": "set",
         "name": "set prop.sdncCreate=false",
         "xml": "<set>\n<parameter name='prop.sdncCreate' value='false' />\n",
         "comments": "",
-        "x": 746.2329788208008,
-        "y": 71.99999809265137,
-        "z": "46bf2b6e.2c0e64",
+        "x": 760.0312404632568,
+        "y": 58,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "c8eb51dd.8bc9f",
+        "id": "3542675.5ce1998",
         "type": "set",
         "name": "set prop.sdncCreate=true",
         "xml": "<set>\n<parameter name='prop.sdncCreate' value='true' />\n",
         "comments": "",
-        "x": 1265.2329864501953,
-        "y": 202.99999713897705,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1279.0312480926514,
+        "y": 188.99999904632568,
+        "z": "13a3e634.05943a",
         "wires": []
     },
     {
-        "id": "b7d7095a.45e048",
+        "id": "8956e9de.67f788",
         "type": "switchNode",
         "name": "switch prop.sdncCreate",
         "xml": "<switch test='`$prop.sdncCreate`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 754.2330436706543,
-        "y": 876.0000257492065,
-        "z": "46bf2b6e.2c0e64",
+        "x": 768.0313053131104,
+        "y": 862.0000276565552,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "bb597028.866e9",
-                "18aecad0.0cad25"
+                "530d4a6f.95a5a4",
+                "ed2fc8ce.6d54b8"
             ]
         ]
     },
     {
-        "id": "18aecad0.0cad25",
+        "id": "ed2fc8ce.6d54b8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 969.2330417633057,
-        "y": 887.0000257492065,
-        "z": "46bf2b6e.2c0e64",
+        "x": 983.0313034057617,
+        "y": 873.0000276565552,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "8ea3c05b.19b31"
+                "f6984691.7e9e18"
             ]
         ]
     },
     {
-        "id": "bb597028.866e9",
+        "id": "530d4a6f.95a5a4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 972.2330417633057,
-        "y": 848.9999942779541,
-        "z": "46bf2b6e.2c0e64",
+        "x": 986.0313034057617,
+        "y": 834.9999961853027,
+        "z": "13a3e634.05943a",
         "wires": [
             [
-                "c8a9b81e.4dea68"
+                "2bd76b30.e44c14"
             ]
         ]
     },
     {
-        "id": "8ea3c05b.19b31",
+        "id": "f6984691.7e9e18",
         "type": "save",
         "name": "update sdwan vpn resource in AAI",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vf-id' >\n<parameter name='device-id' value='`$prop.vf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\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",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vf-id' >\n<parameter name='device-id' value='`$prop.vf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1203.2329864501953,
-        "y": 892.999997138977,
-        "z": "46bf2b6e.2c0e64",
+        "x": 1217.0312480926514,
+        "y": 878.9999990463257,
+        "z": "13a3e634.05943a",
         "wires": [
             []
         ]
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 b09a059b..cf08b57b 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": "f782e37.109032",
+        "id": "3563dba1.d09964",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 583,
-        "y": 401.1628177165985,
-        "z": "5ddf8caa.1b92e4",
+        "x": 431.0104064941406,
+        "y": 355.1628177165985,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "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"
+                "5ddfe38c.3aa86c",
+                "5a21a65a.69db48",
+                "cc416a47.18fef8",
+                "be6d233d.af70d",
+                "a80fd5f3.86e118",
+                "d2ca1c0d.40fdc",
+                "768823c2.5ac1cc",
+                "94ccf971.360848",
+                "4d1e575f.68db78",
+                "6992ab61.1740b4",
+                "494976dc.41e7f8",
+                "40bceee5.21d0e",
+                "c03fc9ca.e96578",
+                "742cd454.7acabc",
+                "e5ba2a4b.c03198"
             ]
         ]
     },
     {
-        "id": "3a0d40d2.1b88f",
+        "id": "5ddfe38c.3aa86c",
         "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": 929.2501602172852,
-        "y": 383.82948660850525,
-        "z": "5ddf8caa.1b92e4",
+        "x": 777.2605667114258,
+        "y": 337.82948660850525,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "edd147b1.5a9678"
+                "598a5263.1331ac"
             ]
         ]
     },
     {
-        "id": "edd147b1.5a9678",
+        "id": "598a5263.1331ac",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1144.0285034179688,
-        "y": 381.38507056236267,
-        "z": "5ddf8caa.1b92e4",
+        "x": 992.0389099121094,
+        "y": 335.38507056236267,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "239191e9.78691e",
-                "1a76d1a9.524ade"
+                "76ce96e5.bf7bc8",
+                "55b2b4f6.971cdc"
             ]
         ]
     },
     {
-        "id": "239191e9.78691e",
+        "id": "76ce96e5.bf7bc8",
         "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": 1340.2847061157227,
-        "y": 359.13320899009705,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1188.2951126098633,
+        "y": 313.13320899009705,
+        "z": "ad703000.c2e0d",
         "wires": [
             []
         ]
     },
     {
-        "id": "1a76d1a9.524ade",
+        "id": "55b2b4f6.971cdc",
         "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": 1309.729133605957,
-        "y": 396.13332533836365,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1157.7395401000977,
+        "y": 350.13332533836365,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "24f00d92.239812",
+        "id": "ba810934.3ff408",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 967.2503623962402,
-        "y": 340.4961540699005,
-        "z": "5ddf8caa.1b92e4",
+        "x": 815.2607688903809,
+        "y": 294.4961540699005,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "d535f520.a2b4c8",
+        "id": "cc416a47.18fef8",
         "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": 908.1867752075195,
-        "y": 542.3257596492767,
-        "z": "5ddf8caa.1b92e4",
+        "x": 756.1971817016602,
+        "y": 496.32575964927673,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "fdf59618.623758",
+        "id": "5a21a65a.69db48",
         "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": 915.1863632202148,
-        "y": 437.3170254230499,
-        "z": "5ddf8caa.1b92e4",
+        "x": 763.1967697143555,
+        "y": 391.3170254230499,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "9c073f69.f288d",
+        "id": "768823c2.5ac1cc",
         "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",
         "comments": "",
-        "x": 920.3531188964844,
-        "y": 650.4963715076447,
-        "z": "5ddf8caa.1b92e4",
+        "x": 768.363525390625,
+        "y": 604.4963715076447,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "8cc9cbda.e9db18",
+        "id": "94ccf971.360848",
         "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": 908.5000438690186,
-        "y": 702.0002176761627,
-        "z": "5ddf8caa.1b92e4",
+        "x": 756.5104503631592,
+        "y": 656.0002176761627,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "1db1621b.e18c6e",
+        "id": "4d1e575f.68db78",
         "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",
+        "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-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 963.5000228881836,
-        "y": 794.5002000331879,
-        "z": "5ddf8caa.1b92e4",
+        "x": 811.5104293823242,
+        "y": 748.5002000331879,
+        "z": "ad703000.c2e0d",
         "wires": [
             []
         ]
     },
     {
-        "id": "33fd1f45.d7ff5",
+        "id": "6992ab61.1740b4",
         "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": 923.4999389648438,
-        "y": 841.5001881122589,
-        "z": "5ddf8caa.1b92e4",
+        "x": 771.5103454589844,
+        "y": 795.5001881122589,
+        "z": "ad703000.c2e0d",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ebef402.b67dec",
+        "id": "494976dc.41e7f8",
         "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": 874.222484588623,
-        "y": 888.6740472316742,
-        "z": "5ddf8caa.1b92e4",
+        "x": 722.2328910827637,
+        "y": 842.6740472316742,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "5957a088.cf332",
+        "id": "be6d233d.af70d",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 884.4205684661865,
-        "y": 90.66670227050781,
-        "z": "5ddf8caa.1b92e4",
+        "x": 732.4309749603271,
+        "y": 44.66670227050781,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "26211aa4.6aca76"
+                "a4292aa6.75e0c8"
             ]
         ]
     },
     {
-        "id": "26211aa4.6aca76",
+        "id": "a4292aa6.75e0c8",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1071.0872478485107,
-        "y": 90,
-        "z": "5ddf8caa.1b92e4",
+        "x": 919.0976543426514,
+        "y": 44,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "60b9b040.3db19"
+                "f5b1afdf.f5a4e"
             ]
         ]
     },
     {
-        "id": "60b9b040.3db19",
+        "id": "f5b1afdf.f5a4e",
         "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": 1252.7538738250732,
-        "y": 90,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1100.7642803192139,
+        "y": 44,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "9afb8db9.2b0d5",
+        "id": "a80fd5f3.86e118",
         "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": 922.6705904006958,
-        "y": 267.66669631004333,
-        "z": "5ddf8caa.1b92e4",
+        "x": 770.6809968948364,
+        "y": 221.66669631004333,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "925220d0.8e6e8",
-                "8d034f0b.c8c8d"
+                "c9c58b29.2dfa58",
+                "8390bbc5.321ad8"
             ]
         ]
     },
     {
-        "id": "925220d0.8e6e8",
+        "id": "c9c58b29.2dfa58",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1153.6706008911133,
-        "y": 243.66669344902039,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1001.6810073852539,
+        "y": 197.66669344902039,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "f6929bd3.916468"
+                "dc09b12c.dd3fe"
             ]
         ]
     },
     {
-        "id": "8d034f0b.c8c8d",
+        "id": "8390bbc5.321ad8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1153.6706008911133,
-        "y": 283.6666934490204,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1001.6810073852539,
+        "y": 237.66669344902039,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "28516ca8.58b9a4"
+                "3643e6d4.7f439a"
             ]
         ]
     },
     {
-        "id": "f6929bd3.916468",
+        "id": "dc09b12c.dd3fe",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1296.1706008911133,
-        "y": 243.66669344902039,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1144.181007385254,
+        "y": 197.66669344902039,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "28516ca8.58b9a4",
+        "id": "3643e6d4.7f439a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1298.027645111084,
-        "y": 283.6032054424286,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1146.0380516052246,
+        "y": 237.6032054424286,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "fe45ce64.2ccb7",
-                "e4014c75.a1a78"
+                "38575d2d.74e912",
+                "98424ce4.789a1"
             ]
         ]
     },
     {
-        "id": "e4014c75.a1a78",
+        "id": "98424ce4.789a1",
         "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": 1450.7261199951172,
-        "y": 253.22230413509533,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1298.7365264892578,
+        "y": 207.22230413509533,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "fe45ce64.2ccb7",
+        "id": "38575d2d.74e912",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1507.1546249389648,
-        "y": 306.444433927536,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1355.1650314331055,
+        "y": 260.444433927536,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "c9dd9d48.363c4"
+                "6f409c8c.594684"
             ]
         ]
     },
     {
-        "id": "93986914.2633c8",
+        "id": "12f39766.bab9b9",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1730.8053550720215,
-        "y": 264.69849133491516,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1578.815761566162,
+        "y": 218.69849133491516,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "c9dd9d48.363c4",
+        "id": "6f409c8c.594684",
         "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": 1782.4403457641602,
-        "y": 306.0159366130829,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1630.4507522583008,
+        "y": 260.0159366130829,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "3a28d2c1.9fee3e"
+                "34043894.3a1738"
             ]
         ]
     },
     {
-        "id": "3a28d2c1.9fee3e",
+        "id": "34043894.3a1738",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1683.1705436706543,
-        "y": 364.58736777305603,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1531.180950164795,
+        "y": 318.58736777305603,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "c7dfb468.8d2468"
+                "e047ad76.2601d"
             ]
         ]
     },
     {
-        "id": "c7dfb468.8d2468",
+        "id": "e047ad76.2601d",
         "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": 1830.9206466674805,
-        "y": 364.44455984188244,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1678.931053161621,
+        "y": 318.44455984188244,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "1b22ffce.90ac5",
+        "id": "d2ca1c0d.40fdc",
         "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": 954.0000381469727,
-        "y": 490.1628510951996,
-        "z": "5ddf8caa.1b92e4",
+        "x": 802.0104446411133,
+        "y": 444.1628510951996,
+        "z": "ad703000.c2e0d",
         "wires": [
             []
         ]
     },
     {
-        "id": "a78628f7.4e9428",
+        "id": "40bceee5.21d0e",
         "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": 925.0000076293945,
-        "y": 744.1667354106903,
-        "z": "5ddf8caa.1b92e4",
+        "x": 773.0104141235352,
+        "y": 698.1667354106903,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "ceaeb6e4.45d088",
+        "id": "53017383.9c8f0c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 252.00000762939453,
-        "y": 117.16673541069031,
-        "z": "5ddf8caa.1b92e4",
+        "x": 100.01041412353516,
+        "y": 71.16673541069031,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "b9aae3a1.4ae74"
+                "b88f4175.84605"
             ]
         ]
     },
     {
-        "id": "b9aae3a1.4ae74",
+        "id": "b88f4175.84605",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -433,145 +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": 366.5000057220459,
-        "y": 224.16672682762146,
-        "z": "5ddf8caa.1b92e4",
+        "x": 214.51041221618652,
+        "y": 178.16672682762146,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "486cfe7f.88b42"
+                "9de4488f.4b0818"
             ]
         ]
     },
     {
-        "id": "486cfe7f.88b42",
+        "id": "9de4488f.4b0818",
         "type": "method",
         "name": "sdwan-vf-operation-lanport-create",
         "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 365.5000057220459,
-        "y": 324.16672682762146,
-        "z": "5ddf8caa.1b92e4",
+        "x": 213.51041221618652,
+        "y": 278.16672682762146,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "f782e37.109032"
+                "3563dba1.d09964"
             ]
         ]
     },
     {
-        "id": "9f1428de.0587b8",
+        "id": "c03fc9ca.e96578",
         "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": 907.0000534057617,
-        "y": 598.6667287349701,
-        "z": "5ddf8caa.1b92e4",
+        "x": 755.0104598999023,
+        "y": 552.6667287349701,
+        "z": "ad703000.c2e0d",
         "wires": [
             []
         ]
     },
     {
-        "id": "69722b7c.abba54",
+        "id": "742cd454.7acabc",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 873.9999885559082,
-        "y": 145.16673731803894,
-        "z": "5ddf8caa.1b92e4",
+        "x": 722.0103950500488,
+        "y": 99.16673731803894,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "c4314464.ea4888"
+                "3ed11716.45d018"
             ]
         ]
     },
     {
-        "id": "c4314464.ea4888",
+        "id": "3ed11716.45d018",
         "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": 1125.0000839233398,
-        "y": 140.83335781097412,
-        "z": "5ddf8caa.1b92e4",
+        "x": 973.0104904174805,
+        "y": 94.83335781097412,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "7e2619a7.4c1a38"
+                "6c9c624d.566c8c"
             ]
         ]
     },
     {
-        "id": "7e2619a7.4c1a38",
+        "id": "6c9c624d.566c8c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.3334007263184,
-        "y": 142.8333396911621,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1191.343807220459,
+        "y": 96.83333969116211,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "e7b8aabb.779c28"
+                "acf4ddfd.c60e5"
             ]
         ]
     },
     {
-        "id": "e7b8aabb.779c28",
+        "id": "acf4ddfd.c60e5",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1496.6665725708008,
-        "y": 142.83336067199707,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1344.6769790649414,
+        "y": 96.83336067199707,
+        "z": "ad703000.c2e0d",
         "wires": []
     },
     {
-        "id": "86d99a3f.07f208",
+        "id": "e5ba2a4b.c03198",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 888.0000076293945,
-        "y": 206.1667354106903,
-        "z": "5ddf8caa.1b92e4",
+        "x": 736.0104141235352,
+        "y": 160.1667354106903,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "885839d2.ea1b48"
+                "5ddfe829.c49618"
             ]
         ]
     },
     {
-        "id": "885839d2.ea1b48",
+        "id": "5ddfe829.c49618",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1050.0000534057617,
-        "y": 205.166734457016,
-        "z": "5ddf8caa.1b92e4",
+        "x": 898.0104598999023,
+        "y": 159.166734457016,
+        "z": "ad703000.c2e0d",
         "wires": [
             [
-                "1a2b1c2a.3b4624"
+                "8cdafc69.f1e95"
             ]
         ]
     },
     {
-        "id": "1a2b1c2a.3b4624",
+        "id": "8cdafc69.f1e95",
         "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": 1199.250144958496,
-        "y": 202.94461226463318,
-        "z": "5ddf8caa.1b92e4",
+        "x": 1047.2605514526367,
+        "y": 156.94461226463318,
+        "z": "ad703000.c2e0d",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json
index b70f8ce2..650d4f65 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "f2c51e78.6ee01",
+        "id": "c770572a.fb6338",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -8,526 +8,526 @@
         "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": 233.5,
-        "y": 162.99999046325684,
-        "z": "147f59c8.d7f266",
+        "x": 244.01040649414062,
+        "y": 137.999986410141,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "e7f78c27.133fa"
+                "2413db39.149ee4"
             ]
         ]
     },
     {
-        "id": "e7f78c27.133fa",
+        "id": "2413db39.149ee4",
         "type": "method",
         "name": "sdwan-vf-operation-site-create",
         "xml": "<method rpc='sdwan-vf-operation-site-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 232.5,
-        "y": 262.99999046325684,
-        "z": "147f59c8.d7f266",
+        "x": 243.01040649414062,
+        "y": 237.999986410141,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "31fa463e.82923a"
+                "3b0ef51d.87c1aa"
             ]
         ]
     },
     {
-        "id": "bac9bd77.fe0f",
+        "id": "917c1ce4.ae467",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 85,
-        "y": 68.00000381469727,
-        "z": "147f59c8.d7f266",
+        "x": 95.51040649414062,
+        "y": 42.99999976158142,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "f2c51e78.6ee01"
+                "c770572a.fb6338"
             ]
         ]
     },
     {
-        "id": "31fa463e.82923a",
+        "id": "3b0ef51d.87c1aa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 391.49998474121094,
-        "y": 378.9999990463257,
-        "z": "147f59c8.d7f266",
+        "x": 402.01039123535156,
+        "y": 353.99999499320984,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "dda69c6e.0dcdc",
-                "73e90791.30e428",
-                "539f4691.77ee38",
-                "b886ea54.85e0f8",
-                "be0d3540.8ebb28",
-                "788efb60.76f4a4",
-                "154ced05.a101f3",
-                "76dbb250.b292cc",
-                "df7eb194.69b7e",
-                "6868f266.5fe7ec",
-                "e78bb1b3.a529d",
-                "2b07f61e.bf4a1a",
-                "fd37bb03.271ec8",
-                "395e35c1.a6a5fa"
+                "fea218a9.a2a6a8",
+                "b28a31c1.baab5",
+                "d187c119.ef8c",
+                "1f4a7270.75c83e",
+                "b816fc60.a5218",
+                "e97f4b5a.d20bc8",
+                "fc345089.c5339",
+                "740c748a.ebce9c",
+                "ccd8cb84.11c5d8",
+                "5663c20e.be57ac",
+                "8c48570.a7e2ba8",
+                "37b7efe8.c51dd",
+                "192f7a8f.f6f5f5",
+                "dd669d99.3d6e7"
             ]
         ]
     },
     {
-        "id": "dda69c6e.0dcdc",
+        "id": "fea218a9.a2a6a8",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 691.8294067382812,
-        "y": 270.4961233139038,
-        "z": "147f59c8.d7f266",
+        "x": 702.3398132324219,
+        "y": 245.49611926078796,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "e02bea98.6a2108"
+                "6a2c175f.9703e8"
             ]
         ]
     },
     {
-        "id": "e02bea98.6a2108",
+        "id": "6a2c175f.9703e8",
         "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": 943.8294982910156,
-        "y": 269.16278648376465,
-        "z": "147f59c8.d7f266",
+        "x": 954.3399047851562,
+        "y": 244.1627824306488,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "44afa032.ce578"
+                "4fe97e86.0a138"
             ]
         ]
     },
     {
-        "id": "c12c2186.d601b",
+        "id": "676991e8.683f",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1315.4959869384766,
-        "y": 271.1627893447876,
-        "z": "147f59c8.d7f266",
+        "x": 1326.0063934326172,
+        "y": 246.16278529167175,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "44afa032.ce578",
+        "id": "4fe97e86.0a138",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1162.1628150939941,
-        "y": 271.16276836395264,
-        "z": "147f59c8.d7f266",
+        "x": 1172.6732215881348,
+        "y": 246.1627643108368,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "c12c2186.d601b"
+                "676991e8.683f"
             ]
         ]
     },
     {
-        "id": "b886ea54.85e0f8",
+        "id": "1f4a7270.75c83e",
         "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": 765.7501907348633,
-        "y": 492.6666564941406,
-        "z": "147f59c8.d7f266",
+        "x": 776.2605972290039,
+        "y": 467.6666524410248,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "d6ac010b.ad6e"
+                "559d320b.26902c"
             ]
         ]
     },
     {
-        "id": "d6ac010b.ad6e",
+        "id": "559d320b.26902c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 980.5285339355469,
-        "y": 490.22224044799805,
-        "z": "147f59c8.d7f266",
+        "x": 991.0389404296875,
+        "y": 465.2222363948822,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "265e23d4.36e02c",
-                "e3c83d1b.72db1"
+                "744b5a7d.c43364",
+                "3925a45.84b325c"
             ]
         ]
     },
     {
-        "id": "265e23d4.36e02c",
+        "id": "744b5a7d.c43364",
         "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": 1176.7847366333008,
-        "y": 467.9703788757324,
-        "z": "147f59c8.d7f266",
+        "x": 1187.2951431274414,
+        "y": 442.9703748226166,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3c83d1b.72db1",
+        "id": "3925a45.84b325c",
         "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": 1146.2291641235352,
-        "y": 504.970495223999,
-        "z": "147f59c8.d7f266",
+        "x": 1156.7395706176758,
+        "y": 479.9704911708832,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "6cbee016.f6042",
+        "id": "51aed84d.9e1858",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 1149.7503929138184,
-        "y": 427.3333249092102,
-        "z": "147f59c8.d7f266",
+        "x": 1160.260799407959,
+        "y": 402.33332085609436,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "73e90791.30e428",
+        "id": "b28a31c1.baab5",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 706.25,
-        "y": 225.99999237060547,
-        "z": "147f59c8.d7f266",
+        "x": 716.7604064941406,
+        "y": 200.99998831748962,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "d8c3ff3.9b067"
+                "2601ab8b.2465c4"
             ]
         ]
     },
     {
-        "id": "d8c3ff3.9b067",
+        "id": "2601ab8b.2465c4",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 892.9166793823242,
-        "y": 225.33329010009766,
-        "z": "147f59c8.d7f266",
+        "x": 903.4270858764648,
+        "y": 200.3332860469818,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "94ec6856.a83cd8"
+                "7b66cde0.5ed4e4"
             ]
         ]
     },
     {
-        "id": "94ec6856.a83cd8",
+        "id": "7b66cde0.5ed4e4",
         "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": 1074.5833053588867,
-        "y": 225.33329010009766,
-        "z": "147f59c8.d7f266",
+        "x": 1085.0937118530273,
+        "y": 200.3332860469818,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "539f4691.77ee38",
+        "id": "d187c119.ef8c",
         "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": 747.4999895095825,
-        "y": 345.9999933242798,
-        "z": "147f59c8.d7f266",
+        "x": 758.0103960037231,
+        "y": 320.99998927116394,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "83439569.31aa38",
-                "bcb4cae0.4f9908"
+                "3c09952e.958fba",
+                "e6356a17.905c68"
             ]
         ]
     },
     {
-        "id": "83439569.31aa38",
+        "id": "3c09952e.958fba",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.5,
-        "y": 321.99999046325684,
-        "z": "147f59c8.d7f266",
+        "x": 989.0104064941406,
+        "y": 296.999986410141,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "ba3dff03.8dc24"
+                "fba8bc43.2cb3f"
             ]
         ]
     },
     {
-        "id": "bcb4cae0.4f9908",
+        "id": "e6356a17.905c68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.5,
-        "y": 361.99999046325684,
-        "z": "147f59c8.d7f266",
+        "x": 989.0104064941406,
+        "y": 336.999986410141,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "890fe4fa.c0f128"
+                "1e3ff05c.7e707"
             ]
         ]
     },
     {
-        "id": "ba3dff03.8dc24",
+        "id": "fba8bc43.2cb3f",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1121,
-        "y": 321.99999046325684,
-        "z": "147f59c8.d7f266",
+        "x": 1131.5104064941406,
+        "y": 296.999986410141,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "890fe4fa.c0f128",
+        "id": "1e3ff05c.7e707",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1122.8570442199707,
-        "y": 361.93650245666504,
-        "z": "147f59c8.d7f266",
+        "x": 1133.3674507141113,
+        "y": 336.9364984035492,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "3895380d.b43d08",
-                "ba2eca23.0f6508"
+                "734f7a0e.a807e4",
+                "6a7d1bd9.260064"
             ]
         ]
     },
     {
-        "id": "ba2eca23.0f6508",
+        "id": "6a7d1bd9.260064",
         "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": 1275.555519104004,
-        "y": 331.5556011493318,
-        "z": "147f59c8.d7f266",
+        "x": 1286.0659255981445,
+        "y": 306.55559709621593,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "3895380d.b43d08",
+        "id": "734f7a0e.a807e4",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331.9840240478516,
-        "y": 384.77773094177246,
-        "z": "147f59c8.d7f266",
+        "x": 1342.4944305419922,
+        "y": 359.7777268886566,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "8202a636.7f9518"
+                "1f870f52.7ed3d1"
             ]
         ]
     },
     {
-        "id": "51af10a6.1b1e3",
+        "id": "c40703ba.a6d6d",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1555.6347541809082,
-        "y": 343.0317883491516,
-        "z": "147f59c8.d7f266",
+        "x": 1566.1451606750488,
+        "y": 318.03178429603577,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "8202a636.7f9518",
+        "id": "1f870f52.7ed3d1",
         "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": 1607.2697448730469,
-        "y": 384.34923362731934,
-        "z": "147f59c8.d7f266",
+        "x": 1617.7801513671875,
+        "y": 359.3492295742035,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "ce7e5cca.15004"
+                "f0ccc856.a88628"
             ]
         ]
     },
     {
-        "id": "ce7e5cca.15004",
+        "id": "f0ccc856.a88628",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1507.999942779541,
-        "y": 442.9206647872925,
-        "z": "147f59c8.d7f266",
+        "x": 1518.5103492736816,
+        "y": 417.92066073417664,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             [
-                "7c5cfe61.fdc3f"
+                "fdfb4a25.63fa28"
             ]
         ]
     },
     {
-        "id": "7c5cfe61.fdc3f",
+        "id": "fdfb4a25.63fa28",
         "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": 1655.7500457763672,
-        "y": 442.7778568561189,
-        "z": "147f59c8.d7f266",
+        "x": 1666.2604522705078,
+        "y": 417.77785280300304,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "df7eb194.69b7e",
+        "id": "ccd8cb84.11c5d8",
         "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.site-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n",
         "comments": "",
-        "x": 759.3531951904297,
-        "y": 772.4962134361267,
-        "z": "147f59c8.d7f266",
+        "x": 769.8636016845703,
+        "y": 747.4962093830109,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "76dbb250.b292cc",
+        "id": "740c748a.ebce9c",
         "type": "execute",
         "name": "execute generate-vf-module-index",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.site-vf-index\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 767.6866912841797,
-        "y": 719.1629462242126,
-        "z": "147f59c8.d7f266",
+        "x": 778.1970977783203,
+        "y": 694.1629421710968,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             []
         ]
     },
     {
-        "id": "154ced05.a101f3",
+        "id": "fc345089.c5339",
         "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": 741.6866683959961,
-        "y": 665.1628398895264,
-        "z": "147f59c8.d7f266",
+        "x": 752.1970748901367,
+        "y": 640.1628358364105,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "be0d3540.8ebb28",
+        "id": "b816fc60.a5218",
         "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": 756.6863288879395,
-        "y": 555.1542205810547,
-        "z": "147f59c8.d7f266",
+        "x": 767.1967353820801,
+        "y": 530.1542165279388,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "788efb60.76f4a4",
+        "id": "e97f4b5a.d20bc8",
         "type": "call",
         "name": "call sdwan-get-vf-module-site-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 772.686637878418,
-        "y": 607.1544017791748,
-        "z": "147f59c8.d7f266",
+        "x": 783.1970443725586,
+        "y": 582.154397726059,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             []
         ]
     },
     {
-        "id": "6868f266.5fe7ec",
+        "id": "5663c20e.be57ac",
         "type": "set",
         "name": "set vf-module-object-path",
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.site-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.site-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
         "comments": "",
-        "x": 754.5000877380371,
-        "y": 823.0000586509705,
-        "z": "147f59c8.d7f266",
+        "x": 765.0104942321777,
+        "y": 798.0000545978546,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "e78bb1b3.a529d",
+        "id": "8c48570.a7e2ba8",
         "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": 764.0001068115234,
-        "y": 871.9999680519104,
-        "z": "147f59c8.d7f266",
+        "x": 774.5105133056641,
+        "y": 846.9999639987946,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     },
     {
-        "id": "fd37bb03.271ec8",
+        "id": "192f7a8f.f6f5f5",
         "type": "save",
         "name": "save sdwan vpn resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $prop.site-vf-index' >\n<parameter name='site-resource-id' value='`$prop.site-vf-index`' />\n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='`$prop.site.type`' />\n<parameter name='role' value='`$prop.site.role`' />\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.site-vf-index + '/vf-module-data/'` \" />",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $prop.site-vf-index' >\n<parameter name='site-resource-id' value='`$prop.site-vf-index`' />\n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='`$prop.site.type`' />\n<parameter name='role' value='`$prop.site.role`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.site-vf-index + '/vf-module-data/'` \" />",
         "comments": "",
         "outputs": 1,
-        "x": 766.5000419616699,
-        "y": 917.4999742507935,
-        "z": "147f59c8.d7f266",
+        "x": 777.0104484558105,
+        "y": 892.4999701976776,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             []
         ]
     },
     {
-        "id": "395e35c1.a6a5fa",
+        "id": "dd669d99.3d6e7",
         "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=\"site-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/site-resources/site-resource/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"site-resource.site-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 765.4999847412109,
-        "y": 964.5000219345093,
-        "z": "147f59c8.d7f266",
+        "x": 776.0103912353516,
+        "y": 939.5000178813934,
+        "z": "7f7f8941.3fdb18",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b07f61e.bf4a1a",
+        "id": "37b7efe8.c51dd",
         "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": 714.2225151062012,
-        "y": 1010.6738648414612,
-        "z": "147f59c8.d7f266",
+        "x": 724.7329216003418,
+        "y": 985.6738607883453,
+        "z": "7f7f8941.3fdb18",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
index 58dcb220..88c8553b 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
@@ -1,35 +1,35 @@
 [
     {
-        "id": "86705660.0abdc8",
+        "id": "f25c52a5.c1512",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 476.00390625,
-        "y": 401.9999997615814,
-        "z": "12e5b519.7c42cb",
+        "x": 431.0104064941406,
+        "y": 360.00000047683716,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "33a55b62.a48504",
-                "c9956259.20d27",
-                "92e109fc.d487c8",
-                "fa6a2af9.45d408",
-                "96b8a138.b9de9",
-                "1072d79c.c97df8",
-                "7fb4c42e.fff1cc",
-                "8252c529.c8dc08",
-                "d1676675.1b3088",
-                "80911d80.565f6",
-                "f1c0f2fa.5d8e8",
-                "69439d08.c30934",
-                "a6352f7.5aa86d"
+                "b0ec8338.580f5",
+                "f7ddfb47.5b2f08",
+                "b17c2a0a.9c7048",
+                "b301b0b4.47969",
+                "75b3686.06a8798",
+                "eda7bf6a.a6768",
+                "1c914e3e.bd19d2",
+                "e8fbb993.4260a8",
+                "ce57fa36.d86878",
+                "67b336e3.64c8a8",
+                "393d128d.77829e",
+                "3dff4920.e6f876",
+                "1788c292.f60a9d"
             ]
         ]
     },
     {
-        "id": "4414eba1.be7024",
+        "id": "fd150a68.54b208",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -37,512 +37,512 @@
         "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": 318.00392150878906,
-        "y": 185.99999117851257,
-        "z": "12e5b519.7c42cb",
+        "x": 273.0104217529297,
+        "y": 143.9999918937683,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "665e6349.0f20bc"
+                "58419eae.b9425"
             ]
         ]
     },
     {
-        "id": "665e6349.0f20bc",
+        "id": "58419eae.b9425",
         "type": "method",
         "name": "sdwan-vf-operation-vpn-create",
         "xml": "<method rpc='sdwan-vf-operation-vpn-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 317.00392150878906,
-        "y": 285.9999911785126,
-        "z": "12e5b519.7c42cb",
+        "x": 272.0104217529297,
+        "y": 243.9999918937683,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "86705660.0abdc8"
+                "f25c52a5.c1512"
             ]
         ]
     },
     {
-        "id": "c5e65dcf.93a1d",
+        "id": "c35c953.b5e8868",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 147.50392150878906,
-        "y": 96.9999988079071,
-        "z": "12e5b519.7c42cb",
+        "x": 102.51042175292969,
+        "y": 54.99999952316284,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "4414eba1.be7024"
+                "fd150a68.54b208"
             ]
         ]
     },
     {
-        "id": "c9956259.20d27",
+        "id": "f7ddfb47.5b2f08",
         "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": 851.2541379928589,
-        "y": 410.66667890548706,
-        "z": "12e5b519.7c42cb",
+        "x": 806.2606382369995,
+        "y": 368.6666796207428,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "5f7e52d8.71003c"
+                "fcacce0e.8c56d"
             ]
         ]
     },
     {
-        "id": "5f7e52d8.71003c",
+        "id": "fcacce0e.8c56d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1066.0324811935425,
-        "y": 408.2222628593445,
-        "z": "12e5b519.7c42cb",
+        "x": 1021.0389814376831,
+        "y": 366.2222635746002,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "b5888647.1272c8",
-                "f88a8224.ffbd4"
+                "e9bb9dc5.ab9e7",
+                "437b18ad.950888"
             ]
         ]
     },
     {
-        "id": "b5888647.1272c8",
+        "id": "e9bb9dc5.ab9e7",
         "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": 1262.2886838912964,
-        "y": 385.97040128707886,
-        "z": "12e5b519.7c42cb",
+        "x": 1217.295184135437,
+        "y": 343.9704020023346,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
     },
     {
-        "id": "f88a8224.ffbd4",
+        "id": "437b18ad.950888",
         "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": 1231.7331113815308,
-        "y": 422.97051763534546,
-        "z": "12e5b519.7c42cb",
+        "x": 1186.7396116256714,
+        "y": 380.9705183506012,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "84649b93.490df8",
+        "id": "7d6fd9af.e0a388",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 1235.254340171814,
-        "y": 345.33334732055664,
-        "z": "12e5b519.7c42cb",
+        "x": 1190.2608404159546,
+        "y": 303.3333480358124,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "33a55b62.a48504",
+        "id": "b0ec8338.580f5",
         "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": 833.0039367675781,
-        "y": 264.0000157356262,
-        "z": "12e5b519.7c42cb",
+        "x": 788.0104370117188,
+        "y": 222.00001645088196,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "5e528a3d.403a94",
-                "e1430919.889a48"
+                "e3d991cc.0551d",
+                "fab03553.0f6bc8"
             ]
         ]
     },
     {
-        "id": "5e528a3d.403a94",
+        "id": "e3d991cc.0551d",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1064.0039472579956,
-        "y": 240.00001287460327,
-        "z": "12e5b519.7c42cb",
+        "x": 1019.0104475021362,
+        "y": 198.000013589859,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "d1fe70de.0d5a2"
+                "cd9f31aa.1f944"
             ]
         ]
     },
     {
-        "id": "e1430919.889a48",
+        "id": "fab03553.0f6bc8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1064.0039472579956,
-        "y": 280.00001287460327,
-        "z": "12e5b519.7c42cb",
+        "x": 1019.0104475021362,
+        "y": 238.000013589859,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "550ac6cc.1a43f8"
+                "9fa4f951.782718"
             ]
         ]
     },
     {
-        "id": "d1fe70de.0d5a2",
+        "id": "cd9f31aa.1f944",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1206.5039472579956,
-        "y": 240.00001287460327,
-        "z": "12e5b519.7c42cb",
+        "x": 1161.5104475021362,
+        "y": 198.000013589859,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "550ac6cc.1a43f8",
+        "id": "9fa4f951.782718",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1208.3609914779663,
-        "y": 279.9365248680115,
-        "z": "12e5b519.7c42cb",
+        "x": 1163.367491722107,
+        "y": 237.9365255832672,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "2b30e41b.b2df2c",
-                "735539ef.d045e8"
+                "f792bd90.84c2f",
+                "a00871e4.c717d"
             ]
         ]
     },
     {
-        "id": "735539ef.d045e8",
+        "id": "a00871e4.c717d",
         "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": 1361.0594663619995,
-        "y": 249.5556235606782,
-        "z": "12e5b519.7c42cb",
+        "x": 1316.0659666061401,
+        "y": 207.55562427593395,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "2b30e41b.b2df2c",
+        "id": "f792bd90.84c2f",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1417.4879713058472,
-        "y": 302.7777533531189,
-        "z": "12e5b519.7c42cb",
+        "x": 1372.4944715499878,
+        "y": 260.77775406837463,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "e7001097.30f29"
+                "2a945efe.523112"
             ]
         ]
     },
     {
-        "id": "87bb5bc0.359988",
+        "id": "a3b8abe8.a0e028",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1641.1387014389038,
-        "y": 261.03181076049805,
-        "z": "12e5b519.7c42cb",
+        "x": 1596.1452016830444,
+        "y": 219.03181147575378,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "e7001097.30f29",
+        "id": "2a945efe.523112",
         "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": 1692.7736921310425,
-        "y": 302.34925603866577,
-        "z": "12e5b519.7c42cb",
+        "x": 1647.780192375183,
+        "y": 260.3492567539215,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "c77c794f.c68788"
+                "f09636f3.8478b8"
             ]
         ]
     },
     {
-        "id": "c77c794f.c68788",
+        "id": "f09636f3.8478b8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1593.5038900375366,
-        "y": 360.9206871986389,
-        "z": "12e5b519.7c42cb",
+        "x": 1548.5103902816772,
+        "y": 318.92068791389465,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "1ae23876.21a108"
+                "a87baae5.4ae3f8"
             ]
         ]
     },
     {
-        "id": "1ae23876.21a108",
+        "id": "a87baae5.4ae3f8",
         "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": 1741.2539930343628,
-        "y": 360.7778792674653,
-        "z": "12e5b519.7c42cb",
+        "x": 1696.2604932785034,
+        "y": 318.77787998272106,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "1072d79c.c97df8",
+        "id": "eda7bf6a.a6768",
         "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.vpn-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n\n",
         "comments": "",
-        "x": 846.8571271896362,
-        "y": 713.4962668418884,
-        "z": "12e5b519.7c42cb",
+        "x": 801.8636274337769,
+        "y": 671.4962675571442,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "96b8a138.b9de9",
+        "id": "75b3686.06a8798",
         "type": "execute",
         "name": "execute generate-vf-module-index",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 858.1906995773315,
-        "y": 666.1629691123962,
-        "z": "12e5b519.7c42cb",
+        "x": 813.1971998214722,
+        "y": 624.162969827652,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa6a2af9.45d408",
+        "id": "b301b0b4.47969",
         "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": 830.1907606124878,
-        "y": 617.1629691123962,
-        "z": "12e5b519.7c42cb",
+        "x": 785.1972608566284,
+        "y": 575.162969827652,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "92e109fc.d487c8",
+        "id": "b17c2a0a.9c7048",
         "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": 830.1902875900269,
-        "y": 563.1542572975159,
-        "z": "12e5b519.7c42cb",
+        "x": 785.1967878341675,
+        "y": 521.1542580127716,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "7fb4c42e.fff1cc",
+        "id": "1c914e3e.bd19d2",
         "type": "set",
         "name": "set vf-module-level-oper-status",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
         "comments": "",
-        "x": 840.5041151046753,
-        "y": 811.000087916851,
-        "z": "12e5b519.7c42cb",
+        "x": 795.5106153488159,
+        "y": 769.0000886321068,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "69439d08.c30934",
+        "id": "3dff4920.e6f876",
         "type": "save",
         "name": "save sdwan vpn resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $prop.vpn-vf-index' >\n<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />\n<parameter name='sdwan-vpn-name' value='`$prop.name`' />\n<parameter name='topology' value='`$prop.topology`' />\n<parameter name='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.vpn-vf-index + '/vf-module-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $prop.vpn-vf-index' >\n<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />\n<parameter name='sdwan-vpn-name' value='`$prop.name`' />\n<parameter name='topology' value='`$prop.topology`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 847.0039758682251,
-        "y": 856.5000357627869,
-        "z": "12e5b519.7c42cb",
+        "x": 802.0104761123657,
+        "y": 814.5000364780426,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
     },
     {
-        "id": "8252c529.c8dc08",
+        "id": "e8fbb993.4260a8",
         "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": 794.7264490127563,
-        "y": 949.6739263534546,
-        "z": "12e5b519.7c42cb",
+        "x": 749.732949256897,
+        "y": 907.6739270687103,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "d1676675.1b3088",
+        "id": "ce57fa36.d86878",
         "type": "for",
         "name": "for loop i - Network input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 858.2578535079956,
-        "y": 499.5039267539978,
-        "z": "12e5b519.7c42cb",
+        "x": 813.2643537521362,
+        "y": 457.50392746925354,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "63318660.a4e798"
+                "e6621181.b6207"
             ]
         ]
     },
     {
-        "id": "63318660.a4e798",
+        "id": "e6621181.b6207",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1145.480731010437,
-        "y": 499.7262406349182,
-        "z": "12e5b519.7c42cb",
+        "x": 1100.4872312545776,
+        "y": 457.72624135017395,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "1e3ec759.b2be29",
-                "bfacfb85.875b78"
+                "cf9839cf.8bf478",
+                "7fad1cad.2e9334"
             ]
         ]
     },
     {
-        "id": "1e3ec759.b2be29",
+        "id": "cf9839cf.8bf478",
         "type": "switchNode",
         "name": "switch name",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1333.7025747299194,
-        "y": 482.05954480171204,
-        "z": "12e5b519.7c42cb",
+        "x": 1288.70907497406,
+        "y": 440.0595455169678,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "4c3c07dc.109bb8"
+                "2663612d.85d52e"
             ]
         ]
     },
     {
-        "id": "bfacfb85.875b78",
+        "id": "7fad1cad.2e9334",
         "type": "switchNode",
         "name": "switch topology",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 1344.5422353744507,
-        "y": 522.0595428943634,
-        "z": "12e5b519.7c42cb",
+        "x": 1299.5487356185913,
+        "y": 480.05954360961914,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "8910bf6.fa8bd4"
+                "1951da82.25c5f5"
             ]
         ]
     },
     {
-        "id": "4c3c07dc.109bb8",
+        "id": "2663612d.85d52e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1520.7025747299194,
-        "y": 478.05954480171204,
-        "z": "12e5b519.7c42cb",
+        "x": 1475.70907497406,
+        "y": 436.0595455169678,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "330c74f0.0fa8ac"
+                "e034463.55bd5b8"
             ]
         ]
     },
     {
-        "id": "8910bf6.fa8bd4",
+        "id": "1951da82.25c5f5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1514.5422353744507,
-        "y": 518.0595428943634,
-        "z": "12e5b519.7c42cb",
+        "x": 1469.5487356185913,
+        "y": 476.05954360961914,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "c760e70.ca63518"
+                "18d6441f.f0cc5c"
             ]
         ]
     },
     {
-        "id": "330c74f0.0fa8ac",
+        "id": "e034463.55bd5b8",
         "type": "set",
         "name": "set name",
         "xml": "<set>\n<parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n\n",
         "comments": "",
-        "x": 1670.7027044296265,
-        "y": 476.6595513820648,
-        "z": "12e5b519.7c42cb",
+        "x": 1625.709204673767,
+        "y": 434.65955209732056,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "c760e70.ca63518",
+        "id": "18d6441f.f0cc5c",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1701.8756761550903,
-        "y": 516.5206997394562,
-        "z": "12e5b519.7c42cb",
+        "x": 1656.882176399231,
+        "y": 474.5207004547119,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "80911d80.565f6",
+        "id": "67b336e3.64c8a8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 954.5077972412109,
-        "y": 190.0039086341858,
-        "z": "12e5b519.7c42cb",
+        "x": 909.5142974853516,
+        "y": 148.00390934944153,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1c0f2fa.5d8e8",
+        "id": "393d128d.77829e",
         "type": "set",
         "name": "set vf-module-object-path",
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vpn-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
         "comments": "",
-        "x": 832.5039930343628,
-        "y": 762.0313073992729,
-        "z": "12e5b519.7c42cb",
+        "x": 787.5104932785034,
+        "y": 720.0313081145287,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "a6352f7.5aa86d",
+        "id": "1788c292.f60a9d",
         "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=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 847.004054069519,
-        "y": 904.0001769065857,
-        "z": "12e5b519.7c42cb",
+        "x": 802.0105543136597,
+        "y": 862.0001776218414,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json
index c3398834..e76571f6 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "5de743a6.6e9fdc",
+        "id": "aee5dac3.29d8f8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -8,524 +8,524 @@
         "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": 292.03125,
-        "y": 127.03125,
-        "z": "56fc6b1a.95dca4",
+        "x": 259.0104064941406,
+        "y": 136.99999237060547,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "831852f4.73c97"
+                "92f80405.527238"
             ]
         ]
     },
     {
-        "id": "831852f4.73c97",
+        "id": "92f80405.527238",
         "type": "method",
         "name": "sdwan-vf-operation-wanport-create",
         "xml": "<method rpc='sdwan-vf-operation-wanport-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 291.03125,
-        "y": 227.03125,
-        "z": "56fc6b1a.95dca4",
+        "x": 258.0104064941406,
+        "y": 236.99999237060547,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "f0bca81d.b6a0f8"
+                "8357a961.bd7368"
             ]
         ]
     },
     {
-        "id": "8410a95b.8b6678",
+        "id": "a10fd13a.8313d",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 148.53124618530273,
-        "y": 36.03125762939453,
-        "z": "56fc6b1a.95dca4",
+        "x": 115.51040267944336,
+        "y": 46,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "5de743a6.6e9fdc"
+                "aee5dac3.29d8f8"
             ]
         ]
     },
     {
-        "id": "f0bca81d.b6a0f8",
+        "id": "8357a961.bd7368",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 450.03123474121094,
-        "y": 343.03125858306885,
-        "z": "56fc6b1a.95dca4",
+        "x": 417.01039123535156,
+        "y": 353.0000009536743,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "54bfa066.4da69",
-                "1eb4450c.b37a3b",
-                "ff1f4bbb.9c88d8",
-                "262e8a6c.764e06",
-                "1438dd60.41b403",
-                "fa6eaef6.2d96",
-                "fdda37d.d3044c8",
-                "9b9a9c47.ff729",
-                "89e460e0.31c23",
-                "cf5e55a3.da5e38",
-                "3ce6fee1.f7c372",
-                "37eaec79.c59c14",
-                "981dfc9a.eb48b",
-                "461f9f03.a33d2"
+                "c20a7dc0.e21ea",
+                "b9fc1e5f.5b376",
+                "1b6a0c2c.530674",
+                "dfd3a664.1be748",
+                "f3dc4ebd.df298",
+                "cae5d4a0.b09a38",
+                "67d04e5d.908a3",
+                "fd081780.8915a8",
+                "4fc9e2ee.90febc",
+                "cdfc7ae4.0514d8",
+                "2814f80b.cacb28",
+                "da49c07c.27b0f",
+                "3699b36a.223adc",
+                "1bf42dc2.073fb2"
             ]
         ]
     },
     {
-        "id": "54bfa066.4da69",
+        "id": "c20a7dc0.e21ea",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 750.3606567382812,
-        "y": 234.52738285064697,
-        "z": "56fc6b1a.95dca4",
+        "x": 717.3398132324219,
+        "y": 244.49612522125244,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "53ca6ad5.693354"
+                "fc97057b.994b78"
             ]
         ]
     },
     {
-        "id": "53ca6ad5.693354",
+        "id": "fc97057b.994b78",
         "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": 1002.3607482910156,
-        "y": 233.1940460205078,
-        "z": "56fc6b1a.95dca4",
+        "x": 969.3399047851562,
+        "y": 243.16278839111328,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "3af25422.f8b80c"
+                "df301c25.93aef"
             ]
         ]
     },
     {
-        "id": "61e228fb.8092e8",
+        "id": "311e101f.d5d19",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1374.0272369384766,
-        "y": 235.19404888153076,
-        "z": "56fc6b1a.95dca4",
+        "x": 1341.0063934326172,
+        "y": 245.16279125213623,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "3af25422.f8b80c",
+        "id": "df301c25.93aef",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1220.6940650939941,
-        "y": 235.1940279006958,
-        "z": "56fc6b1a.95dca4",
+        "x": 1187.6732215881348,
+        "y": 245.16277027130127,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "61e228fb.8092e8"
+                "311e101f.d5d19"
             ]
         ]
     },
     {
-        "id": "262e8a6c.764e06",
+        "id": "dfd3a664.1be748",
         "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": 824.2814407348633,
-        "y": 456.6979160308838,
-        "z": "56fc6b1a.95dca4",
+        "x": 791.2605972290039,
+        "y": 466.66665840148926,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "6641b8fa.11e218"
+                "aad3c15.925ee4"
             ]
         ]
     },
     {
-        "id": "6641b8fa.11e218",
+        "id": "aad3c15.925ee4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1039.0597839355469,
-        "y": 454.2534999847412,
-        "z": "56fc6b1a.95dca4",
+        "x": 1006.0389404296875,
+        "y": 464.2222423553467,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "4c2187d7.70c4d8",
-                "32a53869.510578"
+                "917fbe88.711cc",
+                "c43ea4c0.149928"
             ]
         ]
     },
     {
-        "id": "4c2187d7.70c4d8",
+        "id": "917fbe88.711cc",
         "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": 1235.3159866333008,
-        "y": 432.0016384124756,
-        "z": "56fc6b1a.95dca4",
+        "x": 1202.2951431274414,
+        "y": 441.97038078308105,
+        "z": "3e6f238d.8b432c",
         "wires": [
             []
         ]
     },
     {
-        "id": "32a53869.510578",
+        "id": "c43ea4c0.149928",
         "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": 1204.7604141235352,
-        "y": 469.0017547607422,
-        "z": "56fc6b1a.95dca4",
+        "x": 1171.7395706176758,
+        "y": 478.97049713134766,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "ab557068.64844",
+        "id": "5248680e.c068e8",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 1208.2816429138184,
-        "y": 391.36458444595337,
-        "z": "56fc6b1a.95dca4",
+        "x": 1175.260799407959,
+        "y": 401.33332681655884,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "1eb4450c.b37a3b",
+        "id": "b9fc1e5f.5b376",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 764.78125,
-        "y": 190.03125190734863,
-        "z": "56fc6b1a.95dca4",
+        "x": 731.7604064941406,
+        "y": 199.9999942779541,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "e279b1ab.b937f"
+                "c77be859.d85c08"
             ]
         ]
     },
     {
-        "id": "e279b1ab.b937f",
+        "id": "c77be859.d85c08",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 951.4479293823242,
-        "y": 189.36454963684082,
-        "z": "56fc6b1a.95dca4",
+        "x": 918.4270858764648,
+        "y": 199.3332920074463,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "c52a39f4.c6da18"
+                "c9a6db6e.787d58"
             ]
         ]
     },
     {
-        "id": "c52a39f4.c6da18",
+        "id": "c9a6db6e.787d58",
         "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": 1133.1145553588867,
-        "y": 189.36454963684082,
-        "z": "56fc6b1a.95dca4",
+        "x": 1100.0937118530273,
+        "y": 199.3332920074463,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "ff1f4bbb.9c88d8",
+        "id": "1b6a0c2c.530674",
         "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": 806.0312395095825,
-        "y": 310.03125286102295,
-        "z": "56fc6b1a.95dca4",
+        "x": 773.0103960037231,
+        "y": 319.9999952316284,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "cd7442d9.34306",
-                "6d930136.d20cb"
+                "9acf5c90.6cf6",
+                "ffb3f2fc.2e117"
             ]
         ]
     },
     {
-        "id": "cd7442d9.34306",
+        "id": "9acf5c90.6cf6",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1037.03125,
-        "y": 286.03125,
-        "z": "56fc6b1a.95dca4",
+        "x": 1004.0104064941406,
+        "y": 295.99999237060547,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "c51e25a8.593288"
+                "8e0399d7.7006d8"
             ]
         ]
     },
     {
-        "id": "6d930136.d20cb",
+        "id": "ffb3f2fc.2e117",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1037.03125,
-        "y": 326.03125,
-        "z": "56fc6b1a.95dca4",
+        "x": 1004.0104064941406,
+        "y": 335.99999237060547,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "8a36da98.f826b8"
+                "ef3e733d.2d036"
             ]
         ]
     },
     {
-        "id": "c51e25a8.593288",
+        "id": "8e0399d7.7006d8",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1179.53125,
-        "y": 286.03125,
-        "z": "56fc6b1a.95dca4",
+        "x": 1146.5104064941406,
+        "y": 295.99999237060547,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "8a36da98.f826b8",
+        "id": "ef3e733d.2d036",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1181.3882942199707,
-        "y": 325.9677619934082,
-        "z": "56fc6b1a.95dca4",
+        "x": 1148.3674507141113,
+        "y": 335.9365043640137,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "26e4ea27.208ad6",
-                "44db3104.e81c6"
+                "1d25ad68.e6ab83",
+                "461a624f.09559c"
             ]
         ]
     },
     {
-        "id": "44db3104.e81c6",
+        "id": "461a624f.09559c",
         "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": 1334.086769104004,
-        "y": 295.58686068607494,
-        "z": "56fc6b1a.95dca4",
+        "x": 1301.0659255981445,
+        "y": 305.5556030566804,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "26e4ea27.208ad6",
+        "id": "1d25ad68.e6ab83",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1390.5152740478516,
-        "y": 348.8089904785156,
-        "z": "56fc6b1a.95dca4",
+        "x": 1357.4944305419922,
+        "y": 358.7777328491211,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "3b7c03ef.0af89c"
+                "620a6b7.d8fa094"
             ]
         ]
     },
     {
-        "id": "5b9f74ec.1882ec",
+        "id": "406aa837.6a2a68",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1614.1660041809082,
-        "y": 307.0630478858948,
-        "z": "56fc6b1a.95dca4",
+        "x": 1581.1451606750488,
+        "y": 317.03179025650024,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "3b7c03ef.0af89c",
+        "id": "620a6b7.d8fa094",
         "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": 1665.8009948730469,
-        "y": 348.3804931640625,
-        "z": "56fc6b1a.95dca4",
+        "x": 1632.7801513671875,
+        "y": 358.34923553466797,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "84bba4b1.816e38"
+                "89ef579f.c10518"
             ]
         ]
     },
     {
-        "id": "84bba4b1.816e38",
+        "id": "89ef579f.c10518",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1566.531192779541,
-        "y": 406.95192432403564,
-        "z": "56fc6b1a.95dca4",
+        "x": 1533.5103492736816,
+        "y": 416.9206666946411,
+        "z": "3e6f238d.8b432c",
         "wires": [
             [
-                "4d582e07.7c7a1"
+                "b4a45077.2328e"
             ]
         ]
     },
     {
-        "id": "4d582e07.7c7a1",
+        "id": "b4a45077.2328e",
         "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": 1714.2812957763672,
-        "y": 406.80911639286205,
-        "z": "56fc6b1a.95dca4",
+        "x": 1681.2604522705078,
+        "y": 416.7778587634675,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "9b9a9c47.ff729",
+        "id": "fd081780.8915a8",
         "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.wan-port-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n<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": 821.8844604492188,
-        "y": 730.527437210083,
-        "z": "56fc6b1a.95dca4",
+        "x": 788.8636169433594,
+        "y": 740.4961795806885,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "fdda37d.d3044c8",
+        "id": "67d04e5d.908a3",
         "type": "execute",
         "name": "execute generate-vf-module-index",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.wan-port-vf-index\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 831.2179641723633,
-        "y": 682.1941680908203,
-        "z": "56fc6b1a.95dca4",
+        "x": 798.1971206665039,
+        "y": 692.1629104614258,
+        "z": "3e6f238d.8b432c",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa6eaef6.2d96",
+        "id": "cae5d4a0.b09a38",
         "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": 803.2179107666016,
-        "y": 629.1941051483154,
-        "z": "56fc6b1a.95dca4",
+        "x": 770.1970672607422,
+        "y": 639.1628475189209,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "1438dd60.41b403",
+        "id": "f3dc4ebd.df298",
         "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": 815.2175788879395,
-        "y": 519.1854801177979,
-        "z": "56fc6b1a.95dca4",
+        "x": 782.1967353820801,
+        "y": 529.1542224884033,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "89e460e0.31c23",
+        "id": "4fc9e2ee.90febc",
         "type": "set",
         "name": "set vf-module-object-path",
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.wan-port-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.wan-port-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
         "comments": "",
-        "x": 807.0313243865967,
-        "y": 788.0312948226929,
-        "z": "56fc6b1a.95dca4",
+        "x": 774.0104808807373,
+        "y": 798.0000371932983,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "cf5e55a3.da5e38",
+        "id": "cdfc7ae4.0514d8",
         "type": "set",
         "name": "set vf-module-level-oper-status",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
         "comments": "",
-        "x": 821.5313835144043,
-        "y": 838.0311880111694,
-        "z": "56fc6b1a.95dca4",
+        "x": 788.5105400085449,
+        "y": 847.9999303817749,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "981dfc9a.eb48b",
+        "id": "3699b36a.223adc",
         "type": "save",
         "name": "save sdwan vpn resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $prop.wan-port-vf-index' >\n<parameter name=\"wan-port-config-id\" value=\"`$prop.wan-port-vf-index`\" />\n<parameter name=\"wan-port-config-name\" value=\"`$prop.wan.name`\" />\n<parameter name=\"device-id\" value=\"`$prop.wan.deviceName`\" />\n<parameter name='vlan-id' value=\"`$prop.wan.vlanId`\" />\n<parameter name=\"ip-address\" value=\"`$prop.wan.ipAddress`\" />\n<parameter name=\"provider-ip-address\" value=\"`$prop.wan.providerIpAddress`\" />\n<parameter name=\"input-bandwidth\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"output-bandwidth\" value=\"`$prop.wan.outputBandwidth`\" />\n<parameter name=\"description\" value=\"`$prop.wan.description`\" />\n<parameter name=\"port-type\" value=\"`$prop.wan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.wan.portNumber`\" />\n<parameter name=\"transport-network-name\" value=\"`$prop.wan.transportNetworkName`\" />\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.wan-port-vf-index + '/vf-module-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $prop.wan-port-vf-index' >\n<parameter name=\"wan-port-config-id\" value=\"`$prop.wan-port-vf-index`\" />\n<parameter name=\"wan-port-config-name\" value=\"`$prop.wan.name`\" />\n<parameter name=\"device-id\" value=\"`$prop.wan.deviceName`\" />\n<parameter name='vlan-id' value=\"`$prop.wan.vlanId`\" />\n<parameter name=\"ip-address\" value=\"`$prop.wan.ipAddress`\" />\n<parameter name=\"provider-ip-address\" value=\"`$prop.wan.providerIpAddress`\" />\n<parameter name=\"input-bandwidth\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"output-bandwidth\" value=\"`$prop.wan.outputBandwidth`\" />\n<parameter name=\"description\" value=\"`$prop.wan.description`\" />\n<parameter name=\"port-type\" value=\"`$prop.wan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.wan.portNumber`\" />\n<parameter name=\"transport-network-name\" value=\"`$prop.wan.transportNetworkName`\" />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.wan-port-vf-index + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 825.0312919616699,
-        "y": 881.5312337875366,
-        "z": "56fc6b1a.95dca4",
+        "x": 792.0104484558105,
+        "y": 891.4999761581421,
+        "z": "3e6f238d.8b432c",
         "wires": [
             []
         ]
     },
     {
-        "id": "461f9f03.a33d2",
+        "id": "1bf42dc2.073fb2",
         "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=\"wan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/wan-port-configs/wan-port-config/' + $prop.wan-port-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"wan-port-config.wan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.wan-port-vf-index`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 822.0312194824219,
-        "y": 927.5312652587891,
-        "z": "56fc6b1a.95dca4",
+        "x": 789.0103759765625,
+        "y": 937.5000076293945,
+        "z": "3e6f238d.8b432c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3ce6fee1.f7c372",
+        "id": "2814f80b.cacb28",
         "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": 772.7537651062012,
-        "y": 974.7051243782043,
-        "z": "56fc6b1a.95dca4",
+        "x": 739.7329216003418,
+        "y": 984.6738667488098,
+        "z": "3e6f238d.8b432c",
         "wires": []
     },
     {
-        "id": "37eaec79.c59c14",
+        "id": "da49c07c.27b0f",
         "type": "call",
         "name": "call sdwan-get-wan-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 814.9201202392578,
-        "y": 581.9201335906982,
-        "z": "56fc6b1a.95dca4",
+        "x": 781.8992767333984,
+        "y": 591.8888759613037,
+        "z": "3e6f238d.8b432c",
         "wires": [
             []
         ]
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 3414cb9e..85cd16ff 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": "aeae6125.a8d28",
+        "id": "91da6f32.2ced7",
         "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": 265,
-        "y": 223.9999925820157,
-        "z": "3deddfaf.57c2f",
+        "x": 271.0104064941406,
+        "y": 185.9999923435971,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "10f15a6d.ba1d76"
+                "3735ac23.817b64"
             ]
         ]
     },
     {
-        "id": "3eb5635c.ae734c",
+        "id": "312112f7.2d48de",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 141.57138061523438,
-        "y": 76,
-        "z": "3deddfaf.57c2f",
+        "x": 147.581787109375,
+        "y": 37.99999976158142,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "1821ad11.5dad23"
+                "1748f570.5068bb"
             ]
         ]
     },
     {
-        "id": "1821ad11.5dad23",
+        "id": "1748f570.5068bb",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -38,434 +38,465 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 243.85708618164062,
-        "y": 134.23810407798737,
-        "z": "3deddfaf.57c2f",
+        "x": 249.86749267578125,
+        "y": 96.2381038395688,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "aeae6125.a8d28"
+                "91da6f32.2ced7"
             ]
         ]
     },
     {
-        "id": "10f15a6d.ba1d76",
+        "id": "3735ac23.817b64",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 245.23804473876953,
-        "y": 395.6666643349454,
-        "z": "3deddfaf.57c2f",
+        "x": 251.24845123291016,
+        "y": 357.6666640965268,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "175dc57.fde8c3b",
-                "3afb3c65.1ca3a4",
-                "fadde341.82f5a",
-                "9885c8cf.ded0d8",
-                "a5e91b3d.29e478",
-                "6e79157a.cf280c",
-                "fff46357.6f3ad",
-                "5da9f931.70bc48",
-                "df8e278a.898b28",
-                "3a3acb9a.529fc4",
-                "ff8a3cb6.2dc93",
-                "1bd26429.61c74c"
+                "66587be7.1fa444",
+                "a22f6305.02259",
+                "476531fa.dda8b",
+                "39075706.c01f38",
+                "14e1d1a2.1874ee",
+                "25011a4c.02d6d6",
+                "4c11cb80.4d3124",
+                "1d89ddb9.e37322",
+                "d6dc0995.ddb998",
+                "ae963bb8.b0bb08",
+                "8d6ea2db.f2c5d8",
+                "a6ce5913.ef9af",
+                "fb6b70fa.8a9a6"
             ]
         ]
     },
     {
-        "id": "3afb3c65.1ca3a4",
+        "id": "a22f6305.02259",
         "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": 667.3848571777344,
-        "y": 759.670597076416,
-        "z": "3deddfaf.57c2f",
+        "x": 673.395263671875,
+        "y": 721.6705968379974,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "175dc57.fde8c3b",
+        "id": "66587be7.1fa444",
         "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": 659.2380447387695,
-        "y": 654.6668491363525,
-        "z": "3deddfaf.57c2f",
+        "x": 665.2484512329102,
+        "y": 616.666848897934,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "a5e91b3d.29e478",
+        "id": "14e1d1a2.1874ee",
         "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": 647.5715484619141,
-        "y": 604.3334331512451,
-        "z": "3deddfaf.57c2f",
+        "x": 653.5819549560547,
+        "y": 566.3334329128265,
+        "z": "dbd46c1f.195f5",
         "wires": [
             []
         ]
     },
     {
-        "id": "ff8a3cb6.2dc93",
+        "id": "ae963bb8.b0bb08",
         "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": 658.5716247558594,
-        "y": 711.3334369659424,
-        "z": "3deddfaf.57c2f",
+        "x": 664.58203125,
+        "y": 673.3334367275238,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "fadde341.82f5a",
+        "id": "476531fa.dda8b",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 674.5713653564453,
-        "y": 274.3333559036255,
-        "z": "3deddfaf.57c2f",
+        "x": 680.5817718505859,
+        "y": 236.3333556652069,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "fe0779f6.a341a8",
-                "9f0ded05.d925c"
+                "ca401c47.9c85b",
+                "c9cc10cf.5154b"
             ]
         ]
     },
     {
-        "id": "fe0779f6.a341a8",
+        "id": "ca401c47.9c85b",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 909.2857513427734,
-        "y": 269.47617626190186,
-        "z": "3deddfaf.57c2f",
+        "x": 915.2961578369141,
+        "y": 231.47617602348328,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "e3b683ce.f47fd"
+                "6401cbd2.e53fc4"
             ]
         ]
     },
     {
-        "id": "e3b683ce.f47fd",
+        "id": "6401cbd2.e53fc4",
         "type": "set",
         "name": "set vnf-index=0",
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
         "comments": "",
-        "x": 1069.5714569091797,
-        "y": 269.47626781463623,
-        "z": "3deddfaf.57c2f",
+        "x": 1075.5818634033203,
+        "y": 231.47626757621765,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "9f0ded05.d925c",
+        "id": "c9cc10cf.5154b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 905.7142906188965,
-        "y": 302.76200771331787,
-        "z": "3deddfaf.57c2f",
+        "x": 911.7246971130371,
+        "y": 264.7620074748993,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "411ddf99.4fbb3"
+                "e78d606c.5025f"
             ]
         ]
     },
     {
-        "id": "b6024395.bc24",
+        "id": "2f520d06.0faf82",
         "type": "set",
         "name": "set vnf-index = vnf_length",
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
         "comments": "",
-        "x": 1298.571533203125,
-        "y": 281.04773330688477,
-        "z": "3deddfaf.57c2f",
+        "x": 1304.5819396972656,
+        "y": 243.0477330684662,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "3b57b625.74c07a",
+        "id": "fec4dc30.b6a09",
         "type": "for",
         "name": "for each existing VNF",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1287.0001525878906,
-        "y": 316.04770517349243,
-        "z": "3deddfaf.57c2f",
+        "x": 1293.0105590820312,
+        "y": 278.04770493507385,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "a7076dba.f36af"
+                "c1fa87b1.a47458"
             ]
         ]
     },
     {
-        "id": "411ddf99.4fbb3",
+        "id": "e78d606c.5025f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1040.4285736083984,
-        "y": 304.76197719573975,
-        "z": "3deddfaf.57c2f",
+        "x": 1046.438980102539,
+        "y": 266.76197695732117,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "b6024395.bc24",
-                "3b57b625.74c07a"
+                "2f520d06.0faf82",
+                "fec4dc30.b6a09"
             ]
         ]
     },
     {
-        "id": "a7076dba.f36af",
+        "id": "c1fa87b1.a47458",
         "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": 1680.285888671875,
-        "y": 316.61918926239014,
-        "z": "3deddfaf.57c2f",
+        "x": 1686.2962951660156,
+        "y": 278.61918902397156,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "b4dc78a5.d896c8"
+                "826e3f48.b128f"
             ]
         ]
     },
     {
-        "id": "b4dc78a5.d896c8",
+        "id": "826e3f48.b128f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1961.571590423584,
-        "y": 315.19059467315674,
-        "z": "3deddfaf.57c2f",
+        "x": 1967.5819969177246,
+        "y": 277.19059443473816,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "51ac74f.88fd58c"
+                "b86791b.2510f7"
             ]
         ]
     },
     {
-        "id": "4be264b1.270e6c",
+        "id": "3995a6f4.c8ea1a",
         "type": "comment",
         "name": "make sure this vnf-id doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1649.4285049438477,
-        "y": 280.1905813217163,
-        "z": "3deddfaf.57c2f",
+        "x": 1655.4389114379883,
+        "y": 242.19058108329773,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "9885c8cf.ded0d8",
+        "id": "39075706.c01f38",
         "type": "set",
         "name": "set new vnf_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
         "comments": "",
-        "x": 619.5715484619141,
-        "y": 552.333429813385,
-        "z": "3deddfaf.57c2f",
+        "x": 625.5819549560547,
+        "y": 514.3334295749664,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "6e79157a.cf280c",
+        "id": "25011a4c.02d6d6",
         "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": 606.5715103149414,
-        "y": 1022.5969486236572,
-        "z": "3deddfaf.57c2f",
+        "x": 612.581916809082,
+        "y": 984.5969483852386,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "3a3acb9a.529fc4",
+        "id": "d6dc0995.ddb998",
         "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",
+        "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-instance-id\n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n\n<!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--key='service-instance.service-instance-id = $service-data.service-instance-id -->\n",
         "comments": "",
         "outputs": 1,
-        "x": 669.23828125,
-        "y": 969.5968418121338,
-        "z": "3deddfaf.57c2f",
+        "x": 675.2486877441406,
+        "y": 931.5968415737152,
+        "z": "dbd46c1f.195f5",
         "wires": [
             []
         ]
     },
     {
-        "id": "fff46357.6f3ad",
+        "id": "4c11cb80.4d3124",
         "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": 660.5715408325195,
-        "y": 800.5968675613403,
-        "z": "3deddfaf.57c2f",
+        "x": 666.5819473266602,
+        "y": 762.5968673229218,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "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": 625.5711822509766,
-        "y": 503.32480239868164,
-        "z": "3deddfaf.57c2f",
-        "wires": []
-    },
-    {
-        "id": "51ac74f.88fd58c",
+        "id": "b86791b.2510f7",
         "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": 2090.1429595947266,
-        "y": 366.1906089782715,
-        "z": "3deddfaf.57c2f",
+        "x": 2096.153366088867,
+        "y": 328.1906087398529,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "id": "df8e278a.898b28",
+        "id": "1d89ddb9.e37322",
         "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\" />",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"Created\" />\n<parameter name=\"in-maint\" value = \"true\" />\n<parameter name=\"vnf-type\" value='`$prop.vnfName`' />\n<parameter name=\"vnf-name\" value = \"`$prop.vnfName`\"/>\n<parameter name=\"model-invariant-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name=\"model-version-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`\"/>\n<parameter name=\"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 715.5458450317383,
-        "y": 910.2470846176147,
-        "z": "3deddfaf.57c2f",
+        "x": 721.5562515258789,
+        "y": 872.2470843791962,
+        "z": "dbd46c1f.195f5",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f579a3f.d15af4",
+        "id": "f26d49c8.d35f88",
         "type": "comment",
         "name": "TODO: change AAI models",
         "info": "",
         "comments": "",
-        "x": 649.1821060180664,
-        "y": 869.9743003845215,
-        "z": "3deddfaf.57c2f",
+        "x": 655.192512512207,
+        "y": 831.9743001461029,
+        "z": "dbd46c1f.195f5",
         "wires": []
     },
     {
-        "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",
+        "id": "d87f26c1.85e508",
+        "type": "execute",
+        "name": "execute split parameterName",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 693.0000152587891,
-        "y": 393.0000114440918,
-        "z": "3deddfaf.57c2f",
+        "x": 1081.75,
+        "y": 325.75,
+        "z": "dbd46c1f.195f5",
         "wires": [
-            [
-                "33ff6eed.504462",
-                "e2af6995.223f28",
-                "cc14ee3a.bceeb"
-            ]
+            []
         ]
     },
     {
-        "id": "33ff6eed.504462",
-        "type": "outcomeTrue",
-        "name": "SDWAN-vpn",
-        "xml": "<outcome value='SDWAN-vpn'>",
+        "id": "c94a6245.0a51b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 990.6667137145996,
-        "y": 378.0000114440918,
-        "z": "3deddfaf.57c2f",
+        "x": 885.4937973022461,
+        "y": 330.0018730163574,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "55868aa1.2254e4"
+                "d87f26c1.85e508",
+                "1354d63c.ef6932"
             ]
         ]
     },
     {
-        "id": "e2af6995.223f28",
-        "type": "outcomeTrue",
-        "name": "SDWAN-site",
-        "xml": "<outcome value='SDWAN-site'>",
+        "id": "8d6ea2db.f2c5d8",
+        "type": "for",
+        "name": "for loop idx - VNF input parameters",
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 983.6666870117188,
-        "y": 428,
-        "z": "3deddfaf.57c2f",
+        "x": 670.7154541015625,
+        "y": 332.4462890625,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "496e33ab.398b4c"
+                "c94a6245.0a51b"
             ]
         ]
     },
     {
-        "id": "cc14ee3a.bceeb",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "a6ce5913.ef9af",
+        "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": 627.715087890625,
+        "y": 402.77099609375,
+        "z": "dbd46c1f.195f5",
+        "wires": []
+    },
+    {
+        "id": "1354d63c.ef6932",
+        "type": "set",
+        "name": "set parameterName",
+        "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
+        "comments": "",
+        "x": 1058.75,
+        "y": 371.75,
+        "z": "dbd46c1f.195f5",
+        "wires": []
+    },
+    {
+        "id": "fb6b70fa.8a9a6",
+        "type": "for",
+        "name": "for each sdwan-get-request-input-param",
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 966.6666870117188,
-        "y": 478,
-        "z": "3deddfaf.57c2f",
+        "x": 683.75,
+        "y": 454.75,
+        "z": "dbd46c1f.195f5",
         "wires": [
             [
-                "c9a98bce.5a8c88"
+                "1b7219c7.3675ce"
             ]
         ]
     },
     {
-        "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",
+        "id": "1b7219c7.3675ce",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
-        "x": 1137.333366394043,
-        "y": 476.00001335144043,
-        "z": "3deddfaf.57c2f",
-        "wires": []
+        "outputs": 1,
+        "x": 909.982666015625,
+        "y": 453.09375,
+        "z": "dbd46c1f.195f5",
+        "wires": [
+            [
+                "9ce04d06.518268"
+            ]
+        ]
     },
     {
-        "id": "55868aa1.2254e4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "9ce04d06.518268",
+        "type": "switchNode",
+        "name": "switch vnf name",
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
+        "comments": "",
         "outputs": 1,
-        "x": 1172,
-        "y": 379,
-        "z": "3deddfaf.57c2f",
+        "x": 1066.482666015625,
+        "y": 451.09381103515625,
+        "z": "dbd46c1f.195f5",
         "wires": [
-            []
+            [
+                "61770f57.83d8c8"
+            ]
         ]
     },
     {
-        "id": "496e33ab.398b4c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "61770f57.83d8c8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
         "outputs": 1,
-        "x": 1163,
-        "y": 427,
-        "z": "3deddfaf.57c2f",
+        "x": 1227.4830322265625,
+        "y": 451.0938720703125,
+        "z": "dbd46c1f.195f5",
         "wires": [
-            []
+            [
+                "4601daba.0ca18c"
+            ]
         ]
+    },
+    {
+        "id": "4601daba.0ca18c",
+        "type": "set",
+        "name": "set vnf name",
+        "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 1385.483154296875,
+        "y": 449.69390869140625,
+        "z": "dbd46c1f.195f5",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
index 80df2aad..15bbecf7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
@@ -162,7 +162,9 @@
                         <parameter name='version' value='`$prop.device.version`' />
                         <parameter name='system-ip' value='`$prop.device.systemIp`' />
                         <parameter name='operational-status' value='Created' />
-                        <!--parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' /><parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' /><parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' /-->
+                        <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
+                        <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
+                        <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
                         <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />
                     </save>
                 </outcome>
@@ -181,7 +183,7 @@
                         <parameter name='operational-status' value='Created' />
                         <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
                         <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
-                        <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
+                        <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
                         <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />
                     </update>
                 </outcome>
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 d1578ec5..27f1c435 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`'>
@@ -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`' />
@@ -125,12 +125,12 @@
                 <parameter name='operational-status' value='Created' />
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
-                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
+                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />
             </save>
-            <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" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml
index e4bdd6f2..b88f3af5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml
@@ -114,7 +114,7 @@
                 <parameter name='operational-status' value='Created' />
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
-                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
+                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.site-vf-index + '/vf-module-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
index 360cb476..7d8950ad 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
@@ -112,7 +112,7 @@
                 <parameter name='operational-status' value='Created' />
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
-                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
+                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml
index f630eeee..a25f727e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml
@@ -121,7 +121,7 @@
                 <parameter name='operational-status' value='Created' />
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
-                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
+                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.wan-port-vf-index + '/vf-module-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
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 3e8b537b..4b288933 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,24 +29,32 @@
                     </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>
+            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">
+                <block>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                        <parameter name="original_string" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>
+                        <parameter name="regex" value="_"/>
+                        <parameter name="ctx_memory_result_key" value="param-prefix"/>
+                    </execute>
+                    <set>
+                        <parameter name="`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
+                    </set>
+                </block>
+            </for>
             <set>
                 <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />
             </set>
+            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">
+                <block>
+                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
             <set>
                 <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />
             </set>
@@ -73,21 +81,28 @@
                 <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" >
-                <parameter name="orchestration-status" value="create" />
-                <parameter name="vnf-type" value="some vnf-type" />
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="generic-vnf"   
+		key="generic-vnf.vnf-id = $prop.vnf-id" >
+                <parameter name="orchestration-status" value="Created" />
+                <parameter name="in-maint" value = "true" />
+                <parameter name="vnf-type" value='`$prop.vnfName`' />
+                <parameter name="vnf-name" value = "`$prop.vnfName`"/>
+                <parameter name="model-invariant-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`"/>
+                <parameter name="model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>
+                <parameter name="model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>
             </save>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                  key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
-                  force="true" pfx="tmp.AnAI-data">
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
+      key='service-instance.service-instance-id = $service-data.service-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" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-id`" />
+                <!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                <!--key='service-instance.service-instance-id = $service-data.service-instance-id -->
             </save>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
-- 
cgit 1.2.3-korg