From 8d222233a983e17284a6496ffd6e843b9c82bc5b Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Mon, 22 Apr 2019 09:00:38 +0530
Subject: [PATCH] Fixed SDWN lan-port-delete issue in AAI

modifed lan-port-delete DG by chnging AAI
resource name to lan-port-config

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

Former-commit-id: 13a1121e5c5dc07a372f7f88c191ad0b9037834e
---
 ...URCE-API_sdwan-vf-operation-lanport-delete.json | 514 +++++++++++----------
 ...OURCE-API_sdwan-vf-operation-lanport-delete.xml |  11 +-
 2 files changed, 289 insertions(+), 236 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json
index 012deec8..d66530dd 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json
@@ -1,22 +1,22 @@
 [
     {
-        "id": "a54d86da.b0b4c8",
+        "id": "5b377527.318dfc",
         "type": "method",
         "name": "method sdwan-vf-operation-lanport-delete",
         "xml": "<method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 234.00000762939453,
-        "y": 230.00012350082397,
-        "z": "1f04287d.306418",
+        "x": 289.00390625,
+        "y": 239.5863505601883,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "4d4d77e8.c38938"
+                "b6ef6d6.088219"
             ]
         ]
     },
     {
-        "id": "db831233.33e69",
+        "id": "5fa9c4d6.4ec86c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -24,663 +24,707 @@
         "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": 222.28571319580078,
-        "y": 130.65188121795654,
-        "z": "1f04287d.306418",
+        "x": 277.28961181640625,
+        "y": 140.23810827732086,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "a54d86da.b0b4c8"
+                "5b377527.318dfc"
             ]
         ]
     },
     {
-        "id": "62c65238.af2cac",
+        "id": "3e4efa76.6244b6",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 143.00000762939453,
-        "y": 68.4137716293335,
-        "z": "1f04287d.306418",
+        "x": 198.00390625,
+        "y": 77.99999868869781,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "db831233.33e69"
+                "5fa9c4d6.4ec86c"
             ]
         ]
     },
     {
-        "id": "4d4d77e8.c38938",
+        "id": "b6ef6d6.088219",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 250.66670989990234,
-        "y": 459.080491065979,
-        "z": "1f04287d.306418",
+        "x": 305.6706085205078,
+        "y": 468.6667181253433,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "26d66719.d43da8",
-                "e7e6cf90.f4145",
-                "2040df5d.c513d",
-                "58084a37.394334",
-                "8cf55d8b.9b86e",
-                "6f98bfc7.8211a",
-                "b57e1a43.a54548",
-                "9d1a9cea.dd56",
-                "49881624.abb0c8",
-                "c5683ab4.530598",
-                "d5b959e7.7e0cc8",
-                "d3e08866.ee2d18"
+                "71f387b9.003178",
+                "a6a43527.61a1e8",
+                "4d09affd.63ec7",
+                "158609f4.fc8936",
+                "7132f9a1.7bd008",
+                "379a2e2e.3a8382",
+                "6e5f86e6.881a38",
+                "13d12ad9.b40a25",
+                "50901066.93c6f",
+                "71b32013.3584b",
+                "c59a5d45.5b06a",
+                "4315ff0e.d57d4",
+                "cd89e451.16b298"
             ]
         ]
     },
     {
-        "id": "e7e6cf90.f4145",
+        "id": "a6a43527.61a1e8",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 566.0313720703125,
-        "y": 304.6829128265381,
-        "z": "1f04287d.306418",
+        "x": 640.0352554321289,
+        "y": 249.26914072036743,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "7275fe1.35167"
+                "5c4cd934.c95538"
             ]
         ]
     },
     {
-        "id": "26d66719.d43da8",
+        "id": "71f387b9.003178",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 571.0000267028809,
-        "y": 243.41378211975098,
-        "z": "1f04287d.306418",
+        "x": 645.0039100646973,
+        "y": 188.00001001358032,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "4f7f751d.4ffa8c"
+                "ec17d276.93fee"
             ]
         ]
     },
     {
-        "id": "4f7f751d.4ffa8c",
+        "id": "ec17d276.93fee",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 751.0000076293945,
-        "y": 242.4137716293335,
-        "z": "1f04287d.306418",
+        "x": 825.0038909912109,
+        "y": 186.99999952316284,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "b8464fa4.268c7"
+                "2a49b970.30fb16"
             ]
         ]
     },
     {
-        "id": "b8464fa4.268c7",
+        "id": "2a49b970.30fb16",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 900.4287338256836,
-        "y": 243.55668926239014,
-        "z": "1f04287d.306418",
+        "x": 974.4326171875,
+        "y": 188.14291715621948,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "7275fe1.35167",
+        "id": "5c4cd934.c95538",
         "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": 789.0000228881836,
-        "y": 305.41377782821655,
-        "z": "1f04287d.306418",
+        "x": 863.00390625,
+        "y": 250.0000057220459,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "2f21af21.529ff"
+                "2a4d20b9.66aac"
             ]
         ]
     },
     {
-        "id": "2f21af21.529ff",
+        "id": "2a4d20b9.66aac",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1004.0000076293945,
-        "y": 303.4137716293335,
-        "z": "1f04287d.306418",
+        "x": 1078.003890991211,
+        "y": 247.99999952316284,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "a1139d12.89e01"
+                "991cadde.a1c2"
             ]
         ]
     },
     {
-        "id": "a1139d12.89e01",
+        "id": "991cadde.a1c2",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1168.0000076293945,
-        "y": 298.4137716293335,
-        "z": "1f04287d.306418",
+        "x": 1242.003890991211,
+        "y": 242.99999952316284,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "2040df5d.c513d",
+        "id": "4d09affd.63ec7",
         "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": 637.0000419616699,
-        "y": 381.4137964248657,
-        "z": "1f04287d.306418",
+        "x": 692.0039405822754,
+        "y": 391.00002348423004,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "6da138cf.958678",
-                "2a607157.3c86fe",
-                "9b455cd1.ad8b9"
+                "7db8009f.80aa9",
+                "7fce8758.381048",
+                "58a4a3cc.ac1abc"
             ]
         ]
     },
     {
-        "id": "2a607157.3c86fe",
+        "id": "7fce8758.381048",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 859.0000343322754,
-        "y": 415.4138059616089,
-        "z": "1f04287d.306418",
+        "x": 914.0039329528809,
+        "y": 425.0000330209732,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "9e4075b3.63ff28"
+                "c31ea383.0d2c3"
             ]
         ]
     },
     {
-        "id": "6da138cf.958678",
+        "id": "7db8009f.80aa9",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 864.0000305175781,
-        "y": 362.41380500793457,
-        "z": "1f04287d.306418",
+        "x": 919.0039291381836,
+        "y": 372.0000320672989,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "9e4075b3.63ff28"
+                "c31ea383.0d2c3"
             ]
         ]
     },
     {
-        "id": "9e4075b3.63ff28",
+        "id": "c31ea383.0d2c3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1022.0000343322754,
-        "y": 375.4138059616089,
-        "z": "1f04287d.306418",
+        "x": 1077.0039329528809,
+        "y": 385.0000330209732,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "9b455cd1.ad8b9",
+        "id": "58a4a3cc.ac1abc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 859.0000343322754,
-        "y": 476.4138059616089,
-        "z": "1f04287d.306418",
+        "x": 914.0039329528809,
+        "y": 486.0000330209732,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "76d683a5.eebfec"
+                "d3465076.36c57"
             ]
         ]
     },
     {
-        "id": "3f214675.09ba1a",
+        "id": "b0e78257.0ab82",
         "type": "set",
         "name": "set vf-module_length",
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
         "comments": "",
-        "x": 1213.0000495910645,
-        "y": 474.41381990909576,
-        "z": "1f04287d.306418",
+        "x": 1268.00394821167,
+        "y": 484.0000469684601,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "76d683a5.eebfec",
+        "id": "d3465076.36c57",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1020.0000801086426,
-        "y": 473.41379737854004,
-        "z": "1f04287d.306418",
+        "x": 1075.003978729248,
+        "y": 483.00002443790436,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "3f214675.09ba1a",
-                "42fcda16.d37964"
+                "b0e78257.0ab82",
+                "d9692dd.614b9d"
             ]
         ]
     },
     {
-        "id": "42fcda16.d37964",
+        "id": "d9692dd.614b9d",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1232.0000190734863,
-        "y": 527.4137964248657,
-        "z": "1f04287d.306418",
+        "x": 1287.0039176940918,
+        "y": 537.00002348423,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "9de7c553.fd25f8"
+                "45a4bb37.a28924"
             ]
         ]
     },
     {
-        "id": "9de7c553.fd25f8",
+        "id": "45a4bb37.a28924",
         "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": 1503.0000381469727,
-        "y": 528.4138336181641,
-        "z": "1f04287d.306418",
+        "x": 1558.0039367675781,
+        "y": 538.0000606775284,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "f61f0e52.12de6"
+                "a0aa45d1.8fe618"
             ]
         ]
     },
     {
-        "id": "f61f0e52.12de6",
+        "id": "a0aa45d1.8fe618",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1716.0001621246338,
-        "y": 515.4138031005859,
-        "z": "1f04287d.306418",
+        "x": 1771.0040607452393,
+        "y": 525.0000301599503,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "cf9e9748.fd3478"
+                "e8f5881c.0d1318"
             ]
         ]
     },
     {
-        "id": "cf9e9748.fd3478",
+        "id": "e8f5881c.0d1318",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1868.0001335144043,
-        "y": 517.4137964248657,
-        "z": "1f04287d.306418",
+        "x": 1923.0040321350098,
+        "y": 527.00002348423,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "1f23fa4e.25db46",
-                "5446fb0a.a3b5a4",
-                "71d1f1bd.544fb"
+                "f7c8637f.374ce",
+                "c9be57ad.3da878",
+                "26312e31.67daa2"
             ]
         ]
     },
     {
-        "id": "1f23fa4e.25db46",
+        "id": "f7c8637f.374ce",
         "type": "set",
         "name": "set tmp.vidx and ctx.vnf-data",
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
         "comments": "",
-        "x": 2090.0001335144043,
-        "y": 513.4137964248657,
-        "z": "1f04287d.306418",
+        "x": 2145.0040321350098,
+        "y": 523.00002348423,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "5446fb0a.a3b5a4",
+        "id": "c9be57ad.3da878",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
         "comments": "",
-        "x": 2096.0001335144043,
-        "y": 562.4137964248657,
-        "z": "1f04287d.306418",
+        "x": 2151.0040321350098,
+        "y": 572.00002348423,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "71d1f1bd.544fb",
+        "id": "26312e31.67daa2",
         "type": "call",
         "name": "call sdwan-get-vf-module-lan-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2124.0003547668457,
-        "y": 610.4138021469116,
-        "z": "1f04287d.306418",
+        "x": 2179.004253387451,
+        "y": 620.0000292062759,
+        "z": "6e499246.1345bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "58084a37.394334",
+        "id": "158609f4.fc8936",
         "type": "switchNode",
         "name": "switch tmp.vidx ",
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 576.0312538146973,
-        "y": 554.4298791885376,
-        "z": "1f04287d.306418",
+        "x": 631.0351524353027,
+        "y": 564.0161062479019,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "a8fd4f02.a0c39"
+                "cbb03bf0.425b98"
             ]
         ]
     },
     {
-        "id": "a8fd4f02.a0c39",
+        "id": "cbb03bf0.425b98",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 723.4598960876465,
-        "y": 554.0012893676758,
-        "z": "1f04287d.306418",
+        "x": 778.463794708252,
+        "y": 563.5875164270401,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "e19c0822.f14e78"
+                "6af4136a.19a86c"
             ]
         ]
     },
     {
-        "id": "e19c0822.f14e78",
+        "id": "6af4136a.19a86c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 872.8886222839355,
-        "y": 555.1442070007324,
-        "z": "1f04287d.306418",
+        "x": 927.892520904541,
+        "y": 564.7304340600967,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "8cf55d8b.9b86e",
+        "id": "7132f9a1.7bd008",
         "type": "switchNode",
         "name": "switch vf-module-oper-status",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 620.3294143676758,
-        "y": 624.7470846176147,
-        "z": "1f04287d.306418",
+        "x": 675.3333129882812,
+        "y": 634.3333116769791,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "56dc0c78.140284",
-                "7bad1343.8cb25c"
+                "32ea7a53.265046",
+                "d6d3b52a.3f5ab8"
             ]
         ]
     },
     {
-        "id": "56dc0c78.140284",
+        "id": "32ea7a53.265046",
         "type": "outcome",
         "name": "outcome PendingDelete",
         "xml": "<outcome value='PendingDelete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 911.1626815795898,
-        "y": 628.8582077026367,
-        "z": "1f04287d.306418",
+        "x": 966.1665802001953,
+        "y": 638.444434762001,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "27edf28.129770e"
+                "6b31ad53.5727b4"
             ]
         ]
     },
     {
-        "id": "7bad1343.8cb25c",
+        "id": "d6d3b52a.3f5ab8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 878.1628189086914,
-        "y": 680.8582603931427,
-        "z": "1f04287d.306418",
+        "x": 933.1667175292969,
+        "y": 690.444487452507,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "ea590f8e.65b32"
+                "148355e2.614e0a"
             ]
         ]
     },
     {
-        "id": "ea590f8e.65b32",
+        "id": "148355e2.614e0a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
         "comments": "",
-        "x": 1037.6625862121582,
-        "y": 683.8582594394684,
-        "z": "1f04287d.306418",
+        "x": 1092.6664848327637,
+        "y": 693.4444864988327,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "27edf28.129770e",
+        "id": "6b31ad53.5727b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1108.469081878662,
-        "y": 639.1833620071411,
-        "z": "1f04287d.306418",
+        "x": 1163.4729804992676,
+        "y": 648.7695890665054,
+        "z": "6e499246.1345bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "9d1a9cea.dd56",
+        "id": "13d12ad9.b40a25",
         "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": 591.4406318664551,
-        "y": 1071.635935306549,
-        "z": "1f04287d.306418",
+        "x": 646.4445304870605,
+        "y": 1081.2221623659134,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "c5683ab4.530598",
+        "id": "71b32013.3584b",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
         "comments": "",
-        "x": 598.5272789001465,
-        "y": 695.7472534179688,
-        "z": "1f04287d.306418",
+        "x": 653.531177520752,
+        "y": 705.3334804773331,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "49881624.abb0c8",
+        "id": "50901066.93c6f",
         "type": "for",
         "name": "for lidx..service-data.vf-modules.vf-module[]",
         "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 674.5271987915039,
-        "y": 749.7471284866333,
-        "z": "1f04287d.306418",
+        "x": 729.5310974121094,
+        "y": 759.3333555459976,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "3538a71e.fcff88"
+                "18389e8.0583e62"
             ]
         ]
     },
     {
-        "id": "6f98bfc7.8211a",
+        "id": "379a2e2e.3a8382",
         "type": "set",
         "name": "set new vnf length",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
         "comments": "",
-        "x": 598.6285705566406,
-        "y": 802.5513463020325,
-        "z": "1f04287d.306418",
+        "x": 653.6324691772461,
+        "y": 812.1375733613968,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "d5b959e7.7e0cc8",
+        "id": "c59a5d45.5b06a",
         "type": "set",
         "name": "Remove vnf from ServiceData",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",
         "comments": "",
-        "x": 639.5272369384766,
-        "y": 849.7472591400146,
-        "z": "1f04287d.306418",
+        "x": 694.531135559082,
+        "y": 859.333486199379,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "3538a71e.fcff88",
+        "id": "18389e8.0583e62",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 934.5271892547607,
-        "y": 756.7469882965088,
-        "z": "1f04287d.306418",
+        "x": 989.5310878753662,
+        "y": 766.3332153558731,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "10631fee.66247"
+                "a366647e.22aaf8"
             ]
         ]
     },
     {
-        "id": "d3e08866.ee2d18",
+        "id": "4315ff0e.d57d4",
         "type": "delete",
         "name": "delete lanport vf instance configuration in AAI",
-        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='lan-port-config' \n        key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='lan-port-config' \n        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 673.5276069641113,
-        "y": 1019.008641242981,
-        "z": "1f04287d.306418",
+        "x": 728.5315055847168,
+        "y": 1028.5948683023453,
+        "z": "6e499246.1345bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "10631fee.66247",
+        "id": "a366647e.22aaf8",
         "type": "switchNode",
         "name": "switch vnf-id found",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.vf-module-information.vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1120.527256011963,
-        "y": 756.7471489906311,
-        "z": "1f04287d.306418",
+        "x": 1175.5311546325684,
+        "y": 766.3333760499954,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "5f2f4339.fa3b9c"
+                "c7c20dda.52c1b"
             ]
         ]
     },
     {
-        "id": "5f2f4339.fa3b9c",
+        "id": "c7c20dda.52c1b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1289.5272636413574,
-        "y": 755.7469863891602,
-        "z": "1f04287d.306418",
+        "x": 1344.531162261963,
+        "y": 765.3332134485245,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "282bbccf.a76394"
+                "72fa222d.49f9ac"
             ]
         ]
     },
     {
-        "id": "282bbccf.a76394",
+        "id": "72fa222d.49f9ac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1443.527102470398,
-        "y": 747.7469873428345,
-        "z": "1f04287d.306418",
+        "x": 1498.5310010910034,
+        "y": 757.3332144021988,
+        "z": "6e499246.1345bc",
         "wires": [
             [
-                "15dd9ec6.9cd7d1",
-                "810eaf7a.70186"
+                "ed2c94b0.3c96e8",
+                "f18820dc.cc2b"
             ]
         ]
     },
     {
-        "id": "15dd9ec6.9cd7d1",
+        "id": "ed2c94b0.3c96e8",
         "type": "set",
         "name": "set  vnf data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\n",
         "comments": "",
-        "x": 1608.5271978378296,
-        "y": 722.747142791748,
-        "z": "1f04287d.306418",
+        "x": 1663.531096458435,
+        "y": 732.3333698511124,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "810eaf7a.70186",
+        "id": "f18820dc.cc2b",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
         "comments": "",
-        "x": 1630.5271978378296,
-        "y": 778.747106552124,
-        "z": "1f04287d.306418",
+        "x": 1685.531096458435,
+        "y": 788.3333336114883,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "b57e1a43.a54548",
+        "id": "6e5f86e6.881a38",
         "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": 615.3294677734375,
-        "y": 966.0804300308228,
-        "z": "1f04287d.306418",
+        "x": 670.333366394043,
+        "y": 975.6666570901871,
+        "z": "6e499246.1345bc",
         "wires": []
     },
     {
-        "id": "eeeb55b5.4909d8",
+        "id": "8ba40e29.5c2bb",
         "type": "set",
         "name": "Remove vnf from ServiceData",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].\" value=\"\"/>\n",
         "comments": "",
