unused parameter tenant-id is removed 16/85416/1
authorprakash.e <prakash.e@huawei.com>
Tue, 16 Apr 2019 06:12:20 +0000 (11:42 +0530)
committerprakash.e <prakash.e@huawei.com>
Tue, 16 Apr 2019 06:12:24 +0000 (11:42 +0530)
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

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-deactivate.xml

index 1426383..79b6cb7 100644 (file)
@@ -1,34 +1,34 @@
 [\r
     {\r
-        "id": "702b97b3.8ee378",\r
+        "id": "87eb3467.67ef28",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 767.03125,\r
-        "y": 208.03125,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 797.00390625,\r
+        "y": 151.00015544891357,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "32955a69.c89b66",\r
+        "id": "6ff7ce0a.951ff",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 149.36448669433594,\r
-        "y": 29.031090259552002,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 158.33714294433594,\r
+        "y": 45,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "6d10fa5f.ef1ca4"\r
+                "74fd4f3a.4e853"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d10fa5f.ef1ca4",\r
+        "id": "74fd4f3a.4e853",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 228.6501922607422,\r
-        "y": 91.26919984817505,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 237.6228485107422,\r
+        "y": 107.23810958862305,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "90ef259f.4465b8"\r
+                "98288506.abeac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90ef259f.4465b8",\r
+        "id": "98288506.abeac8",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-vpn-deactivate",\r
         "xml": "<method rpc='sdwan-vf-operation-vpn-deactivate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 240.36448669433594,\r
-        "y": 185.61743211746216,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 249.33714294433594,\r
+        "y": 201.58634185791016,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "36593f98.16e3d"\r
+                "99dd38ea.772bf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36593f98.16e3d",\r
+        "id": "99dd38ea.772bf8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 227.03115844726562,\r
-        "y": 370.6978039741516,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 239.0038185119629,\r
+        "y": 371.6667160987854,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "702b97b3.8ee378",\r
-                "2f3304e5.d7fd4c",\r
-                "6be98d9b.539ff4",\r
-                "a0c4b3e9.994a9",\r
-                "b323d31c.acd57",\r
-                "5f46d882.04a158",\r
-                "621066a9.944e88",\r
-                "e3e4d1bd.80fd7",\r
-                "b9de2d65.c5979",\r
-                "7f24be05.1cd31",\r
-                "c30bc7b4.1dd508",\r
-                "5edb2470.30880c",\r
-                "c2f4c0be.85e67",\r
-                "637b40e9.05bd1"\r
+                "87eb3467.67ef28",\r
+                "fbc323e1.e7c8",\r
+                "92efdb26.a1dc48",\r
+                "f685e9f.f092918",\r
+                "9692eb20.6e3eb8",\r
+                "4ed48d04.0548b4",\r
+                "14e78520.2f6ebb",\r
+                "5fa8f00b.d8012",\r
+                "e6e38299.18bf5",\r
+                "265552d2.b6286e",\r
+                "c10bc8e8.e761d8",\r
+                "8ab2d64c.eae3d8",\r
+                "1aef8aa3.927465",\r
+                "d5916e8b.c3632"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6be98d9b.539ff4",\r
+        "id": "92efdb26.a1dc48",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 598.395751953125,\r
-        "y": 296.062340259552,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 626.3683891296387,\r
+        "y": 227.03125858306885,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2f3304e5.d7fd4c",\r
+        "id": "fbc323e1.e7c8",\r
         "type": "record",\r
         "name": "record",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 563.0936279296875,\r
-        "y": 252.06231260299683,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 596.0662841796875,\r
+        "y": 188.03122329711914,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d5ced122.5325a",\r
+        "id": "4bc65046.8972",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 874.8193664550781,\r
-        "y": 379.04149866104126,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 902.7920036315918,\r
+        "y": 310.0104169845581,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "3739b39c.50fc6c",\r
-                "ac6efceb.fbae4",\r
-                "f4c9064c.3cb418",\r
-                "6663d5f5.4132fc"\r
+                "39639513.9419aa",\r
+                "51ec0208.871a0c",\r
+                "de6a021a.2e26d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3739b39c.50fc6c",\r
+        "id": "39639513.9419aa",\r
         "type": "switchNode",\r
         "name": "switch name",\r
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1069.8194274902344,\r
-        "y": 308.0415253639221,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1097.792064666748,\r
+        "y": 239.01044368743896,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "5651b769.f6f788"\r
+                "17876ecb.2d9e11"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5651b769.f6f788",\r
+        "id": "17876ecb.2d9e11",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1243.8195533752441,\r
-        "y": 308.0415291786194,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1271.7921905517578,\r
+        "y": 239.01044750213623,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "8feb29dd.764fe8"\r
+                "4587c6d7.80cd28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8feb29dd.764fe8",\r
+        "id": "4587c6d7.80cd28",\r
         "type": "set",\r
         "name": "set name",\r
         "xml": "<set>\n<parameter name='prop.name' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1406.8194389343262,\r
-        "y": 307.6415238380432,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1434.7920761108398,\r
+        "y": 238.61044216156006,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac6efceb.fbae4",\r
+        "id": "51ec0208.871a0c",\r
         "type": "switchNode",\r
         "name": "switch topology",\r
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1080.235927581787,\r
-        "y": 355.70815420150757,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1108.2085647583008,\r
+        "y": 286.6770725250244,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "fffcbfb8.f2fa"\r
+                "e5e3dbe3.2a4648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fffcbfb8.f2fa",\r
+        "id": "e5e3dbe3.2a4648",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1254.2360534667969,\r
-        "y": 355.70815801620483,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1282.2086906433105,\r
+        "y": 286.6770763397217,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "aba521f0.c2f18"\r
+                "a5f45824.51c398"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aba521f0.c2f18",\r
+        "id": "a5f45824.51c398",\r
         "type": "set",\r
         "name": "set topology",\r
         "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1417.235939025879,\r
-        "y": 355.30815267562866,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1445.2085762023926,\r
+        "y": 286.2770709991455,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a0c4b3e9.994a9",\r
+        "id": "f685e9f.f092918",\r
         "type": "for",\r
         "name": "for each network-input-parameters",\r
         "xml": "<for index='idx' start='0' end='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 635.9858703613281,\r
-        "y": 381.70817041397095,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 663.9585075378418,\r
+        "y": 312.6770887374878,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "d5ced122.5325a"\r
+                "4bc65046.8972"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9de2d65.c5979",\r
+        "id": "e6e38299.18bf5",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 649.8194122314453,\r
-        "y": 619.0415069162846,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 683.7920188903809,\r
+        "y": 444.0104646682739,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "962e611e.d3b8",\r
-                "d1b437fc.b72478",\r
-                "76cb6a63.2b7384"\r
+                "faf2ca26.f7d2e8",\r
+                "22680e7d.d029d2",\r
+                "dd46840b.db1198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "962e611e.d3b8",\r
+        "id": "faf2ca26.f7d2e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 894.8194122314453,\r
-        "y": 565.0415081977844,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 928.7920188903809,\r
+        "y": 390.0104659497738,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "61f20284.b32c7c"\r
+                "45fec8c4.77c4d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1b437fc.b72478",\r
+        "id": "22680e7d.d029d2",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 898.3103790283203,\r
-        "y": 612.6155438423157,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 932.2829856872559,\r
+        "y": 437.58450159430504,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "d289f55.a1fa308"\r
+                "c85ef46f.17a478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76cb6a63.2b7384",\r
+        "id": "dd46840b.db1198",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 893.6433868408203,\r
-        "y": 653.9488568305969,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 927.6159934997559,\r
+        "y": 478.9178145825863,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "7041e417.d417bc"\r
+                "86e5bf28.74a63"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d289f55.a1fa308",\r
+        "id": "c85ef46f.17a478",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1074.8817901611328,\r
-        "y": 600.9012799263,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1108.8543968200684,\r
+        "y": 425.8702376782894,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7041e417.d417bc",\r
+        "id": "86e5bf28.74a63",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1081.415943145752,\r
-        "y": 649.3880496025085,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1115.3885498046875,\r
+        "y": 474.3570073544979,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7f24be05.1cd31",\r
+        "id": "265552d2.b6286e",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "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\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 657.8194122314453,\r
-        "y": 730.0415069162846,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 691.7920188903809,\r
+        "y": 555.0104646682739,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "4afad198.25387",\r
-                "f3670767.c4d1d8"\r
+                "2ff5851f.5a7bea",\r
+                "12d4ec03.6bbb94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4afad198.25387",\r
+        "id": "2ff5851f.5a7bea",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 896.8194847106934,\r
-        "y": 708.041538387537,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 930.7920913696289,\r
+        "y": 533.0104961395264,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "7f06af8d.b7446"\r
+                "674e737a.7db1dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3670767.c4d1d8",\r
+        "id": "12d4ec03.6bbb94",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 889.0694847106934,\r
-        "y": 761.6844216883183,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 923.0420913696289,\r
+        "y": 586.6533794403076,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "5cfe33a1.e2bc8c"\r
+                "436e486e.a66d38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f06af8d.b7446",\r
+        "id": "674e737a.7db1dc",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1046.8194122314453,\r
-        "y": 709.0415069162846,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1080.7920188903809,\r
+        "y": 534.0104646682739,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5cfe33a1.e2bc8c",\r
+        "id": "436e486e.a66d38",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1041.8194847106934,\r
-        "y": 761.4344827234745,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1075.792091369629,\r
+        "y": 586.4034404754639,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "61f20284.b32c7c",\r
+        "id": "45fec8c4.77c4d8",\r
         "type": "set",\r
         "name": "set controller data",\r
         "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",\r
         "comments": "",\r
-        "x": 1092.3194732666016,\r
-        "y": 553.0415081977844,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1126.292079925537,\r
+        "y": 378.0104659497738,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b323d31c.acd57",\r
+        "id": "9692eb20.6e3eb8",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 592.3685722351074,\r
-        "y": 1226.5350461006165,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 632.341157913208,\r
+        "y": 886.5040712356567,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f4c9064c.3cb418",\r
+        "id": "de6a021a.2e26d",\r
         "type": "switchNode",\r
         "name": "switch vpn-id",\r
         "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vpn-id'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1077.368392944336,\r
-        "y": 405.284996509552,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1105.3410301208496,\r
+        "y": 336.25391483306885,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "7073b26f.c2162c"\r
+                "b18071f3.3ff89"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7073b26f.c2162c",\r
+        "id": "b18071f3.3ff89",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1259.3684253692627,\r
-        "y": 405.2849953174591,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1287.3410625457764,\r
+        "y": 336.25391364097595,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             [\r
-                "ec43e2d2.05e58"\r
+                "2b7fb28a.006dbe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec43e2d2.05e58",\r
+        "id": "2b7fb28a.006dbe",\r
         "type": "set",\r
         "name": "set prop.vpn-id",\r
         "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",\r
         "comments": "",\r
-        "x": 1424.3683586120605,\r
-        "y": 407.88499689102173,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 1452.3409957885742,\r
+        "y": 338.8539152145386,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6663d5f5.4132fc",\r
-        "type": "switchNode",\r
-        "name": "switch tenant-id",\r
-        "xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tenant-id'`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1088.1182556152344,\r
-        "y": 449.284996509552,\r
-        "z": "e3dba753.67e0f8",\r
-        "wires": [\r
-            [\r
-                "b0ecdc75.e86fd"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "b0ecdc75.e86fd",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1257.1184558868408,\r
-        "y": 448.28499841690063,\r
-        "z": "e3dba753.67e0f8",\r
-        "wires": [\r
-            [\r
-                "aa1766f9.85f0b8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "aa1766f9.85f0b8",\r
-        "type": "set",\r
-        "name": "set prop.tenant-id",\r
-        "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",\r
-        "comments": "",\r
-        "x": 1420.1183414459229,\r
-        "y": 447.88499307632446,\r
-        "z": "e3dba753.67e0f8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "c30bc7b4.1dd508",\r
+        "id": "c10bc8e8.e761d8",\r
         "type": "call",\r
         "name": "call sdwan-get-tenant-auth",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 626.3644866943359,\r
-        "y": 816.031090259552,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 662.337085723877,\r
+        "y": 606.0000734329224,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5edb2470.30880c",\r
+        "id": "8ab2d64c.eae3d8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode delete vpn topology",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 685.364501953125,\r
-        "y": 874.6978039741516,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 724.3371391296387,\r
+        "y": 644.6667604446411,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c2f4c0be.85e67",\r
+        "id": "1aef8aa3.927465",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode delete vpn",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 662.8645172119141,\r
-        "y": 931.6980247497559,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 697.8371620178223,\r
+        "y": 685.6670351028442,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "637b40e9.05bd1",\r
+        "id": "d5916e8b.c3632",\r
         "type": "update",\r
         "name": "update SDWAN VPN status to AAI",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 658.5832214355469,\r
-        "y": 1156.734342098236,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 692.5558166503906,\r
+        "y": 846.7032747268677,\r
+        "z": "ed1e44d2.195918",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5f46d882.04a158",\r
+        "id": "4ed48d04.0548b4",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
-        "x": 645,\r
-        "y": 998,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 682.9726409912109,\r
+        "y": 723.968991279602,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "621066a9.944e88",\r
+        "id": "14e78520.2f6ebb",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "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",\r
         "comments": "",\r
-        "x": 628.6666564941406,\r
-        "y": 1039.416741847992,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 669.639274597168,\r
+        "y": 765.3856935501099,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3e4d1bd.80fd7",\r
+        "id": "5fa8f00b.d8012",\r
         "type": "set",\r
         "name": "set vf-module-oper-status to PendingDelete",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
-        "x": 684.1467742919922,\r
-        "y": 1089.0039992332458,\r
-        "z": "e3dba753.67e0f8",\r
+        "x": 721.1193695068359,\r
+        "y": 804.9730195999146,\r
+        "z": "ed1e44d2.195918",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index f28d9c2..b41efbc 100644 (file)
                             </set>\r
                         </outcome>\r
                     </switch>\r
-                    <switch test="`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tenant-id'`">\r
-                        <outcome value='true'>\r
-                            <set>\r
-                                <parameter name='prop.tenant-id' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\r
-                            </set>\r
-                        </outcome>\r
-                    </switch>\r
                 </block>\r
             </for>\r
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                 <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
             </execute>\r
             <set>\r
-                <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.`' />\r
-                <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.`' />\r
-                <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.`' />\r
-                <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.`' />\r
+                <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.`' />\r
+                <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.`' />\r
+                <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.`' />\r
+                <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.`' />\r
             </set>\r
             <set>\r
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
             <set>\r
-                <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' />\r
-                <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`' />\r
-                <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`' />\r
+                <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' />\r
+                <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`' />\r
+                <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`' />\r
             </set>\r
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \r
       key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r