From 7a6f56d28e2fe013389e02ac0981ea5d9c300a8e Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Mon, 15 Apr 2019 16:51:39 +0530
Subject: Device input parameter processing failed

Input parameter processing failed, vf-module-topology-operation
is used instead of vf-module-request-input.

Change-Id: I578da11c6e0505ee67523504235a64169ccfe605
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 663dbb29fe1b5335eaa16646b8eb6eb42136595d
---
 ...OURCE-API_sdwan-get-vf-module-device-param.json | 410 ++++++++++-----------
 ...SOURCE-API_sdwan-get-vf-module-device-param.xml |  42 +--
 2 files changed, 226 insertions(+), 226 deletions(-)

(limited to 'platform-logic')

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-device-param.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-device-param.json
index 8a96be90..58a41b1d 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-device-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-device-param.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "5f7afc20.704254",
+        "id": "cffdc2c4.fbdbf",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 164.00390625,
-        "y": 81.99999871850014,
-        "z": "492d4750.cb7708",
+        "x": 124.01041412353516,
+        "y": 57.99999976158142,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "d406ff84.ce98e"
+                "b4bfaafb.0f71e8"
             ]
         ]
     },
     {
-        "id": "d406ff84.ce98e",
+        "id": "b4bfaafb.0f71e8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,530 +22,530 @@
         "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": 309.00391006469727,
-        "y": 163.00001588463783,
-        "z": "492d4750.cb7708",
+        "x": 269.0104179382324,
+        "y": 139.00001692771912,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "de9e8cab.e6f6e"
+                "453e787d.b31d18"
             ]
         ]
     },
     {
-        "id": "de9e8cab.e6f6e",
+        "id": "453e787d.b31d18",
         "type": "method",
         "name": "sdwan-get-vf-module-device-param",
         "xml": "<method rpc='sdwan-get-vf-module-device-param' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 297.0040283203125,
-        "y": 250.99999871850014,
-        "z": "492d4750.cb7708",
+        "x": 257.01053619384766,
+        "y": 226.99999976158142,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "d35337b3.c33088"
+                "28aec5b3.3630fa"
             ]
         ]
     },
     {
-        "id": "d35337b3.c33088",
+        "id": "28aec5b3.3630fa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 304.00392150878906,
-        "y": 337.00005689263344,
-        "z": "492d4750.cb7708",
+        "x": 264.0104293823242,
+        "y": 313.0000579357147,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "768c22f7.0cb24c"
+                "3c4212a4.68f13e"
             ]
         ]
     },
     {
-        "id": "768c22f7.0cb24c",
+        "id": "3c4212a4.68f13e",
         "type": "for",
         "name": "for each sdwan-get-request-input-param",
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 340.6706848144531,
-        "y": 419.66665330529213,
-        "z": "492d4750.cb7708",
+        "x": 300.6771926879883,
+        "y": 395.6666543483734,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "e9dd53c5.9b95c"
+                "bf653357.54774"
             ]
         ]
     },
     {
-        "id": "e9dd53c5.9b95c",
+        "id": "bf653357.54774",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 598.9982223510742,
-        "y": 415.99431481957436,
-        "z": "492d4750.cb7708",
+        "x": 559.0047302246094,
+        "y": 391.99431586265564,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "32b23dbd.651cc2",
-                "a532fa29.a02ba8",
-                "a0a56af7.f42cf8",
-                "9b473841.95e738",
-                "6e94beb9.da533",
-                "f818f130.64cf3",
-                "833242d8.e1a62",
-                "463a228c.d26a9c",
-                "e732bba8.4d48f8",
-                "88a6e509.9d3208",
-                "b49703f2.4b839"
+                "41b4a385.e5d2ec",
+                "1fe1f918.e55d47",
+                "bf373c84.0e6f1",
+                "8b025989.63feb8",
+                "2357be34.a97902",
+                "9db880c0.bf8f7",
+                "7eec8f37.33efd",
+                "467b2b94.aa5c94",
+                "3fbeca93.ab4dc6",
+                "d5cf0127.78745",
+                "7b1c3978.61d7b8"
             ]
         ]
     },
     {
-        "id": "32b23dbd.651cc2",
+        "id": "41b4a385.e5d2ec",
         "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": 806.4988403320312,
-        "y": 707.9948875010014,
-        "z": "492d4750.cb7708",
+        "x": 766.5053482055664,
+        "y": 683.9948885440826,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "a0a56af7.f42cf8",
+        "id": "bf373c84.0e6f1",
         "type": "switchNode",
         "name": "switch name",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 834.4979286193848,
-        "y": 260.9942981302738,
-        "z": "492d4750.cb7708",
+        "x": 794.5044364929199,
+        "y": 236.9942991733551,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "46f8e7aa.98fa98"
+                "6a620d2a.597874"
             ]
         ]
     },
     {
-        "id": "46f8e7aa.98fa98",
+        "id": "6a620d2a.597874",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 976.4979286193848,
-        "y": 261.9942981302738,
-        "z": "492d4750.cb7708",
+        "x": 936.5044364929199,
+        "y": 237.9942991733551,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "f768ea22.72bf98"
+                "f9812259.af716"
             ]
         ]
     },
     {
-        "id": "f768ea22.72bf98",
+        "id": "f9812259.af716",
         "type": "set",
         "name": "set name",
-        "xml": "<set>\n<parameter name='prop.device.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.name' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1110.4979286193848,
-        "y": 262.59430423378944,
-        "z": "492d4750.cb7708",
+        "x": 1070.50443649292,
+        "y": 238.59430527687073,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "a532fa29.a02ba8",
+        "id": "1fe1f918.e55d47",
         "type": "switchNode",
         "name": "switch esn",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'esn'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'esn'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 827.3376741409302,
-        "y": 297.99423709511757,
-        "z": "492d4750.cb7708",
+        "x": 787.3441820144653,
+        "y": 273.99423813819885,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "12a81e82.d1a6f1"
+                "fec66c31.4ec21"
             ]
         ]
     },
     {
-        "id": "12a81e82.d1a6f1",
+        "id": "fec66c31.4ec21",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 971.3376741409302,
-        "y": 297.99423709511757,
-        "z": "492d4750.cb7708",
+        "x": 931.3441820144653,
+        "y": 273.99423813819885,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "a977ec3e.312ec"
+                "b1b392a1.773ab"
             ]
         ]
     },
     {
-        "id": "a977ec3e.312ec",
+        "id": "b1b392a1.773ab",
         "type": "set",
         "name": "set esn",
-        "xml": "<set>\n<parameter name='prop.device.esn' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.esn' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1091.6710481643677,
-        "y": 297.45541873574257,
-        "z": "492d4750.cb7708",
+        "x": 1051.6775560379028,
+        "y": 273.45541977882385,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "9b473841.95e738",
+        "id": "8b025989.63feb8",
         "type": "switchNode",
         "name": "switch type",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'type'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'type'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 815.3930940628052,
-        "y": 372.9571887552738,
-        "z": "492d4750.cb7708",
+        "x": 775.3996019363403,
+        "y": 348.9571897983551,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "3ec28d96.e420a2"
+                "d5158afa.ab5d38"
             ]
         ]
     },
     {
-        "id": "6e94beb9.da533",
+        "id": "2357be34.a97902",
         "type": "switchNode",
         "name": "switch systemIp",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'systemIp'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'systemIp'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 815.3931522369385,
-        "y": 464.9572059214115,
-        "z": "492d4750.cb7708",
+        "x": 775.3996601104736,
+        "y": 440.9572069644928,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "2adae6a4.285e7a"
+                "4fbf3414.5b4b2c"
             ]
         ]
     },
     {
-        "id": "3ec28d96.e420a2",
+        "id": "d5158afa.ab5d38",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 961.3930940628052,
-        "y": 372.9571887552738,
-        "z": "492d4750.cb7708",
+        "x": 921.3996019363403,
+        "y": 348.9571897983551,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "45b1ca2c.89f074"
+                "937f18ca.e72f08"
             ]
         ]
     },
     {
-        "id": "45b1ca2c.89f074",
+        "id": "937f18ca.e72f08",
         "type": "set",
         "name": "set type",
-        "xml": "<set>\n<parameter name='prop.device.deviceModel' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.deviceModel' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1092.3930940628052,
-        "y": 372.55719485878944,
-        "z": "492d4750.cb7708",
+        "x": 1052.3996019363403,
+        "y": 348.5571959018707,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "2adae6a4.285e7a",
+        "id": "4fbf3414.5b4b2c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 961.3931522369385,
-        "y": 461.9572059214115,
-        "z": "492d4750.cb7708",
+        "x": 921.3996601104736,
+        "y": 437.9572069644928,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "a141079c.b2f848"
+                "99d3dc8a.8d686"
             ]
         ]
     },
     {
-        "id": "a141079c.b2f848",
+        "id": "99d3dc8a.8d686",
         "type": "set",
         "name": "set systemIp",
-        "xml": "<set>\n<parameter name='prop.device.systemIP' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.systemIP' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1104.3931522369385,
-        "y": 460.55721202492714,
-        "z": "492d4750.cb7708",
+        "x": 1064.3996601104736,
+        "y": 436.5572130680084,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "c177b296.16b4e",
+        "id": "64458164.edc05",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 971.3931522369385,
-        "y": 497.9572059214115,
-        "z": "492d4750.cb7708",
+        "x": 931.3996601104736,
+        "y": 473.9572069644928,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "1718a85d.d8d638"
+                "780d1304.68cfdc"
             ]
         ]
     },
     {
-        "id": "f818f130.64cf3",
+        "id": "9db880c0.bf8f7",
         "type": "switchNode",
         "name": "switch description",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'description'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'description'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 817.3931522369385,
-        "y": 500.9572059214115,
-        "z": "492d4750.cb7708",
+        "x": 777.3996601104736,
+        "y": 476.9572069644928,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "c177b296.16b4e"
+                "64458164.edc05"
             ]
         ]
     },
     {
-        "id": "1718a85d.d8d638",
+        "id": "780d1304.68cfdc",
         "type": "set",
         "name": "set description",
-        "xml": "<set>\n<parameter name='prop.device.description' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.description' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1114.3931522369385,
-        "y": 496.55721202492714,
-        "z": "492d4750.cb7708",
+        "x": 1074.3996601104736,
+        "y": 472.5572130680084,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "833242d8.e1a62",
+        "id": "7eec8f37.33efd",
         "type": "switchNode",
         "name": "switch vendor",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vendor'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vendor'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 804.7264375686646,
-        "y": 547.9572402536869,
-        "z": "492d4750.cb7708",
+        "x": 764.7329454421997,
+        "y": 523.9572412967682,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "633adfee.bdc3d"
+                "3ba9d87b.54e468"
             ]
         ]
     },
     {
-        "id": "633adfee.bdc3d",
+        "id": "3ba9d87b.54e468",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 972.7263956069946,
-        "y": 544.9571811258793,
-        "z": "492d4750.cb7708",
+        "x": 932.7329034805298,
+        "y": 520.9571821689606,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "630caf06.a577a"
+                "b42adfe3.2b292"
             ]
         ]
     },
     {
-        "id": "630caf06.a577a",
+        "id": "b42adfe3.2b292",
         "type": "set",
         "name": "set vendor",
-        "xml": "<set>\n<parameter name='prop.device.vendor' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.vendor' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1115.7263956069946,
-        "y": 543.5571872293949,
-        "z": "492d4750.cb7708",
+        "x": 1075.7329034805298,
+        "y": 519.5571882724762,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "463a228c.d26a9c",
+        "id": "467b2b94.aa5c94",
         "type": "switchNode",
         "name": "switch class",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'class'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'class'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 828.4978942871094,
-        "y": 334.99424281716347,
-        "z": "492d4750.cb7708",
+        "x": 788.5044021606445,
+        "y": 310.99424386024475,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "b2250b2e.750348"
+                "1374fbc3.377814"
             ]
         ]
     },
     {
-        "id": "b2250b2e.750348",
+        "id": "1374fbc3.377814",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 972.4978942871094,
-        "y": 334.99424281716347,
-        "z": "492d4750.cb7708",
+        "x": 932.5044021606445,
+        "y": 310.99424386024475,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "810d94ea.a48138"
+                "65bf8c61.fb2dd4"
             ]
         ]
     },
     {
-        "id": "810d94ea.a48138",
+        "id": "65bf8c61.fb2dd4",
         "type": "set",
         "name": "set class",
-        "xml": "<set>\n<parameter name='prop.device.class' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.class' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1092.8312683105469,
-        "y": 334.45542445778847,
-        "z": "492d4750.cb7708",
+        "x": 1052.837776184082,
+        "y": 310.45542550086975,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "e732bba8.4d48f8",
+        "id": "3fbeca93.ab4dc6",
         "type": "switchNode",
         "name": "switch version",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'version'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'version'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 826.4978942871094,
-        "y": 418.99424281716347,
-        "z": "492d4750.cb7708",
+        "x": 786.5044021606445,
+        "y": 394.99424386024475,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "3d7ee8b7.466ab8"
+                "e80bbd64.2da17"
             ]
         ]
     },
     {
-        "id": "3d7ee8b7.466ab8",
+        "id": "e80bbd64.2da17",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 972.4978942871094,
-        "y": 415.99424281716347,
-        "z": "492d4750.cb7708",
+        "x": 932.5044021606445,
+        "y": 391.99424386024475,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "314ae7d6.dc68d8"
+                "ae63bef3.fee2"
             ]
         ]
     },
     {
-        "id": "314ae7d6.dc68d8",
+        "id": "ae63bef3.fee2",
         "type": "set",
         "name": "set version",
-        "xml": "<set>\n<parameter name='prop.device.version' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.version' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1115.4978942871094,
-        "y": 414.5942489206791,
-        "z": "492d4750.cb7708",
+        "x": 1075.5044021606445,
+        "y": 390.5942499637604,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "88a6e509.9d3208",
+        "id": "d5cf0127.78745",
         "type": "switchNode",
         "name": "switch deviceId",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'deviceId'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'deviceId'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 818.4979629516602,
-        "y": 594.9942914545536,
-        "z": "492d4750.cb7708",
+        "x": 778.5044708251953,
+        "y": 570.9942924976349,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "46303600.72a7ac"
+                "e706a464.a35a88"
             ]
         ]
     },
     {
-        "id": "46303600.72a7ac",
+        "id": "e706a464.a35a88",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 974.4980506896973,
-        "y": 590.9943362772465,
-        "z": "492d4750.cb7708",
+        "x": 934.5045585632324,
+        "y": 566.9943373203278,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "ba71d8b.57ad228"
+                "27f4849e.3602dc"
             ]
         ]
     },
     {
-        "id": "ba71d8b.57ad228",
+        "id": "27f4849e.3602dc",
         "type": "set",
         "name": "set deviceId",
-        "xml": "<set>\n<parameter name='prop.device.deviceId' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.deviceId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1112.8317985534668,
-        "y": 579.4554721415043,
-        "z": "492d4750.cb7708",
+        "x": 1072.838306427002,
+        "y": 555.4554731845856,
+        "z": "620142f.05634bc",
         "wires": []
     },
     {
-        "id": "b49703f2.4b839",
+        "id": "7b1c3978.61d7b8",
         "type": "switchNode",
         "name": "switch sdncCreate",
-        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'sdncCreate'`\">\n",
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'sdncCreate'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 813.497917175293,
-        "y": 640.9942537844181,
-        "z": "492d4750.cb7708",
+        "x": 773.5044250488281,
+        "y": 616.9942548274994,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "7e203582.a2c85c"
+                "2dbb36e3.798f8a"
             ]
         ]
     },
     {
-        "id": "7e203582.a2c85c",
+        "id": "2dbb36e3.798f8a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.4979782104492,
-        "y": 637.9943148195744,
-        "z": "492d4750.cb7708",
+        "x": 938.5044860839844,
+        "y": 613.9943158626556,
+        "z": "620142f.05634bc",
         "wires": [
             [
-                "840a186.e7a4be8"
+                "a093edec.c8fe5"
             ]
         ]
     },
     {
-        "id": "840a186.e7a4be8",
+        "id": "a093edec.c8fe5",
         "type": "set",
         "name": "set sdncCreate",
-        "xml": "<set>\n<parameter name='prop.device.sdncCreate' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "xml": "<set>\n<parameter name='prop.device.sdncCreate' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1127.8317184448242,
-        "y": 636.4554354250431,
-        "z": "492d4750.cb7708",
+        "x": 1087.8382263183594,
+        "y": 612.4554364681244,
+        "z": "620142f.05634bc",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-device-param.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-device-param.xml
index ddafa01b..c8ecd153 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-device-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-device-param.xml
@@ -3,75 +3,75 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
     <method rpc='sdwan-get-vf-module-device-param' mode='sync'>
         <block atomic="true">
-            <for index="idx" start="0" end="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">
+            <for index="idx" start="0" end="`$vf-module-request-input.vf-module-input-parameters.param_length`">
                 <block>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.name' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'esn'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'esn'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.esn' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.esn' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'class'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'class'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.class' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.class' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'type'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'type'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.deviceModel' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.deviceModel' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'version'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'version'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.version' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.version' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'systemIp'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'systemIp'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.systemIP' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.systemIP' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'description'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'description'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.description' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.description' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vendor'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vendor'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.vendor' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.vendor' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'deviceId'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'deviceId'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.deviceId' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.deviceId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'sdncCreate'`">
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'sdncCreate'`">
                         <outcome value='true'>
                             <set>
-                                <parameter name='prop.device.sdncCreate' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+                                <parameter name='prop.device.sdncCreate' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />
                             </set>
                         </outcome>
                     </switch>
-- 
cgit 1.2.3-korg