-        "x": 629.3333129882812,
-        "y": 900,
-        "z": "1f04287d.306418",
+        "x": 684.3372116088867,
+        "y": 909.5862270593643,
+        "z": "6e499246.1345bc",
+        "wires": []
+    },
+    {
+        "id": "cd89e451.16b298",
+        "type": "switchNode",
+        "name": "switch vnf-index",
+        "xml": "<switch test='`$vnf-index`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 649.00390625,
+        "y": 314.00390625,
+        "z": "6e499246.1345bc",
+        "wires": [
+            [
+                "ccd2db16.3151b8"
+            ]
+        ]
+    },
+    {
+        "id": "ccd2db16.3151b8",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 811.0039520263672,
+        "y": 313.0039052963257,
+        "z": "6e499246.1345bc",
+        "wires": [
+            [
+                "2eb95e60.9609a2"
+            ]
+        ]
+    },
+    {
+        "id": "2eb95e60.9609a2",
+        "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": 960.2540435791016,
+        "y": 310.78178310394287,
+        "z": "6e499246.1345bc",
         "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-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml
index 5fb67357..30df6e08 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.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='0'>
                     <return status='failure'>
@@ -127,7 +136,7 @@
  + '/service-data/service-topology/'`"/>
             </set>
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config' 
-        key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
+        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
-- 
2.16.6