From 64bbbabf87a6bd22f48166c4b86d98e36f2474d2 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Tue, 23 Apr 2019 18:14:51 +0530
Subject: [PATCH] SDWAN vpn-site-res delete DG duplicate removal

In SDWAN vip-site-resource-delete DG, Duplicat
validation of vnf-id is deleted where requiredParameters
method is called for validation and again validating
for NULL check with the same input.

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

Former-commit-id: 0e235c74665b23535ab9a715684c700de8d910cb
---
 ...opology-operation-vpn-site-resource-delete.json | 400 +++++++++------------
 ...topology-operation-vpn-site-resource-delete.xml |   9 -
 2 files changed, 178 insertions(+), 231 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json
index 3d26891c..41f88c42 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "eafcb830.49a558",
+        "id": "a34c8b72.7caca8",
         "type": "method",
         "name": "method vnf-topology-operation-vpn-site-resource-delete",
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 207,
-        "y": 214,
-        "z": "db08cdbb.446ef",
+        "x": 244.00390625,
+        "y": 243.9999988079071,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "d02b15b4.dd4488"
+                "54a7ab4c.cd61a4"
             ]
         ]
     },
     {
-        "id": "d0a64a79.788248",
+        "id": "d8d59f04.fbf0d",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 151.57138061523438,
-        "y": 38,
-        "z": "db08cdbb.446ef",
+        "x": 188.57528686523438,
+        "y": 67.9999988079071,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "188a7052.71591"
+                "115026d6.80ce89"
             ]
         ]
     },
     {
-        "id": "188a7052.71591",
+        "id": "115026d6.80ce89",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -38,530 +38,486 @@
         "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": 226.85708618164062,
-        "y": 78.23811149597168,
-        "z": "db08cdbb.446ef",
+        "x": 263.8609924316406,
+        "y": 108.23811030387878,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "eafcb830.49a558"
+                "a34c8b72.7caca8"
             ]
         ]
     },
     {
-        "id": "c2640aa8.7edda8",
+        "id": "e3e6f054.e2739",
         "type": "comment",
         "name": "site-vnf-topology-operation-delete",
         "info": "",
         "comments": "",
-        "x": 600.9162979125977,
-        "y": 111.58639907836914,
-        "z": "db08cdbb.446ef",
+        "x": 637.9202041625977,
+        "y": 141.58639788627625,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "d02b15b4.dd4488",
+        "id": "54a7ab4c.cd61a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 228.23804473876953,
-        "y": 339.6666717529297,
-        "z": "db08cdbb.446ef",
+        "x": 265.24195098876953,
+        "y": 369.6666705608368,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "ac2e49a1.5e8568",
-                "4d83bd7.fa4f844",
-                "8cb0635e.d8e2c",
-                "faf06bed.cf0a38",
-                "c3cf9f4.9560f6",
-                "5c51b14f.3f60b",
-                "84b98584.0b5d68",
-                "64b20017.f4e26",
-                "c1ccb47b.c48ef8",
-                "dfa19665.762578",
-                "f3ab3fd1.f188e"
+                "5cec27dc.b4f998",
+                "e053b514.a7c2a8",
+                "538824d6.c6a6fc",
+                "a69377b.4606688",
+                "3ec3b469.7cc4ec",
+                "25ca64f5.0561dc",
+                "7d20c9cf.4fef58",
+                "4cc92ad1.2ef524",
+                "c339a825.6ccfe8",
+                "dd31e4a5.a51148"
             ]
         ]
     },
     {
-        "id": "faf06bed.cf0a38",
+        "id": "a69377b.4606688",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 689.6660842895508,
-        "y": 273.26117038726807,
-        "z": "db08cdbb.446ef",
+        "x": 717.6699981689453,
+        "y": 287.2611780166626,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "7bb61b60.8ccfe4",
-                "6a78f7f6.d96ae8"
+                "4a61f22a.1420fc",
+                "5dae927c.612acc"
             ]
         ]
     },
     {
-        "id": "7bb61b60.8ccfe4",
+        "id": "4a61f22a.1420fc",
         "type": "other",
         "name": "outcome Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 954.3883972167969,
-        "y": 255.81679248809814,
-        "z": "db08cdbb.446ef",
+        "x": 982.3923110961914,
+        "y": 269.8168001174927,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "ded5f144.4823a"
+                "2a103cd5.07a2e4"
             ]
         ]
     },
     {
-        "id": "ded5f144.4823a",
+        "id": "2a103cd5.07a2e4",
         "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": 1135.3882675170898,
-        "y": 250.81667041778564,
-        "z": "db08cdbb.446ef",
+        "x": 1163.3921813964844,
+        "y": 264.8166780471802,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "6a78f7f6.d96ae8",
+        "id": "5dae927c.612acc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 939.8883972167969,
-        "y": 307.8167552947998,
-        "z": "db08cdbb.446ef",
+        "x": 967.8923110961914,
+        "y": 321.81676292419434,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "4b9e2f73.508cd"
+                "84a26be6.b55a98"
             ]
         ]
     },
     {
-        "id": "4b9e2f73.508cd",
+        "id": "84a26be6.b55a98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1111.8881034851074,
-        "y": 307.8167533874512,
-        "z": "db08cdbb.446ef",
+        "x": 1139.892017364502,
+        "y": 321.8167610168457,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "247799a9.6130f6",
-                "84b938cb.78bee8"
+                "43c53e66.48eab",
+                "bc2744ca.9b7c98"
             ]
         ]
     },
     {
-        "id": "84b938cb.78bee8",
+        "id": "bc2744ca.9b7c98",
         "type": "switchNode",
         "name": "switch tmp.nidx ",
         "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1286.8882751464844,
-        "y": 326.8166751861572,
-        "z": "db08cdbb.446ef",
+        "x": 1314.892189025879,
+        "y": 340.81668281555176,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "7a17688b.c98ab8"
+                "36fbace6.f16d84"
             ]
         ]
     },
     {
-        "id": "8cb0635e.d8e2c",
+        "id": "538824d6.c6a6fc",
         "type": "switchNode",
         "name": "switch vnf-level-oper-status",
         "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 660.0550842285156,
-        "y": 347.70563411712646,
-        "z": "db08cdbb.446ef",
+        "x": 688.0589981079102,
+        "y": 361.705641746521,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "6f0effe.88561",
-                "4d0008ab.c847c8"
+                "9a7aa2ec.10efc",
+                "8c012c8c.5b9ba"
             ]
         ]
     },
     {
-        "id": "6f0effe.88561",
+        "id": "9a7aa2ec.10efc",
         "type": "outcome",
         "name": "outcome PendingDelete",
         "xml": "<outcome value='PendingDelete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 936.888427734375,
-        "y": 350.8167338371277,
-        "z": "db08cdbb.446ef",
+        "x": 964.8923416137695,
+        "y": 364.8167414665222,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "1d4d444b.bf117c"
+                "bf8c6806.a7bce8"
             ]
         ]
     },
     {
-        "id": "4d0008ab.c847c8",
+        "id": "8c012c8c.5b9ba",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 897.8884124755859,
-        "y": 396.816782951355,
-        "z": "db08cdbb.446ef",
+        "x": 925.8923263549805,
+        "y": 410.8167905807495,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "640a50b6.3e86d"
+                "1ed98412.25294c"
             ]
         ]
     },
     {
-        "id": "640a50b6.3e86d",
+        "id": "1ed98412.25294c",
         "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": 1046.388126373291,
-        "y": 395.81676292419434,
-        "z": "db08cdbb.446ef",
+        "x": 1074.3920402526855,
+        "y": 409.81677055358887,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "c3cf9f4.9560f6",
-        "type": "switchNode",
-        "name": "switch vnf-id",
-        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 625.8884010314941,
-        "y": 228.81676387786865,
-        "z": "db08cdbb.446ef",
-        "wires": [
-            [
-                "6f94c17f.e94a6"
-            ]
-        ]
-    },
-    {
-        "id": "6f94c17f.e94a6",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 823.8884658813477,
-        "y": 218.81677627563477,
-        "z": "db08cdbb.446ef",
-        "wires": [
-            [
-                "723f2fa7.6d1e3"
-            ]
-        ]
-    },
-    {
-        "id": "723f2fa7.6d1e3",
-        "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-request-input.vnf-input-parameters.name is a required input\" />\n",
-        "comments": "",
-        "x": 990.3883514404297,
-        "y": 215.81677055358887,
-        "z": "db08cdbb.446ef",
-        "wires": []
-    },
-    {
-        "id": "5c51b14f.3f60b",
+        "id": "3ec3b469.7cc4ec",
         "type": "execute",
         "name": "execute requiredParameters",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vnf-topology-operation-input.vnf-information.vnf-id\" value=\"$vnf-topology-operation-input.vnf-information.vnf-id\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 683.3884582519531,
-        "y": 168.81676292419434,
-        "z": "db08cdbb.446ef",
+        "x": 704.392333984375,
+        "y": 230.8167576789856,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             []
         ]
     },
     {
-        "id": "247799a9.6130f6",
+        "id": "43c53e66.48eab",
         "type": "for",
         "name": "for nidx..service-data.vnfs.vnf[]",
         "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1347.3882789611816,
-        "y": 262.81667137145996,
-        "z": "db08cdbb.446ef",
+        "x": 1375.3921928405762,
+        "y": 276.8166790008545,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "b01b8e2f.7dbb9"
+                "d2baa75f.a56cd8"
             ]
         ]
     },
     {
-        "id": "b01b8e2f.7dbb9",
+        "id": "d2baa75f.a56cd8",
         "type": "switchNode",
         "name": "switch vnf-id found",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1603.388298034668,
-        "y": 262.81667137145996,
-        "z": "db08cdbb.446ef",
+        "x": 1631.3922119140625,
+        "y": 276.8166790008545,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "357169.84af7e98"
+                "16946d10.c0e503"
             ]
         ]
     },
     {
-        "id": "357169.84af7e98",
+        "id": "16946d10.c0e503",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1779.8883514404297,
-        "y": 265.81667137145996,
-        "z": "db08cdbb.446ef",
+        "x": 1807.8922653198242,
+        "y": 279.8166790008545,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "38f16832.2c5d68"
+                "c1f09a0b.fa73f8"
             ]
         ]
     },
     {
-        "id": "38f16832.2c5d68",
+        "id": "c1f09a0b.fa73f8",
         "type": "set",
         "name": "set tmp.nidx and ctx.vnf-data",
         "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />\n",
         "comments": "",
-        "x": 1946.8883666992188,
-        "y": 326.81667137145996,
-        "z": "db08cdbb.446ef",
+        "x": 1974.8922805786133,
+        "y": 340.8166790008545,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "fc674990.6f1398",
+        "id": "841f20a7.73592",
         "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": 1592.3882904052734,
-        "y": 326.8166751861572,
-        "z": "db08cdbb.446ef",
+        "x": 1620.392204284668,
+        "y": 340.81668281555176,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "7a17688b.c98ab8",
+        "id": "36fbace6.f16d84",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1454.8882904052734,
-        "y": 326.8166751861572,
-        "z": "db08cdbb.446ef",
+        "x": 1482.892204284668,
+        "y": 340.81668281555176,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "fc674990.6f1398"
+                "841f20a7.73592"
             ]
         ]
     },
     {
-        "id": "ac2e49a1.5e8568",
+        "id": "5cec27dc.b4f998",
         "type": "set",
         "name": "set vnfId and vnf-object-path",
         "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='vnf-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
         "comments": "",
-        "x": 646.9051055908203,
-        "y": 562.333676815033,
-        "z": "db08cdbb.446ef",
+        "x": 674.9090194702148,
+        "y": 576.3336844444275,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "4d83bd7.fa4f844",
+        "id": "e053b514.a7c2a8",
         "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": 603.0162582397461,
-        "y": 639.8892359733582,
-        "z": "db08cdbb.446ef",
+        "x": 631.0201721191406,
+        "y": 653.8892436027527,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "1d4d444b.bf117c",
+        "id": "bf8c6806.a7bce8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1132.1947860717773,
-        "y": 358.141939163208,
-        "z": "db08cdbb.446ef",
+        "x": 1160.1986999511719,
+        "y": 372.14194679260254,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             []
         ]
     },
     {
-        "id": "84b98584.0b5d68",
+        "id": "25ca64f5.0561dc",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
         "comments": "",
-        "x": 629.0000762939453,
-        "y": 398.00006914138794,
-        "z": "db08cdbb.446ef",
+        "x": 657.0039901733398,
+        "y": 412.00007677078247,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "64b20017.f4e26",
+        "id": "7d20c9cf.4fef58",
         "type": "for",
         "name": "for lidx..service-data.vnfs.vnf[]",
         "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 653.0000610351562,
-        "y": 440.00006771087646,
-        "z": "db08cdbb.446ef",
+        "x": 681.0039749145508,
+        "y": 454.000075340271,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "ac122a7c.345458"
+                "69a35263.2a030c"
             ]
         ]
     },
     {
-        "id": "ac122a7c.345458",
+        "id": "69a35263.2a030c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 914.0001373291016,
-        "y": 444.000102519989,
-        "z": "db08cdbb.446ef",
+        "x": 942.0040512084961,
+        "y": 458.00011014938354,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "7381e65e.fc3b68"
+                "a4d1dd60.ffc74"
             ]
         ]
     },
     {
-        "id": "7381e65e.fc3b68",
+        "id": "a4d1dd60.ffc74",
         "type": "switchNode",
         "name": "switch vnf-id found",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1106.0000839233398,
-        "y": 453.0001468658447,
-        "z": "db08cdbb.446ef",
+        "x": 1134.0039978027344,
+        "y": 467.00015449523926,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "61719a57.800f34"
+                "4e20e907.55e038"
             ]
         ]
     },
     {
-        "id": "61719a57.800f34",
+        "id": "4e20e907.55e038",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1292.000099182129,
-        "y": 437.0000333786011,
-        "z": "db08cdbb.446ef",
+        "x": 1320.0040130615234,
+        "y": 451.0000410079956,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "9df0dc24.7346c"
+                "58cf5365.23557c"
             ]
         ]
     },
     {
-        "id": "9df0dc24.7346c",
+        "id": "58cf5365.23557c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1443.0000228881836,
-        "y": 438.0000696182251,
-        "z": "db08cdbb.446ef",
+        "x": 1471.0039367675781,
+        "y": 452.00007724761963,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             [
-                "c661d6a.46dd528",
-                "142b6671.1e430a"
+                "b99c095f.2dd4a8",
+                "9d68eef8.da1f9"
             ]
         ]
     },
     {
-        "id": "c661d6a.46dd528",
+        "id": "b99c095f.2dd4a8",
         "type": "set",
         "name": "set  vnf data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />\n",
         "comments": "",
-        "x": 1610.0001907348633,
-        "y": 412.000253200531,
-        "z": "db08cdbb.446ef",
+        "x": 1638.0041046142578,
+        "y": 426.00026082992554,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "142b6671.1e430a",
+        "id": "9d68eef8.da1f9",
         "type": "set",
         "name": "set prop.vnfNewidx",
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
         "comments": "",
-        "x": 1630.0001182556152,
-        "y": 469.00018882751465,
-        "z": "db08cdbb.446ef",
+        "x": 1658.0040321350098,
+        "y": 483.0001964569092,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "c1ccb47b.c48ef8",
+        "id": "4cc92ad1.2ef524",
         "type": "set",
         "name": "set new vnf length",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
         "comments": "",
-        "x": 621.1014747619629,
-        "y": 483.80442094802856,
-        "z": "db08cdbb.446ef",
+        "x": 649.1053886413574,
+        "y": 497.8044285774231,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "dfa19665.762578",
+        "id": "c339a825.6ccfe8",
         "type": "set",
         "name": "Remove vnf from ServiceData",
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",
         "comments": "",
-        "x": 651.000244140625,
-        "y": 522.0002040863037,
-        "z": "db08cdbb.446ef",
+        "x": 679.0041580200195,
+        "y": 536.0002117156982,
+        "z": "f9f35a3e.860ce8",
         "wires": []
     },
     {
-        "id": "f3ab3fd1.f188e",
+        "id": "dd31e4a5.a51148",
         "type": "save",
         "name": "delete AnAI - vnf-instance.orchestration-status",
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"PendingDelete\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 708.0066375732422,
-        "y": 599.0106163024902,
-        "z": "db08cdbb.446ef",
+        "x": 736.0105514526367,
+        "y": 613.0106239318848,
+        "z": "f9f35a3e.860ce8",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml
index 41bab8f3..87e6c528 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml
@@ -6,15 +6,6 @@
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
                 <parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>
             </execute>
-            <switch test="`$vnf-topology-operation-input.vnf-information.vnf-id`">
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-request-input.vnf-input-parameters.name is a required input" />
-                    </return>
-                </outcome>
-            </switch>
             <switch test='`$service-data.vnfs.vnf_length`'>
                 <outcome value=''>
                     <return status='failure'>
-- 
2.16.6