From: prakash.e <prakash.e@huawei.com>
Date: Tue, 16 Apr 2019 06:12:20 +0000 (+0530)
Subject: unused parameter tenant-id is removed
X-Git-Tag: 1.5.1~36
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=3d4e7b5d8c4132d10d9c880f685160effb9e993b

unused parameter tenant-id is removed

unused parameter tenant-id in vpn-deactivate DG is
removed and tmp.nidx is modified to tmp.vidx

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

Former-commit-id: 3da4178f0341a8c897770c3f2aeb7e13806dd3d6
---

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json
index 14263832..79b6cb77 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json
@@ -1,34 +1,34 @@
 [
     {
-        "id": "702b97b3.8ee378",
+        "id": "87eb3467.67ef28",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 767.03125,
-        "y": 208.03125,
-        "z": "e3dba753.67e0f8",
+        "x": 797.00390625,
+        "y": 151.00015544891357,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "32955a69.c89b66",
+        "id": "6ff7ce0a.951ff",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 149.36448669433594,
-        "y": 29.031090259552002,
-        "z": "e3dba753.67e0f8",
+        "x": 158.33714294433594,
+        "y": 45,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "6d10fa5f.ef1ca4"
+                "74fd4f3a.4e853"
             ]
         ]
     },
     {
-        "id": "6d10fa5f.ef1ca4",
+        "id": "74fd4f3a.4e853",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -36,564 +36,520 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 228.6501922607422,
-        "y": 91.26919984817505,
-        "z": "e3dba753.67e0f8",
+        "x": 237.6228485107422,
+        "y": 107.23810958862305,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "90ef259f.4465b8"
+                "98288506.abeac8"
             ]
         ]
     },
     {
-        "id": "90ef259f.4465b8",
+        "id": "98288506.abeac8",
         "type": "method",
         "name": "method sdwan-vf-operation-vpn-deactivate",
         "xml": "<method rpc='sdwan-vf-operation-vpn-deactivate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 240.36448669433594,
-        "y": 185.61743211746216,
-        "z": "e3dba753.67e0f8",
+        "x": 249.33714294433594,
+        "y": 201.58634185791016,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "36593f98.16e3d"
+                "99dd38ea.772bf8"
             ]
         ]
     },
     {
-        "id": "36593f98.16e3d",
+        "id": "99dd38ea.772bf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 227.03115844726562,
-        "y": 370.6978039741516,
-        "z": "e3dba753.67e0f8",
+        "x": 239.0038185119629,
+        "y": 371.6667160987854,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "702b97b3.8ee378",
-                "2f3304e5.d7fd4c",
-                "6be98d9b.539ff4",
-                "a0c4b3e9.994a9",
-                "b323d31c.acd57",
-                "5f46d882.04a158",
-                "621066a9.944e88",
-                "e3e4d1bd.80fd7",
-                "b9de2d65.c5979",
-                "7f24be05.1cd31",
-                "c30bc7b4.1dd508",
-                "5edb2470.30880c",
-                "c2f4c0be.85e67",
-                "637b40e9.05bd1"
+                "87eb3467.67ef28",
+                "fbc323e1.e7c8",
+                "92efdb26.a1dc48",
+                "f685e9f.f092918",
+                "9692eb20.6e3eb8",
+                "4ed48d04.0548b4",
+                "14e78520.2f6ebb",
+                "5fa8f00b.d8012",
+                "e6e38299.18bf5",
+                "265552d2.b6286e",
+                "c10bc8e8.e761d8",
+                "8ab2d64c.eae3d8",
+                "1aef8aa3.927465",
+                "d5916e8b.c3632"
             ]
         ]
     },
     {
-        "id": "6be98d9b.539ff4",
+        "id": "92efdb26.a1dc48",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 598.395751953125,
-        "y": 296.062340259552,
-        "z": "e3dba753.67e0f8",
+        "x": 626.3683891296387,
+        "y": 227.03125858306885,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f3304e5.d7fd4c",
+        "id": "fbc323e1.e7c8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 563.0936279296875,
-        "y": 252.06231260299683,
-        "z": "e3dba753.67e0f8",
+        "x": 596.0662841796875,
+        "y": 188.03122329711914,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5ced122.5325a",
+        "id": "4bc65046.8972",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 874.8193664550781,
-        "y": 379.04149866104126,
-        "z": "e3dba753.67e0f8",
+        "x": 902.7920036315918,
+        "y": 310.0104169845581,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "3739b39c.50fc6c",
-                "ac6efceb.fbae4",
-                "f4c9064c.3cb418",
-                "6663d5f5.4132fc"
+                "39639513.9419aa",
+                "51ec0208.871a0c",
+                "de6a021a.2e26d"
             ]
         ]
     },
     {
-        "id": "3739b39c.50fc6c",
+        "id": "39639513.9419aa",
         "type": "switchNode",
         "name": "switch name",
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.8194274902344,
-        "y": 308.0415253639221,
-        "z": "e3dba753.67e0f8",
+        "x": 1097.792064666748,
+        "y": 239.01044368743896,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "5651b769.f6f788"
+                "17876ecb.2d9e11"
             ]
         ]
     },
     {
-        "id": "5651b769.f6f788",
+        "id": "17876ecb.2d9e11",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1243.8195533752441,
-        "y": 308.0415291786194,
-        "z": "e3dba753.67e0f8",
+        "x": 1271.7921905517578,
+        "y": 239.01044750213623,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "8feb29dd.764fe8"
+                "4587c6d7.80cd28"
             ]
         ]
     },
     {
-        "id": "8feb29dd.764fe8",
+        "id": "4587c6d7.80cd28",
         "type": "set",
         "name": "set name",
         "xml": "<set>\n<parameter name='prop.name' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1406.8194389343262,
-        "y": 307.6415238380432,
-        "z": "e3dba753.67e0f8",
+        "x": 1434.7920761108398,
+        "y": 238.61044216156006,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "ac6efceb.fbae4",
+        "id": "51ec0208.871a0c",
         "type": "switchNode",
         "name": "switch topology",
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1080.235927581787,
-        "y": 355.70815420150757,
-        "z": "e3dba753.67e0f8",
+        "x": 1108.2085647583008,
+        "y": 286.6770725250244,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "fffcbfb8.f2fa"
+                "e5e3dbe3.2a4648"
             ]
         ]
     },
     {
-        "id": "fffcbfb8.f2fa",
+        "id": "e5e3dbe3.2a4648",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1254.2360534667969,
-        "y": 355.70815801620483,
-        "z": "e3dba753.67e0f8",
+        "x": 1282.2086906433105,
+        "y": 286.6770763397217,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "aba521f0.c2f18"
+                "a5f45824.51c398"
             ]
         ]
     },
     {
-        "id": "aba521f0.c2f18",
+        "id": "a5f45824.51c398",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1417.235939025879,
-        "y": 355.30815267562866,
-        "z": "e3dba753.67e0f8",
+        "x": 1445.2085762023926,
+        "y": 286.2770709991455,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "a0c4b3e9.994a9",
+        "id": "f685e9f.f092918",
         "type": "for",
         "name": "for each network-input-parameters",
         "xml": "<for index='idx' start='0' end='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 635.9858703613281,
-        "y": 381.70817041397095,
-        "z": "e3dba753.67e0f8",
+        "x": 663.9585075378418,
+        "y": 312.6770887374878,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "d5ced122.5325a"
+                "4bc65046.8972"
             ]
         ]
     },
     {
-        "id": "b9de2d65.c5979",
+        "id": "e6e38299.18bf5",
         "type": "get-resource",
         "name": "get-resource esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.8194122314453,
-        "y": 619.0415069162846,
-        "z": "e3dba753.67e0f8",
+        "x": 683.7920188903809,
+        "y": 444.0104646682739,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "962e611e.d3b8",
-                "d1b437fc.b72478",
-                "76cb6a63.2b7384"
+                "faf2ca26.f7d2e8",
+                "22680e7d.d029d2",
+                "dd46840b.db1198"
             ]
         ]
     },
     {
-        "id": "962e611e.d3b8",
+        "id": "faf2ca26.f7d2e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 894.8194122314453,
-        "y": 565.0415081977844,
-        "z": "e3dba753.67e0f8",
+        "x": 928.7920188903809,
+        "y": 390.0104659497738,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "61f20284.b32c7c"
+                "45fec8c4.77c4d8"
             ]
         ]
     },
     {
-        "id": "d1b437fc.b72478",
+        "id": "22680e7d.d029d2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 898.3103790283203,
-        "y": 612.6155438423157,
-        "z": "e3dba753.67e0f8",
+        "x": 932.2829856872559,
+        "y": 437.58450159430504,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "d289f55.a1fa308"
+                "c85ef46f.17a478"
             ]
         ]
     },
     {
-        "id": "76cb6a63.2b7384",
+        "id": "dd46840b.db1198",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 893.6433868408203,
-        "y": 653.9488568305969,
-        "z": "e3dba753.67e0f8",
+        "x": 927.6159934997559,
+        "y": 478.9178145825863,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "7041e417.d417bc"
+                "86e5bf28.74a63"
             ]
         ]
     },
     {
-        "id": "d289f55.a1fa308",
+        "id": "c85ef46f.17a478",
         "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
         "comments": "",
-        "x": 1074.8817901611328,
-        "y": 600.9012799263,
-        "z": "e3dba753.67e0f8",
+        "x": 1108.8543968200684,
+        "y": 425.8702376782894,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "7041e417.d417bc",
+        "id": "86e5bf28.74a63",
         "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
         "comments": "",
-        "x": 1081.415943145752,
-        "y": 649.3880496025085,
-        "z": "e3dba753.67e0f8",
+        "x": 1115.3885498046875,
+        "y": 474.3570073544979,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "7f24be05.1cd31",
+        "id": "265552d2.b6286e",
         "type": "execute",
         "name": "execute RestApiCallNode Get token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 657.8194122314453,
-        "y": 730.0415069162846,
-        "z": "e3dba753.67e0f8",
+        "x": 691.7920188903809,
+        "y": 555.0104646682739,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "4afad198.25387",
-                "f3670767.c4d1d8"
+                "2ff5851f.5a7bea",
+                "12d4ec03.6bbb94"
             ]
         ]
     },
     {
-        "id": "4afad198.25387",
+        "id": "2ff5851f.5a7bea",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 896.8194847106934,
-        "y": 708.041538387537,
-        "z": "e3dba753.67e0f8",
+        "x": 930.7920913696289,
+        "y": 533.0104961395264,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "7f06af8d.b7446"
+                "674e737a.7db1dc"
             ]
         ]
     },
     {
-        "id": "f3670767.c4d1d8",
+        "id": "12d4ec03.6bbb94",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 889.0694847106934,
-        "y": 761.6844216883183,
-        "z": "e3dba753.67e0f8",
+        "x": 923.0420913696289,
+        "y": 586.6533794403076,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "5cfe33a1.e2bc8c"
+                "436e486e.a66d38"
             ]
         ]
     },
     {
-        "id": "7f06af8d.b7446",
+        "id": "674e737a.7db1dc",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1046.8194122314453,
-        "y": 709.0415069162846,
-        "z": "e3dba753.67e0f8",
+        "x": 1080.7920188903809,
+        "y": 534.0104646682739,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "5cfe33a1.e2bc8c",
+        "id": "436e486e.a66d38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
         "comments": "",
-        "x": 1041.8194847106934,
-        "y": 761.4344827234745,
-        "z": "e3dba753.67e0f8",
+        "x": 1075.792091369629,
+        "y": 586.4034404754639,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "61f20284.b32c7c",
+        "id": "45fec8c4.77c4d8",
         "type": "set",
         "name": "set controller data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
         "comments": "",
-        "x": 1092.3194732666016,
-        "y": 553.0415081977844,
-        "z": "e3dba753.67e0f8",
+        "x": 1126.292079925537,
+        "y": 378.0104659497738,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "b323d31c.acd57",
+        "id": "9692eb20.6e3eb8",
         "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": 592.3685722351074,
-        "y": 1226.5350461006165,
-        "z": "e3dba753.67e0f8",
+        "x": 632.341157913208,
+        "y": 886.5040712356567,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "f4c9064c.3cb418",
+        "id": "de6a021a.2e26d",
         "type": "switchNode",
         "name": "switch vpn-id",
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vpn-id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1077.368392944336,
-        "y": 405.284996509552,
-        "z": "e3dba753.67e0f8",
+        "x": 1105.3410301208496,
+        "y": 336.25391483306885,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "7073b26f.c2162c"
+                "b18071f3.3ff89"
             ]
         ]
     },
     {
-        "id": "7073b26f.c2162c",
+        "id": "b18071f3.3ff89",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1259.3684253692627,
-        "y": 405.2849953174591,
-        "z": "e3dba753.67e0f8",
+        "x": 1287.3410625457764,
+        "y": 336.25391364097595,
+        "z": "ed1e44d2.195918",
         "wires": [
             [
-                "ec43e2d2.05e58"
+                "2b7fb28a.006dbe"
             ]
         ]
     },
     {
-        "id": "ec43e2d2.05e58",
+        "id": "2b7fb28a.006dbe",
         "type": "set",
         "name": "set prop.vpn-id",
         "xml": "<set>\n<parameter name='prop.vpn-id' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1424.3683586120605,
-        "y": 407.88499689102173,
-        "z": "e3dba753.67e0f8",
+        "x": 1452.3409957885742,
+        "y": 338.8539152145386,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "6663d5f5.4132fc",
-        "type": "switchNode",
-        "name": "switch tenant-id",
-        "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tenant-id'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1088.1182556152344,
-        "y": 449.284996509552,
-        "z": "e3dba753.67e0f8",
-        "wires": [
-            [
-                "b0ecdc75.e86fd"
-            ]
-        ]
-    },
-    {
-        "id": "b0ecdc75.e86fd",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1257.1184558868408,
-        "y": 448.28499841690063,
-        "z": "e3dba753.67e0f8",
-        "wires": [
-            [
-                "aa1766f9.85f0b8"
-            ]
-        ]
-    },
-    {
-        "id": "aa1766f9.85f0b8",
-        "type": "set",
-        "name": "set prop.tenant-id",
-        "xml": "<set>\n<parameter name='prop.tenant-id' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
-        "comments": "",
-        "x": 1420.1183414459229,
-        "y": 447.88499307632446,
-        "z": "e3dba753.67e0f8",
-        "wires": []
-    },
-    {
-        "id": "c30bc7b4.1dd508",
+        "id": "c10bc8e8.e761d8",
         "type": "call",
         "name": "call sdwan-get-tenant-auth",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 626.3644866943359,
-        "y": 816.031090259552,
-        "z": "e3dba753.67e0f8",
+        "x": 662.337085723877,
+        "y": 606.0000734329224,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "5edb2470.30880c",
+        "id": "8ab2d64c.eae3d8",
         "type": "execute",
         "name": "execute RestApiCallNode delete vpn topology",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 685.364501953125,
-        "y": 874.6978039741516,
-        "z": "e3dba753.67e0f8",
+        "x": 724.3371391296387,
+        "y": 644.6667604446411,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "c2f4c0be.85e67",
+        "id": "1aef8aa3.927465",
         "type": "execute",
         "name": "execute RestApiCallNode delete vpn",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-delete.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 662.8645172119141,
-        "y": 931.6980247497559,
-        "z": "e3dba753.67e0f8",
+        "x": 697.8371620178223,
+        "y": 685.6670351028442,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "637b40e9.05bd1",
+        "id": "d5916e8b.c3632",
         "type": "update",
         "name": "update SDWAN VPN status to AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
         "comments": "",
         "outputs": 1,
-        "x": 658.5832214355469,
-        "y": 1156.734342098236,
-        "z": "e3dba753.67e0f8",
+        "x": 692.5558166503906,
+        "y": 846.7032747268677,
+        "z": "ed1e44d2.195918",
         "wires": [
             []
         ]
     },
     {
-        "id": "5f46d882.04a158",
+        "id": "4ed48d04.0548b4",
         "type": "set",
         "name": "copy input data to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",
         "comments": "",
-        "x": 645,
-        "y": 998,
-        "z": "e3dba753.67e0f8",
+        "x": 682.9726409912109,
+        "y": 723.968991279602,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "621066a9.944e88",
+        "id": "14e78520.2f6ebb",
         "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": 628.6666564941406,
-        "y": 1039.416741847992,
-        "z": "e3dba753.67e0f8",
+        "x": 669.639274597168,
+        "y": 765.3856935501099,
+        "z": "ed1e44d2.195918",
         "wires": []
     },
     {
-        "id": "e3e4d1bd.80fd7",
+        "id": "5fa8f00b.d8012",
         "type": "set",
         "name": "set vf-module-oper-status to PendingDelete",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
         "comments": "",
-        "x": 684.1467742919922,
-        "y": 1089.0039992332458,
-        "z": "e3dba753.67e0f8",
+        "x": 721.1193695068359,
+        "y": 804.9730195999146,
+        "z": "ed1e44d2.195918",
         "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-vpn-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml
index f28d9c23..b41efbc0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml
@@ -37,13 +37,6 @@
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tenant-id'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.tenant-id' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
                 </block>
             </for>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
@@ -125,10 +118,10 @@
                 <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
             </execute>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
             </set>
             <set>
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
@@ -150,9 +143,9 @@
  + '/service-data/service-topology/'`"/>
             </set>
             <set>
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='PendingDelete' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
             </set>
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' 
       key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >