From c8d61b4922210957feee91471e5d2fc2578df238 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Mon, 6 May 2019 10:53:14 +0530
Subject: [PATCH] Fix SDWAN lan-port-delete DG by passing valid index

SDWAN lan-port-config-delete DG, vf-module-id is passed
with correct vnf-index.

Change-Id: I23e4cb60fcf8c6db5c383fbaf63ddc9123f3210a
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
(cherry picked from commit c4a473250721d08c9eef5170800efa2932bee15c)
---
 ...URCE-API_sdwan-vf-operation-lanport-delete.json | 502 ++++++++++-----------
 ...OURCE-API_sdwan-vf-operation-lanport-delete.xml |  18 +-
 2 files changed, 260 insertions(+), 260 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 d66530dd..74c64fd7 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": "5b377527.318dfc",
+        "id": "ec163be6.3f3848",
         "type": "method",
         "name": "method sdwan-vf-operation-lanport-delete",
         "xml": "<method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 289.00390625,
-        "y": 239.5863505601883,
-        "z": "6e499246.1345bc",
+        "x": 257,
+        "y": 184.58635187149048,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "b6ef6d6.088219"
+                "4793fbaf.4f8194"
             ]
         ]
     },
     {
-        "id": "5fa9c4d6.4ec86c",
+        "id": "1bec69d8.54d756",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -24,707 +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": 277.28961181640625,
-        "y": 140.23810827732086,
-        "z": "6e499246.1345bc",
+        "x": 245.28570556640625,
+        "y": 85.23810958862305,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "5b377527.318dfc"
+                "ec163be6.3f3848"
             ]
         ]
     },
     {
-        "id": "3e4efa76.6244b6",
+        "id": "8b3450fa.11be1",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 198.00390625,
-        "y": 77.99999868869781,
-        "z": "6e499246.1345bc",
+        "x": 166,
+        "y": 23,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "5fa9c4d6.4ec86c"
+                "1bec69d8.54d756"
             ]
         ]
     },
     {
-        "id": "b6ef6d6.088219",
+        "id": "4793fbaf.4f8194",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 305.6706085205078,
-        "y": 468.6667181253433,
-        "z": "6e499246.1345bc",
+        "x": 273.6667022705078,
+        "y": 413.6667194366455,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "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"
+                "9dfafdb.c466",
+                "a32b04df.766888",
+                "1b926ba7.620a94",
+                "d56abb49.55c298",
+                "dcdd31d0.479e7",
+                "fb17bb23.b22de8",
+                "4443f52d.bb0e4c",
+                "3673a6e1.e30cca",
+                "2bcb08d.42550f8",
+                "48c6ddd.4092a24",
+                "96d011a.ebe42f",
+                "279f2432.3dd51c",
+                "9d4a1934.79a7a8"
             ]
         ]
     },
     {
-        "id": "a6a43527.61a1e8",
+        "id": "a32b04df.766888",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 640.0352554321289,
-        "y": 249.26914072036743,
-        "z": "6e499246.1345bc",
+        "x": 608.0313491821289,
+        "y": 194.26914203166962,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "5c4cd934.c95538"
+                "f4a89702.3708f8"
             ]
         ]
     },
     {
-        "id": "71f387b9.003178",
+        "id": "9dfafdb.c466",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 645.0039100646973,
-        "y": 188.00001001358032,
-        "z": "6e499246.1345bc",
+        "x": 613.0000038146973,
+        "y": 133.0000113248825,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "ec17d276.93fee"
+                "58b9bfe5.41c97"
             ]
         ]
     },
     {
-        "id": "ec17d276.93fee",
+        "id": "58b9bfe5.41c97",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 825.0038909912109,
-        "y": 186.99999952316284,
-        "z": "6e499246.1345bc",
+        "x": 792.9999847412109,
+        "y": 132.00000083446503,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "2a49b970.30fb16"
+                "2d04caf9.98dff6"
             ]
         ]
     },
     {
-        "id": "2a49b970.30fb16",
+        "id": "2d04caf9.98dff6",
         "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": 974.4326171875,
-        "y": 188.14291715621948,
-        "z": "6e499246.1345bc",
+        "x": 942.4287109375,
+        "y": 133.14291846752167,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "5c4cd934.c95538",
+        "id": "f4a89702.3708f8",
         "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": 863.00390625,
-        "y": 250.0000057220459,
-        "z": "6e499246.1345bc",
+        "x": 831,
+        "y": 195.00000703334808,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "2a4d20b9.66aac"
+                "4ee74d2f.481124"
             ]
         ]
     },
     {
-        "id": "2a4d20b9.66aac",
+        "id": "4ee74d2f.481124",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1078.003890991211,
-        "y": 247.99999952316284,
-        "z": "6e499246.1345bc",
+        "x": 1045.999984741211,
+        "y": 193.00000083446503,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "991cadde.a1c2"
+                "864b8c78.81cb3"
             ]
         ]
     },
     {
-        "id": "991cadde.a1c2",
+        "id": "864b8c78.81cb3",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1242.003890991211,
-        "y": 242.99999952316284,
-        "z": "6e499246.1345bc",
+        "x": 1209.999984741211,
+        "y": 188.00000083446503,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "4d09affd.63ec7",
+        "id": "1b926ba7.620a94",
         "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": 692.0039405822754,
-        "y": 391.00002348423004,
-        "z": "6e499246.1345bc",
+        "x": 660.0000343322754,
+        "y": 336.0000247955322,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "7db8009f.80aa9",
-                "7fce8758.381048",
-                "58a4a3cc.ac1abc"
+                "f160fe58.60ceb",
+                "c6dbecb6.3daf1",
+                "78728405.050dbc"
             ]
         ]
     },
     {
-        "id": "7fce8758.381048",
+        "id": "c6dbecb6.3daf1",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 914.0039329528809,
-        "y": 425.0000330209732,
-        "z": "6e499246.1345bc",
+        "x": 882.0000267028809,
+        "y": 370.0000343322754,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "c31ea383.0d2c3"
+                "8b2c8779.a3f058"
             ]
         ]
     },
     {
-        "id": "7db8009f.80aa9",
+        "id": "f160fe58.60ceb",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 919.0039291381836,
-        "y": 372.0000320672989,
-        "z": "6e499246.1345bc",
+        "x": 887.0000228881836,
+        "y": 317.0000333786011,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "c31ea383.0d2c3"
+                "8b2c8779.a3f058"
             ]
         ]
     },
     {
-        "id": "c31ea383.0d2c3",
+        "id": "8b2c8779.a3f058",
         "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": 1077.0039329528809,
-        "y": 385.0000330209732,
-        "z": "6e499246.1345bc",
+        "x": 1045.0000267028809,
+        "y": 330.0000343322754,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "58a4a3cc.ac1abc",
+        "id": "78728405.050dbc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 914.0039329528809,
-        "y": 486.0000330209732,
-        "z": "6e499246.1345bc",
+        "x": 882.0000267028809,
+        "y": 431.0000343322754,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "d3465076.36c57"
+                "3894cc60.de2194"
             ]
         ]
     },
     {
-        "id": "b0e78257.0ab82",
+        "id": "70ed1707.f5ee78",
         "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": 1268.00394821167,
-        "y": 484.0000469684601,
-        "z": "6e499246.1345bc",
+        "x": 1236.00004196167,
+        "y": 429.00004827976227,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "d3465076.36c57",
+        "id": "3894cc60.de2194",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1075.003978729248,
-        "y": 483.00002443790436,
-        "z": "6e499246.1345bc",
+        "x": 1043.000072479248,
+        "y": 428.00002574920654,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "b0e78257.0ab82",
-                "d9692dd.614b9d"
+                "70ed1707.f5ee78",
+                "ec070549.11ed28"
             ]
         ]
     },
     {
-        "id": "d9692dd.614b9d",
+        "id": "ec070549.11ed28",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1287.0039176940918,
-        "y": 537.00002348423,
-        "z": "6e499246.1345bc",
+        "x": 1255.0000114440918,
+        "y": 482.0000247955322,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "45a4bb37.a28924"
+                "fcb13450.487cd8"
             ]
         ]
     },
     {
-        "id": "45a4bb37.a28924",
+        "id": "fcb13450.487cd8",
         "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": 1558.0039367675781,
-        "y": 538.0000606775284,
-        "z": "6e499246.1345bc",
+        "x": 1526.0000305175781,
+        "y": 483.00006198883057,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "a0aa45d1.8fe618"
+                "f167edc3.b2418"
             ]
         ]
     },
     {
-        "id": "a0aa45d1.8fe618",
+        "id": "f167edc3.b2418",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1771.0040607452393,
-        "y": 525.0000301599503,
-        "z": "6e499246.1345bc",
+        "x": 1739.0001544952393,
+        "y": 470.00003147125244,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "e8f5881c.0d1318"
+                "3335b07e.93a8c"
             ]
         ]
     },
     {
-        "id": "e8f5881c.0d1318",
+        "id": "3335b07e.93a8c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1923.0040321350098,
-        "y": 527.00002348423,
-        "z": "6e499246.1345bc",
+        "x": 1891.0001258850098,
+        "y": 472.0000247955322,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "f7c8637f.374ce",
-                "c9be57ad.3da878",
-                "26312e31.67daa2"
+                "3d815800.695568",
+                "da733ba9.b543b8",
+                "ab8c2e99.50d5d"
             ]
         ]
     },
     {
-        "id": "f7c8637f.374ce",
+        "id": "3d815800.695568",
         "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": 2145.0040321350098,
-        "y": 523.00002348423,
-        "z": "6e499246.1345bc",
+        "x": 2113.0001258850098,
+        "y": 468.0000247955322,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "c9be57ad.3da878",
+        "id": "da733ba9.b543b8",
         "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": 2151.0040321350098,
-        "y": 572.00002348423,
-        "z": "6e499246.1345bc",
+        "x": 2119.0001258850098,
+        "y": 517.0000247955322,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "26312e31.67daa2",
+        "id": "ab8c2e99.50d5d",
         "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",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2179.004253387451,
-        "y": 620.0000292062759,
-        "z": "6e499246.1345bc",
+        "x": 2147.000347137451,
+        "y": 565.0000305175781,
+        "z": "1c424bc5.8e5824",
         "wires": [
             []
         ]
     },
     {
-        "id": "158609f4.fc8936",
+        "id": "d56abb49.55c298",
         "type": "switchNode",
         "name": "switch tmp.vidx ",
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 631.0351524353027,
-        "y": 564.0161062479019,
-        "z": "6e499246.1345bc",
+        "x": 599.0312461853027,
+        "y": 509.0161075592041,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "cbb03bf0.425b98"
+                "a2f7bc45.7d854"
             ]
         ]
     },
     {
-        "id": "cbb03bf0.425b98",
+        "id": "a2f7bc45.7d854",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 778.463794708252,
-        "y": 563.5875164270401,
-        "z": "6e499246.1345bc",
+        "x": 746.459888458252,
+        "y": 508.5875177383423,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "6af4136a.19a86c"
+                "a5b6de1f.319b7"
             ]
         ]
     },
     {
-        "id": "6af4136a.19a86c",
+        "id": "a5b6de1f.319b7",
         "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": 927.892520904541,
-        "y": 564.7304340600967,
-        "z": "6e499246.1345bc",
+        "x": 895.888614654541,
+        "y": 509.7304353713989,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "7132f9a1.7bd008",
+        "id": "9d4a1934.79a7a8",
         "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": 675.3333129882812,
-        "y": 634.3333116769791,
-        "z": "6e499246.1345bc",
+        "x": 643.3294067382812,
+        "y": 579.3333129882812,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "32ea7a53.265046",
-                "d6d3b52a.3f5ab8"
+                "88c55560.ea56c8",
+                "5f573696.518908"
             ]
         ]
     },
     {
-        "id": "32ea7a53.265046",
+        "id": "88c55560.ea56c8",
         "type": "outcome",
         "name": "outcome PendingDelete",
         "xml": "<outcome value='PendingDelete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 966.1665802001953,
-        "y": 638.444434762001,
-        "z": "6e499246.1345bc",
+        "x": 930.1627044677734,
+        "y": 562.4444751739502,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "6b31ad53.5727b4"
+                "ddef1b.d5ace0e8"
             ]
         ]
     },
     {
-        "id": "d6d3b52a.3f5ab8",
+        "id": "5f573696.518908",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 933.1667175292969,
-        "y": 690.444487452507,
-        "z": "6e499246.1345bc",
+        "x": 914.1628684997559,
+        "y": 608.4445171356201,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "148355e2.614e0a"
+                "d2e1da0b.14c268"
             ]
         ]
     },
     {
-        "id": "148355e2.614e0a",
+        "id": "d2e1da0b.14c268",
         "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": 1092.6664848327637,
-        "y": 693.4444864988327,
-        "z": "6e499246.1345bc",
+        "x": 1131.6626281738281,
+        "y": 607.4444761276245,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "6b31ad53.5727b4",
+        "id": "ddef1b.d5ace0e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1163.4729804992676,
-        "y": 648.7695890665054,
-        "z": "6e499246.1345bc",
+        "x": 1144.4691066741943,
+        "y": 560.7696704864502,
+        "z": "1c424bc5.8e5824",
         "wires": [
             []
         ]
     },
     {
-        "id": "13d12ad9.b40a25",
+        "id": "4443f52d.bb0e4c",
         "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": 646.4445304870605,
-        "y": 1081.2221623659134,
-        "z": "6e499246.1345bc",
+        "x": 614.4406242370605,
+        "y": 1026.2221636772156,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "71b32013.3584b",
+        "id": "2bcb08d.42550f8",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
         "comments": "",
-        "x": 653.531177520752,
-        "y": 705.3334804773331,
-        "z": "6e499246.1345bc",
+        "x": 621.527271270752,
+        "y": 650.3334817886353,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "50901066.93c6f",
+        "id": "3673a6e1.e30cca",
         "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": 729.5310974121094,
-        "y": 759.3333555459976,
-        "z": "6e499246.1345bc",
+        "x": 697.5271911621094,
+        "y": 704.3333568572998,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "18389e8.0583e62"
+                "811b86b3.145198"
             ]
         ]
     },
     {
-        "id": "379a2e2e.3a8382",
+        "id": "dcdd31d0.479e7",
         "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": 653.6324691772461,
-        "y": 812.1375733613968,
-        "z": "6e499246.1345bc",
+        "x": 621.6285629272461,
+        "y": 757.137574672699,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "c59a5d45.5b06a",
+        "id": "48c6ddd.4092a24",
         "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": 694.531135559082,
-        "y": 859.333486199379,
-        "z": "6e499246.1345bc",
+        "x": 662.527229309082,
+        "y": 804.3334875106812,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "18389e8.0583e62",
+        "id": "811b86b3.145198",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 989.5310878753662,
-        "y": 766.3332153558731,
-        "z": "6e499246.1345bc",
+        "x": 957.5271816253662,
+        "y": 711.3332166671753,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "a366647e.22aaf8"
+                "1e6e592d.12c717"
             ]
         ]
     },
     {
-        "id": "4315ff0e.d57d4",
+        "id": "96d011a.ebe42f",
         "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='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 728.5315055847168,
-        "y": 1028.5948683023453,
-        "z": "6e499246.1345bc",
+        "x": 696.5275993347168,
+        "y": 973.5948696136475,
+        "z": "1c424bc5.8e5824",
         "wires": [
             []
         ]
     },
     {
-        "id": "a366647e.22aaf8",
+        "id": "1e6e592d.12c717",
         "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": 1175.5311546325684,
-        "y": 766.3333760499954,
-        "z": "6e499246.1345bc",
+        "x": 1143.5272483825684,
+        "y": 711.3333773612976,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "c7c20dda.52c1b"
+                "33904649.f29baa"
             ]
         ]
     },
     {
-        "id": "c7c20dda.52c1b",
+        "id": "33904649.f29baa",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1344.531162261963,
-        "y": 765.3332134485245,
-        "z": "6e499246.1345bc",
+        "x": 1312.527256011963,
+        "y": 710.3332147598267,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "72fa222d.49f9ac"
+                "feb2eba6.9b1178"
             ]
         ]
     },
     {
-        "id": "72fa222d.49f9ac",
+        "id": "feb2eba6.9b1178",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1498.5310010910034,
-        "y": 757.3332144021988,
-        "z": "6e499246.1345bc",
+        "x": 1466.5270948410034,
+        "y": 702.333215713501,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "ed2c94b0.3c96e8",
-                "f18820dc.cc2b"
+                "1c71b1a3.8a840e",
+                "76b09d29.70bbf4"
             ]
         ]
     },
     {
-        "id": "ed2c94b0.3c96e8",
+        "id": "1c71b1a3.8a840e",
         "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",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-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].vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.`' />\n",
         "comments": "",
-        "x": 1663.531096458435,
-        "y": 732.3333698511124,
-        "z": "6e499246.1345bc",
+        "x": 1631.527190208435,
+        "y": 677.3333711624146,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "f18820dc.cc2b",
+        "id": "76b09d29.70bbf4",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
         "comments": "",
-        "x": 1685.531096458435,
-        "y": 788.3333336114883,
-        "z": "6e499246.1345bc",
+        "x": 1653.527190208435,
+        "y": 733.3333349227905,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "6e5f86e6.881a38",
+        "id": "fb17bb23.b22de8",
         "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": 670.333366394043,
-        "y": 975.6666570901871,
-        "z": "6e499246.1345bc",
+        "x": 638.329460144043,
+        "y": 920.6666584014893,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "8ba40e29.5c2bb",
+        "id": "c43a3a93.767aa8",
         "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": 684.3372116088867,
-        "y": 909.5862270593643,
-        "z": "6e499246.1345bc",
+        "x": 652.3333053588867,
+        "y": 854.5862283706665,
+        "z": "1c424bc5.8e5824",
         "wires": []
     },
     {
-        "id": "cd89e451.16b298",
+        "id": "279f2432.3dd51c",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.00390625,
-        "y": 314.00390625,
-        "z": "6e499246.1345bc",
+        "x": 617,
+        "y": 259.0039075613022,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "ccd2db16.3151b8"
+                "145975f0.e3dbaa"
             ]
         ]
     },
     {
-        "id": "ccd2db16.3151b8",
+        "id": "145975f0.e3dbaa",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 811.0039520263672,
-        "y": 313.0039052963257,
-        "z": "6e499246.1345bc",
+        "x": 779.0000457763672,
+        "y": 258.00390660762787,
+        "z": "1c424bc5.8e5824",
         "wires": [
             [
-                "2eb95e60.9609a2"
+                "3cec081f.179438"
             ]
         ]
     },
     {
-        "id": "2eb95e60.9609a2",
+        "id": "3cec081f.179438",
         "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",
+        "x": 928.2501373291016,
+        "y": 255.78178441524506,
+        "z": "1c424bc5.8e5824",
         "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 30df6e08..7a7dba27 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
@@ -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-delete' mode='sync'>
         <block atomic="true">
             <switch test='`$service-data.vnfs.vnf_length`'>
@@ -61,7 +61,7 @@
                                         <set>
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
                                         </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' ></call>
+                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>
                                     </block>
                                 </outcome>
                             </switch>
@@ -99,8 +99,8 @@
                         <outcome value='false'>
                             <block atomic="true">
                                 <set>
-                                    <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`' />
-                                    <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.`' />
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-id`' />
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.`' />
                                 </set>
                                 <set>
                                     <parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />
@@ -125,18 +125,18 @@
  + $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>
-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config' 
-        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config'
+                    key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
-- 
2.16.6