From c10aa53a7b66854550ca7f7ec30ecbdd7a0c5334 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Sun, 21 Apr 2019 09:54:06 +0530
Subject: [PATCH] Fixed lan-port-config resource in AAI

Added vnf-index null check and Added lan-port-config
resource inplace of sdwan-vpn resource in AAI for
lan-port-create

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

Former-commit-id: 09c286f73a72a24f46ef09d5f2c5519eb79a05bd
---
 ...URCE-API_sdwan-vf-operation-lanport-create.json | 599 +++++++++++----------
 ...OURCE-API_sdwan-vf-operation-lanport-create.xml |  47 +-
 2 files changed, 351 insertions(+), 295 deletions(-)

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 b4f838d0..3ce166ee 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,533 +1,578 @@
 [
     {
-        "id": "3d343d97.916e12",
-        "type": "method",
-        "name": "sdwan-vf-operation-lanport-create",
-        "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 285,
-        "y": 241.99999237060547,
-        "z": "be7b9c9c.26b5d",
-        "wires": [
-            [
-                "72bd87e4.7210f8"
-            ]
-        ]
-    },
-    {
-        "id": "72bd87e4.7210f8",
+        "id": "3ecdadeb.18aa62",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 444.99999237060547,
-        "y": 374.9999885559082,
-        "z": "be7b9c9c.26b5d",
-        "wires": [
-            [
-                "fa08bbfd.f36978",
-                "662c5c91.bf14f4",
-                "3a8662b6.7187de",
-                "d0f313c6.a0ddd",
-                "87f25b72.4b1968",
-                "c96f1257.64bf8",
-                "9ca9880e.f474f8",
-                "23949443.ee4acc",
-                "64302671.d03c08",
-                "305a60f0.cd87a",
-                "17d1be09.26b4d2",
-                "8ab4415a.f464b",
-                "b65f8656.be0f98",
-                "8944476b.d5f828"
-            ]
-        ]
-    },
-    {
-        "id": "78ad706e.d12e1",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 286,
-        "y": 141.99999237060547,
-        "z": "be7b9c9c.26b5d",
-        "wires": [
-            [
-                "3d343d97.916e12"
-            ]
-        ]
-    },
-    {
-        "id": "7c5370ed.0ab17",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 115.5,
-        "y": 53,
-        "z": "be7b9c9c.26b5d",
+        "x": 432.00389862060547,
+        "y": 378.9999885559082,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "78ad706e.d12e1"
+                "b1de8da9.db8a2",
+                "d704787.9944088",
+                "c4e200e6.2e02b",
+                "5f812e79.2be7e",
+                "2b234f37.76666",
+                "7dbca450.42794c",
+                "7e93696e.840218",
+                "676ec3b1.844d3c",
+                "e3e05047.2e5b8",
+                "91a71daa.ef5c2",
+                "b3c3b183.55c72",
+                "d01634bb.bb46b8",
+                "43cde2b5.87e1ac",
+                "c6fbc47.00d1938",
+                "98c6c3b2.42b6b"
             ]
         ]
     },
     {
-        "id": "fa08bbfd.f36978",
+        "id": "b1de8da9.db8a2",
         "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": 791.2501525878906,
-        "y": 357.66665744781494,
-        "z": "be7b9c9c.26b5d",
+        "x": 778.2540588378906,
+        "y": 361.66665744781494,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "c93f649f.0099c8"
+                "d245ffbf.59c6c"
             ]
         ]
     },
     {
-        "id": "c93f649f.0099c8",
+        "id": "d245ffbf.59c6c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1006.0284957885742,
-        "y": 355.22224140167236,
-        "z": "be7b9c9c.26b5d",
+        "x": 993.0324020385742,
+        "y": 359.22224140167236,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "8f744d78.f7a31",
-                "7468dc64.d34424"
+                "82c635c3.382618",
+                "bcda53d8.f6893"
             ]
         ]
     },
     {
-        "id": "8f744d78.f7a31",
+        "id": "82c635c3.382618",
         "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": 1202.2846984863281,
-        "y": 332.97037982940674,
-        "z": "be7b9c9c.26b5d",
+        "x": 1189.2886047363281,
+        "y": 336.97037982940674,
+        "z": "dfb806d8.8899e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7468dc64.d34424",
+        "id": "bcda53d8.f6893",
         "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": 1171.7291259765625,
-        "y": 369.97049617767334,
-        "z": "be7b9c9c.26b5d",
+        "x": 1158.7330322265625,
+        "y": 373.97049617767334,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "143889df.349216",
+        "id": "ac17a6a.af45258",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 829.2503547668457,
-        "y": 314.3333249092102,
-        "z": "be7b9c9c.26b5d",
+        "x": 816.2542610168457,
+        "y": 318.3333249092102,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "3a8662b6.7187de",
+        "id": "c4e200e6.2e02b",
         "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": 770.186767578125,
-        "y": 516.1629304885864,
-        "z": "be7b9c9c.26b5d",
+        "x": 757.190673828125,
+        "y": 520.1629304885864,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "662c5c91.bf14f4",
+        "id": "d704787.9944088",
         "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": 770.1862945556641,
-        "y": 462.15421867370605,
-        "z": "be7b9c9c.26b5d",
+        "x": 764.1902618408203,
+        "y": 415.1541962623596,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "64302671.d03c08",
+        "id": "7e93696e.840218",
         "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.lan-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",
+        "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": 782.3531112670898,
-        "y": 624.3335423469543,
-        "z": "be7b9c9c.26b5d",
+        "x": 769.3570175170898,
+        "y": 628.3335423469543,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "23949443.ee4acc",
-        "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.lan-vf-index\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 794.6866760253906,
-        "y": 570.0002617835999,
-        "z": "be7b9c9c.26b5d",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "305a60f0.cd87a",
+        "id": "676ec3b1.844d3c",
         "type": "set",
         "name": "set vf-module-object-path",
-        "xml": "<set>\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": 770.500036239624,
-        "y": 675.8373885154724,
-        "z": "be7b9c9c.26b5d",
-        "wires": []
-    },
-    {
-        "id": "17d1be09.26b4d2",
-        "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`' />",
+        "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": 785.0000953674316,
-        "y": 725.837281703949,
-        "z": "be7b9c9c.26b5d",
+        "x": 757.503942489624,
+        "y": 679.8373885154724,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "8ab4415a.f464b",
+        "id": "e3e05047.2e5b8",
         "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.lan-vf-index' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vnf-index`\" />\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.site-vf-index + '/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-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 817.5000152587891,
-        "y": 766.3373422622681,
-        "z": "be7b9c9c.26b5d",
+        "x": 812.5039215087891,
+        "y": 772.3373708724976,
+        "z": "dfb806d8.8899e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b65f8656.be0f98",
+        "id": "91a71daa.ef5c2",
         "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.lan-vf-index`\" />\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.lan-vf-index`\" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[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": 785.4999313354492,
-        "y": 815.3373589515686,
-        "z": "be7b9c9c.26b5d",
+        "x": 772.5038375854492,
+        "y": 819.3373589515686,
+        "z": "dfb806d8.8899e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8944476b.d5f828",
+        "id": "b3c3b183.55c72",
         "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": 736.2224769592285,
-        "y": 862.5112180709839,
-        "z": "be7b9c9c.26b5d",
-        "wires": []
-    },
-    {
-        "id": "87f25b72.4b1968",
-        "type": "for",
-        "name": "for each vnf",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 729,
-        "y": 165.99999713897705,
-        "z": "be7b9c9c.26b5d",
-        "wires": [
-            [
-                "e80313cd.820e4"
-            ]
-        ]
-    },
-    {
-        "id": "e80313cd.820e4",
-        "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": 981.0000915527344,
-        "y": 164.6666603088379,
-        "z": "be7b9c9c.26b5d",
-        "wires": [
-            [
-                "b80badb7.d9753"
-            ]
-        ]
-    },
-    {
-        "id": "8bc04fc8.d6a11",
-        "type": "set",
-        "name": "set vnf-index",
-        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
-        "comments": "",
-        "x": 1352.6665802001953,
-        "y": 166.66666316986084,
-        "z": "be7b9c9c.26b5d",
+        "x": 723.2263832092285,
+        "y": 866.5112180709839,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "b80badb7.d9753",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1199.333408355713,
-        "y": 166.66664218902588,
-        "z": "be7b9c9c.26b5d",
-        "wires": [
-            [
-                "8bc04fc8.d6a11"
-            ]
-        ]
-    },
-    {
-        "id": "d0f313c6.a0ddd",
+        "id": "5f812e79.2be7e",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 743.4205932617188,
-        "y": 121.50386619567871,
-        "z": "be7b9c9c.26b5d",
+        "x": 733.424467086792,
+        "y": 68.5038731098175,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "7ab34e25.1cd4e"
+                "ecb5481e.49db98"
             ]
         ]
     },
     {
-        "id": "7ab34e25.1cd4e",
+        "id": "ecb5481e.49db98",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 930.087272644043,
-        "y": 120.8371639251709,
-        "z": "be7b9c9c.26b5d",
+        "x": 920.0911464691162,
+        "y": 67.83717083930969,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "984b3a64.7e1a38"
+                "5cc69be0.888194"
             ]
         ]
     },
     {
-        "id": "984b3a64.7e1a38",
+        "id": "5cc69be0.888194",
         "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": 1111.7538986206055,
-        "y": 120.8371639251709,
-        "z": "be7b9c9c.26b5d",
+        "x": 1101.7577724456787,
+        "y": 67.83717083930969,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "c96f1257.64bf8",
+        "id": "2b234f37.76666",
         "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": 784.6705827713013,
-        "y": 241.50386714935303,
-        "z": "be7b9c9c.26b5d",
+        "x": 771.6744890213013,
+        "y": 245.50386714935303,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "ab6c63f4.e55a6",
-                "14b85aee.617c65"
+                "43b76269.61638c",
+                "80f9fdd1.5acfa"
             ]
         ]
     },
     {
-        "id": "ab6c63f4.e55a6",
+        "id": "43b76269.61638c",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1015.6705932617188,
-        "y": 217.50386428833008,
-        "z": "be7b9c9c.26b5d",
+        "x": 1002.6744995117188,
+        "y": 221.50386428833008,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "342d6918.bdf256"
+                "30daa7e7.f7d908"
             ]
         ]
     },
     {
-        "id": "14b85aee.617c65",
+        "id": "80f9fdd1.5acfa",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1015.6705932617188,
-        "y": 257.5038642883301,
-        "z": "be7b9c9c.26b5d",
+        "x": 1002.6744995117188,
+        "y": 261.5038642883301,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "eedb45d.e2420b8"
+                "15ffa14c.a3471f"
             ]
         ]
     },
     {
-        "id": "342d6918.bdf256",
+        "id": "30daa7e7.f7d908",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1158.1705932617188,
-        "y": 217.50386428833008,
-        "z": "be7b9c9c.26b5d",
+        "x": 1145.1744995117188,
+        "y": 221.50386428833008,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "eedb45d.e2420b8",
+        "id": "15ffa14c.a3471f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1160.0276374816895,
-        "y": 257.4403762817383,
-        "z": "be7b9c9c.26b5d",
+        "x": 1147.0315437316895,
+        "y": 261.4403762817383,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "a00dcbbe.533a58",
-                "7019e496.422f8c"
+                "81c65311.3e7fa",
+                "1c59d473.dd26bc"
             ]
         ]
     },
     {
-        "id": "7019e496.422f8c",
+        "id": "1c59d473.dd26bc",
         "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": 1312.7261123657227,
-        "y": 227.05947497440502,
-        "z": "be7b9c9c.26b5d",
+        "x": 1299.7300186157227,
+        "y": 231.05947497440502,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "a00dcbbe.533a58",
+        "id": "81c65311.3e7fa",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1369.1546173095703,
-        "y": 280.2816047668457,
-        "z": "be7b9c9c.26b5d",
+        "x": 1356.1585235595703,
+        "y": 284.2816047668457,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "19e6409a.9c554f"
+                "aaf0ab5e.460008"
             ]
         ]
     },
     {
-        "id": "f530bc4a.54c5c",
+        "id": "85ce8231.1cc8f",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1592.805347442627,
-        "y": 238.53566217422485,
-        "z": "be7b9c9c.26b5d",
+        "x": 1579.809253692627,
+        "y": 242.53566217422485,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "19e6409a.9c554f",
+        "id": "aaf0ab5e.460008",
         "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": 1644.4403381347656,
-        "y": 279.8531074523926,
-        "z": "be7b9c9c.26b5d",
+        "x": 1631.4442443847656,
+        "y": 283.8531074523926,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "24af0b91.ce5344"
+                "1a7eae6b.66a2b2"
             ]
         ]
     },
     {
-        "id": "24af0b91.ce5344",
+        "id": "1a7eae6b.66a2b2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1545.1705360412598,
-        "y": 338.4245386123657,
-        "z": "be7b9c9c.26b5d",
+        "x": 1532.1744422912598,
+        "y": 342.4245386123657,
+        "z": "dfb806d8.8899e8",
         "wires": [
             [
-                "bf4e4104.4edb"
+                "40223de2.189ee4"
             ]
         ]
     },
     {
-        "id": "bf4e4104.4edb",
+        "id": "40223de2.189ee4",
         "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": 1692.920639038086,
-        "y": 338.28173068119213,
-        "z": "be7b9c9c.26b5d",
+        "x": 1679.924545288086,
+        "y": 342.28173068119213,
+        "z": "dfb806d8.8899e8",
         "wires": []
     },
     {
-        "id": "9ca9880e.f474f8",
+        "id": "7dbca450.42794c",
         "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": 804.0000152587891,
-        "y": 408.99999809265137,
-        "z": "be7b9c9c.26b5d",
+        "x": 803.0039367675781,
+        "y": 468.0000219345093,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d01634bb.bb46b8",
+        "type": "set",
+        "name": "set vf-module-level-oper-status",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
+        "comments": "",
+        "x": 774.00390625,
+        "y": 722.00390625,
+        "z": "dfb806d8.8899e8",
+        "wires": []
+    },
+    {
+        "id": "80c0749d.c5b758",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 101.00390625,
+        "y": 95.00390625,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            [
+                "1e8e9be2.f38a84"
+            ]
+        ]
+    },
+    {
+        "id": "1e8e9be2.f38a84",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 215.50390434265137,
+        "y": 202.00389766693115,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            [
+                "441193b5.7a563c"
+            ]
+        ]
+    },
+    {
+        "id": "441193b5.7a563c",
+        "type": "method",
+        "name": "sdwan-vf-operation-lanport-create",
+        "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 214.50390434265137,
+        "y": 302.00389766693115,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            [
+                "3ecdadeb.18aa62"
+            ]
+        ]
+    },
+    {
+        "id": "43cde2b5.87e1ac",
+        "type": "execute",
+        "name": "execute generate-vf-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 756.0039520263672,
+        "y": 576.5038995742798,
+        "z": "dfb806d8.8899e8",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "c6fbc47.00d1938",
+        "type": "for",
+        "name": "for each vnf",
+        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 723.0038871765137,
+        "y": 123.00390815734863,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            [
+                "a2640a51.5d0d78"
+            ]
+        ]
+    },
+    {
+        "id": "a2640a51.5d0d78",
+        "type": "switchNode",
+        "name": "switch this vnf-id == input vnf-id",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 974.0039825439453,
+        "y": 118.67052865028381,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            [
+                "d22976f8.730608"
+            ]
+        ]
+    },
+    {
+        "id": "d22976f8.730608",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1192.3372993469238,
+        "y": 120.6705105304718,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            [
+                "92022bc5.0cdcc8"
+            ]
+        ]
+    },
+    {
+        "id": "92022bc5.0cdcc8",
+        "type": "set",
+        "name": "set vnf-index",
+        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
+        "comments": "",
+        "x": 1345.6704711914062,
+        "y": 120.67053151130676,
+        "z": "dfb806d8.8899e8",
+        "wires": []
+    },
+    {
+        "id": "98c6c3b2.42b6b",
+        "type": "switchNode",
+        "name": "switch vnf-index",
+        "xml": "<switch test='`$vnf-index`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 737.00390625,
+        "y": 184.00390625,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            [
+                "681068c6.40fb78"
+            ]
+        ]
+    },
+    {
+        "id": "681068c6.40fb78",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 899.0039520263672,
+        "y": 183.00390529632568,
+        "z": "dfb806d8.8899e8",
+        "wires": [
+            [
+                "f9b4e412.cab938"
+            ]
+        ]
+    },
+    {
+        "id": "f9b4e412.cab938",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf id not found in service-data\" />\n",
+        "comments": "",
+        "x": 1048.2540435791016,
+        "y": 180.78178310394287,
+        "z": "dfb806d8.8899e8",
+        "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-lanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
index 607a19f6..d2538710 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
@@ -21,6 +21,15 @@
                     </outcome>
                 </switch>
             </for>
+            <switch test='`$vnf-index`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="vnf id not found in service-data" />
+                    </return>
+                </outcome>
+            </switch>
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
                 <outcome value=''>
                     <set>
@@ -58,28 +67,29 @@
                     </set>
                 </block>
             </for>
-            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>
             <set>
                 <parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />
             </set>
+            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>
             <set>
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                <parameter name="ctx-destination" value="prop.lan-vf-index"/>
+                <parameter name="ctx-destination" value="prop.vf-id"/>
             </execute>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.lan-vf-index`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />
+                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->
+                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->
             </set>
             <set>
+                <parameter name='vf-module-id' value='`$prop.vf-id`'/>
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $vf-module-topology-operation-input.service-information.service-instance-id
  + '/service-data/vnfs/vnf/'
@@ -104,27 +114,27 @@
                 <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.lan-vf-index' >
-                <parameter name="lan-port-config-id" value="`$prop.vnf-index`" />
-                <parameter name="device-id" value="`$prop.lan.deviceName`" />
-                <parameter name="port-switch" value="`$prop.lan.portSwitch`" />
-                <parameter name="port-type" value="`$prop.lan.portType`" />
-                <parameter name="port-number" value="`$prop.lan.portnumber`" />
-                <parameter name="ipv4-address" value="`$prop.lan.ipAddress`" />
-                <parameter name='vlan-tag' value="`$prop.lan.vlanId`" />
+      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`' />
+                <parameter name="port-type" value='`$prop.lan.portType`' />
+                <parameter name="port-number" value='`$prop.lan.portnumber`' />
+                <parameter name="ipv4-address" value='`$prop.lan.ipAddress`' />
+                <parameter name='vlan-tag' value='`$prop.lan.vlanId`' />
                 <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='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/'` " />
+                <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">
-                <parameter name="relationship-list.relationship[0].related-to" value="sdwan-vpn" />
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-vpns/sdwan-vpn/' + $prop.lan-vf-index`" />
+                <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" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.lan-vf-index`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vf-id`" />
             </save>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
@@ -133,4 +143,5 @@
             </return>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
+
-- 
2.16.6