From: prakash.e <prakash.e@huawei.com>
Date: Wed, 17 Apr 2019 10:07:12 +0000 (+0530)
Subject: updated generated vf-module-index parameter
X-Git-Tag: 1.5.1~27^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=076e731b54f12469f049037c447bfacb7760ab73

updated generated vf-module-index parameter

vf-module-id is assigned with correct parameter
prop.vpn-vf-index since vf-module-id is NULL in
response

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

Former-commit-id: f6b4d96d8938241d95c0f75f28444231ff425eae
---

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
index dd6f3215..475c093d 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
@@ -1,37 +1,37 @@
 [
     {
-        "id": "2de211e6.98e23e",
+        "id": "2464f2e7.0e2fce",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 468,
-        "y": 381.0000009536743,
-        "z": "f1f197ca.402af8",
+        "x": 450.00390625,
+        "y": 347.0000014305115,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "6436367.bae22c8",
-                "1f79f37c.52109d",
-                "86c4e83c.6dd4c8",
-                "e7ab9a67.b605f8",
-                "1d935a3c.53bb66",
-                "9465c248.bcdbd",
-                "944e3f22.30053",
-                "240305a4.5a5a9a",
-                "5d2253aa.4bfbec",
-                "b6ddeb01.d7f708",
-                "83d0d62b.725028",
-                "8a6622c.9c3e9e",
-                "d3e9377a.b7b628",
-                "166cfcae.a53de3",
-                "4cde94b6.d8700c"
+                "32c4b65c.2d59aa",
+                "5509b148.13914",
+                "aad7e68e.3b6ca8",
+                "94574a55.b19c88",
+                "7de1d3e.65c652c",
+                "7b54ca79.4bc724",
+                "e23c49d7.715338",
+                "a50b2df2.ad39e",
+                "e9af352a.620918",
+                "bbeb53a3.c2576",
+                "37a48c20.31bdf4",
+                "c012bd48.a280b",
+                "3e34e572.c1fb4a",
+                "83fb72db.90602",
+                "370a2393.20ff3c"
             ]
         ]
     },
     {
-        "id": "489fcd29.cfaa34",
+        "id": "4af2ac42.490d34",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -39,616 +39,616 @@
         "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": 310.00001525878906,
-        "y": 164.99999237060547,
-        "z": "f1f197ca.402af8",
+        "x": 292.00392150878906,
+        "y": 130.99999284744263,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "105708eb.457607"
+                "5b6c766c.98d2a8"
             ]
         ]
     },
     {
-        "id": "105708eb.457607",
+        "id": "5b6c766c.98d2a8",
         "type": "method",
         "name": "sdwan-vf-operation-vpn-create",
         "xml": "<method rpc='sdwan-vf-operation-vpn-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 309.00001525878906,
-        "y": 264.99999237060547,
-        "z": "f1f197ca.402af8",
+        "x": 291.00392150878906,
+        "y": 230.99999284744263,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "2de211e6.98e23e"
+                "2464f2e7.0e2fce"
             ]
         ]
     },
     {
-        "id": "a574a3fb.d3201",
+        "id": "4418c0ab.c80bf",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 139.50001525878906,
-        "y": 76,
-        "z": "f1f197ca.402af8",
+        "x": 121.50392150878906,
+        "y": 42.00000047683716,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "489fcd29.cfaa34"
+                "4af2ac42.490d34"
             ]
         ]
     },
     {
-        "id": "6436367.bae22c8",
+        "id": "32c4b65c.2d59aa",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 768.3294219970703,
-        "y": 272.49612522125244,
-        "z": "f1f197ca.402af8",
+        "x": 750.3333282470703,
+        "y": 238.4961256980896,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "a118e404.bdd118"
+                "3161e290.49fc4e"
             ]
         ]
     },
     {
-        "id": "a118e404.bdd118",
+        "id": "3161e290.49fc4e",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1020.3295135498047,
-        "y": 271.1627883911133,
-        "z": "f1f197ca.402af8",
+        "x": 1002.3334197998047,
+        "y": 237.16278886795044,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "40e93eeb.bac38"
+                "5b45671f.cd82a8"
             ]
         ]
     },
     {
-        "id": "948c1668.1af8e8",
+        "id": "e5b08bcc.460cf8",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n\n",
         "comments": "",
-        "x": 1391.9960021972656,
-        "y": 273.16279125213623,
-        "z": "f1f197ca.402af8",
+        "x": 1373.9999084472656,
+        "y": 239.1627917289734,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "40e93eeb.bac38",
+        "id": "5b45671f.cd82a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1238.6628303527832,
-        "y": 273.16277027130127,
-        "z": "f1f197ca.402af8",
+        "x": 1220.6667366027832,
+        "y": 239.16277074813843,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "948c1668.1af8e8"
+                "e5b08bcc.460cf8"
             ]
         ]
     },
     {
-        "id": "e7ab9a67.b605f8",
+        "id": "94574a55.b19c88",
         "type": "for",
         "name": "for loop idx - VF input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 842.2502059936523,
-        "y": 494.66665840148926,
-        "z": "f1f197ca.402af8",
+        "x": 824.2541122436523,
+        "y": 460.6666588783264,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "62290f8b.75c82"
+                "213647dd.26e428"
             ]
         ]
     },
     {
-        "id": "62290f8b.75c82",
+        "id": "213647dd.26e428",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1057.028549194336,
-        "y": 492.2222423553467,
-        "z": "f1f197ca.402af8",
+        "x": 1039.032455444336,
+        "y": 458.22224283218384,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "59b05bb9.0b68b4",
-                "72944c92.a776a4"
+                "501e761.bc5eb88",
+                "76a61aa5.aca9e4"
             ]
         ]
     },
     {
-        "id": "59b05bb9.0b68b4",
+        "id": "501e761.bc5eb88",
         "type": "execute",
         "name": "execute split parameterName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1253.2847518920898,
-        "y": 469.97038078308105,
-        "z": "f1f197ca.402af8",
+        "x": 1235.2886581420898,
+        "y": 435.9703812599182,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             []
         ]
     },
     {
-        "id": "72944c92.a776a4",
+        "id": "76a61aa5.aca9e4",
         "type": "set",
         "name": "set parameterName",
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
         "comments": "",
-        "x": 1222.7291793823242,
-        "y": 506.97049713134766,
-        "z": "f1f197ca.402af8",
+        "x": 1204.7330856323242,
+        "y": 472.9704976081848,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "d0552bf7.11fd78",
+        "id": "801b9de7.f8983",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 1226.2504081726074,
-        "y": 429.33332681655884,
-        "z": "f1f197ca.402af8",
+        "x": 1208.2543144226074,
+        "y": 395.333327293396,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "1f79f37c.52109d",
+        "id": "5509b148.13914",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 782.7500152587891,
-        "y": 227.9999942779541,
-        "z": "f1f197ca.402af8",
+        "x": 764.7539215087891,
+        "y": 193.99999475479126,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "f848aa6e.cfe238"
+                "1afa6ba0.b560d4"
             ]
         ]
     },
     {
-        "id": "f848aa6e.cfe238",
+        "id": "1afa6ba0.b560d4",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 969.4166946411133,
-        "y": 227.3332920074463,
-        "z": "f1f197ca.402af8",
+        "x": 951.4206008911133,
+        "y": 193.33329248428345,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "63764309.2b5d2c"
+                "f6ded972.6369c8"
             ]
         ]
     },
     {
-        "id": "63764309.2b5d2c",
+        "id": "f6ded972.6369c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",
         "comments": "",
-        "x": 1151.0833206176758,
-        "y": 227.3332920074463,
-        "z": "f1f197ca.402af8",
+        "x": 1133.0872268676758,
+        "y": 193.33329248428345,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "86c4e83c.6dd4c8",
+        "id": "aad7e68e.3b6ca8",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 824.0000047683716,
-        "y": 347.9999952316284,
-        "z": "f1f197ca.402af8",
+        "x": 806.0039110183716,
+        "y": 313.9999957084656,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "47ea1345.69aafc",
-                "1d47e1b9.b5ac9e"
+                "e139df7a.80637",
+                "caf10502.734168"
             ]
         ]
     },
     {
-        "id": "47ea1345.69aafc",
+        "id": "e139df7a.80637",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1055.000015258789,
-        "y": 323.99999237060547,
-        "z": "f1f197ca.402af8",
+        "x": 1037.003921508789,
+        "y": 289.9999928474426,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "4b7cf824.56d218"
+                "b4a2933f.20169"
             ]
         ]
     },
     {
-        "id": "1d47e1b9.b5ac9e",
+        "id": "caf10502.734168",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1055.000015258789,
-        "y": 363.99999237060547,
-        "z": "f1f197ca.402af8",
+        "x": 1037.003921508789,
+        "y": 329.9999928474426,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "ff6c5552.af6328"
+                "63770f1.c37c1f"
             ]
         ]
     },
     {
-        "id": "4b7cf824.56d218",
+        "id": "b4a2933f.20169",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1197.500015258789,
-        "y": 323.99999237060547,
-        "z": "f1f197ca.402af8",
+        "x": 1179.503921508789,
+        "y": 289.9999928474426,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "ff6c5552.af6328",
+        "id": "63770f1.c37c1f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1199.3570594787598,
-        "y": 363.9365043640137,
-        "z": "f1f197ca.402af8",
+        "x": 1181.3609657287598,
+        "y": 329.93650484085083,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "34f94cf0.e3aea4",
-                "b3996c0f.5f9d2"
+                "82e73ea.9f6d1c",
+                "facab090.c3497"
             ]
         ]
     },
     {
-        "id": "b3996c0f.5f9d2",
+        "id": "facab090.c3497",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
         "comments": "",
-        "x": 1352.055534362793,
-        "y": 333.5556030566804,
-        "z": "f1f197ca.402af8",
+        "x": 1334.059440612793,
+        "y": 299.55560353351757,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "34f94cf0.e3aea4",
+        "id": "82e73ea.9f6d1c",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1408.4840393066406,
-        "y": 386.7777328491211,
-        "z": "f1f197ca.402af8",
+        "x": 1390.4879455566406,
+        "y": 352.77773332595825,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "441d1901.20ad48"
+                "df7833b0.b66c4"
             ]
         ]
     },
     {
-        "id": "f0d652ef.7b8d",
+        "id": "f1cb1fc.e0fb2e",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1632.1347694396973,
-        "y": 345.03179025650024,
-        "z": "f1f197ca.402af8",
+        "x": 1614.1386756896973,
+        "y": 311.0317907333374,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "441d1901.20ad48",
+        "id": "df7833b0.b66c4",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1683.769760131836,
-        "y": 386.34923553466797,
-        "z": "f1f197ca.402af8",
+        "x": 1665.773666381836,
+        "y": 352.3492360115051,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "d51340c3.db8f7"
+                "f0bc8641.c01b88"
             ]
         ]
     },
     {
-        "id": "d51340c3.db8f7",
+        "id": "f0bc8641.c01b88",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1584.49995803833,
-        "y": 444.9206666946411,
-        "z": "f1f197ca.402af8",
+        "x": 1566.50386428833,
+        "y": 410.92066717147827,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "20af1164.21510e"
+                "ac9ea707.076ba8"
             ]
         ]
     },
     {
-        "id": "20af1164.21510e",
+        "id": "ac9ea707.076ba8",
         "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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
         "comments": "",
-        "x": 1732.2500610351562,
-        "y": 444.7778587634675,
-        "z": "f1f197ca.402af8",
+        "x": 1714.2539672851562,
+        "y": 410.7778592403047,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "240305a4.5a5a9a",
+        "id": "a50b2df2.ad39e",
         "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[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].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[$vf-index].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[$vf-index].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[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n\n",
         "comments": "",
-        "x": 837.8531951904297,
-        "y": 797.4962463378906,
-        "z": "f1f197ca.402af8",
+        "x": 819.8571014404297,
+        "y": 763.4962468147278,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "944e3f22.30053",
+        "id": "e23c49d7.715338",
         "type": "execute",
         "name": "execute generate-vf-module-index",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 849.186767578125,
-        "y": 750.1629486083984,
-        "z": "f1f197ca.402af8",
+        "x": 831.190673828125,
+        "y": 716.1629490852356,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             []
         ]
     },
     {
-        "id": "9465c248.bcdbd",
+        "id": "7b54ca79.4bc724",
         "type": "set",
         "name": "set new vf-module_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
         "comments": "",
-        "x": 821.1868286132812,
-        "y": 701.1629486083984,
-        "z": "f1f197ca.402af8",
+        "x": 803.1907348632812,
+        "y": 667.1629490852356,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "1d935a3c.53bb66",
+        "id": "7de1d3e.65c652c",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
         "comments": "",
-        "x": 821.1863555908203,
-        "y": 647.1542367935181,
-        "z": "f1f197ca.402af8",
+        "x": 803.1902618408203,
+        "y": 613.1542372703552,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "5d2253aa.4bfbec",
+        "id": "e9af352a.620918",
         "type": "set",
         "name": "set vf-module-level-oper-status",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].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[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
         "comments": "",
-        "x": 831.5001831054688,
-        "y": 895.0000674128532,
-        "z": "f1f197ca.402af8",
+        "x": 813.5040893554688,
+        "y": 861.0000678896904,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "166cfcae.a53de3",
+        "id": "83fb72db.90602",
         "type": "save",
         "name": "save sdwan vpn resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $prop.vpn-vf-index' >\n<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />\n<parameter name='sdwan-vpn-name' value='`$prop.name`' />\n<parameter name='topology' value='`$prop.topology`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.0000438690186,
-        "y": 940.5000152587891,
-        "z": "f1f197ca.402af8",
+        "x": 820.0039501190186,
+        "y": 906.5000157356262,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             []
         ]
     },
     {
-        "id": "b6ddeb01.d7f708",
+        "id": "bbeb53a3.c2576",
         "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": 785.7225170135498,
-        "y": 1033.6739058494568,
-        "z": "f1f197ca.402af8",
+        "x": 767.7264232635498,
+        "y": 999.673906326294,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "83d0d62b.725028",
+        "id": "37a48c20.31bdf4",
         "type": "for",
         "name": "for loop i - Network input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 849.2539215087891,
-        "y": 583.50390625,
-        "z": "f1f197ca.402af8",
+        "x": 831.2578277587891,
+        "y": 549.5039067268372,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "4fef64f6.74978c"
+                "4c79fd81.204e24"
             ]
         ]
     },
     {
-        "id": "4fef64f6.74978c",
+        "id": "4c79fd81.204e24",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1136.4767990112305,
-        "y": 583.7262201309204,
-        "z": "f1f197ca.402af8",
+        "x": 1118.4807052612305,
+        "y": 549.7262206077576,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "70539f79.6843b",
-                "69460cae.8c8bb4"
+                "6ee57e2b.017f1",
+                "6d15949f.a4f72c"
             ]
         ]
     },
     {
-        "id": "70539f79.6843b",
+        "id": "6ee57e2b.017f1",
         "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\n",
         "comments": "",
         "outputs": 1,
-        "x": 1324.698642730713,
-        "y": 566.0595242977142,
-        "z": "f1f197ca.402af8",
+        "x": 1306.702548980713,
+        "y": 532.0595247745514,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "63c5ecf6.3d2174"
+                "3f65f879.eac058"
             ]
         ]
     },
     {
-        "id": "69460cae.8c8bb4",
+        "id": "6d15949f.a4f72c",
         "type": "switchNode",
         "name": "switch topology",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 1335.5383033752441,
-        "y": 606.0595223903656,
-        "z": "f1f197ca.402af8",
+        "x": 1317.5422096252441,
+        "y": 572.0595228672028,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "c6e54399.0667f"
+                "a2b79be1.ed04c8"
             ]
         ]
     },
     {
-        "id": "63c5ecf6.3d2174",
+        "id": "3f65f879.eac058",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1511.698642730713,
-        "y": 562.0595242977142,
-        "z": "f1f197ca.402af8",
+        "x": 1493.702548980713,
+        "y": 528.0595247745514,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "7b7eb3bd.411e2c"
+                "2305c57e.8cca7a"
             ]
         ]
     },
     {
-        "id": "c6e54399.0667f",
+        "id": "a2b79be1.ed04c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1505.5383033752441,
-        "y": 602.0595223903656,
-        "z": "f1f197ca.402af8",
+        "x": 1487.5422096252441,
+        "y": 568.0595228672028,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             [
-                "660aadb7.bbfbd4"
+                "4726038d.e1157c"
             ]
         ]
     },
     {
-        "id": "7b7eb3bd.411e2c",
+        "id": "2305c57e.8cca7a",
         "type": "set",
         "name": "set name",
         "xml": "<set>\n<parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n\n",
         "comments": "",
-        "x": 1661.69877243042,
-        "y": 560.659530878067,
-        "z": "f1f197ca.402af8",
+        "x": 1643.70267868042,
+        "y": 526.6595313549042,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "660aadb7.bbfbd4",
+        "id": "4726038d.e1157c",
         "type": "set",
         "name": "set topology",
         "xml": "<set>\n<parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1692.8717441558838,
-        "y": 600.5206792354584,
-        "z": "f1f197ca.402af8",
+        "x": 1674.8756504058838,
+        "y": 566.5206797122955,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "8a6622c.9c3e9e",
+        "id": "c012bd48.a280b",
         "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": 950.5039215087891,
-        "y": 173.00390625,
-        "z": "f1f197ca.402af8",
+        "x": 932.5078277587891,
+        "y": 139.00390672683716,
+        "z": "4e5f9446.b42e3c",
         "wires": [
             []
         ]
     },
     {
-        "id": "d3e9377a.b7b628",
+        "id": "3e34e572.c1fb4a",
         "type": "set",
         "name": "set vf-module-object-path",
-        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.site-vf-index`' />\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 + $prop.vpn-vf-index\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",
+        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />\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 + $prop.vpn-vf-index\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": 823.5000610351562,
-        "y": 846.0312868952751,
-        "z": "f1f197ca.402af8",
+        "x": 805.5039672851562,
+        "y": 812.0312873721123,
+        "z": "4e5f9446.b42e3c",
         "wires": []
     },
     {
-        "id": "4cde94b6.d8700c",
+        "id": "370a2393.20ff3c",
         "type": "save",
         "name": "save service relationship in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 838.0001220703125,
-        "y": 988.0001564025879,
-        "z": "f1f197ca.402af8",
+        "x": 820.0040283203125,
+        "y": 954.000156879425,
+        "z": "4e5f9446.b42e3c",
         "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-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
index 3e5e8d90..02a816bd 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
@@ -98,7 +98,7 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />
             </set>
             <set>
-                <parameter name='vf-module-id' value='`$prop.site-vf-index`' />
+                <parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $vf-module-topology-operation-input.service-information.service-instance-id
  + '/service-data/vnfs/vnf/'
@@ -128,7 +128,9 @@
                 <parameter name='sdwan-vpn-name' value='`$prop.name`' />
                 <parameter name='topology' value='`$prop.topology`' />
                 <parameter name='operational-status' value='Created' />
-                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' /><parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' /><parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' >
+                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
+                <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
+                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
@@ -146,4 +148,4 @@
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file