peer wise testing issue fix

generated vnf-index is not updated in service data

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

Former-commit-id: 09b79f552d5f9a99991d3f9377c2fc77952368b7

2 files changed, 134 insertions, 130 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
index 7e74909c..af262892 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
@@ -1,36 +1,36 @@
 [

     {

-        "id": "ba2f1a27.8f7c88",

+        "id": "668a4a6a.11fb74",

         "type": "method",

         "name": "method vnf-topology-operation-vpn-site-resource-create",

         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",

         "comments": "",

         "outputs": 1,

-        "x": 233,

-        "y": 190.9999925820157,

-        "z": "bc55b65a.bac808",

+        "x": 260.0104064941406,

+        "y": 185.0104217529297,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "887ebd07.82fca"

+                "f0e43a5a.fb4558"

             ]

         ]

     },

     {

-        "id": "99a008b4.eb0bc8",

+        "id": "61b91100.d7ede",

         "type": "dgstart",

         "name": "DGSTART",

         "outputs": 1,

-        "x": 109.57138061523438,

-        "y": 43,

-        "z": "bc55b65a.bac808",

+        "x": 136.581787109375,

+        "y": 37.010429170913994,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "9964126a.58753"

+                "bc2b5176.73e7e"

             ]

         ]

     },

     {

-        "id": "9964126a.58753",

+        "id": "bc2b5176.73e7e",

         "type": "service-logic",

         "name": "GENERIC-RESOURCE-API ${project.version}",

         "module": "GENERIC-RESOURCE-API",

@@ -38,336 +38,337 @@
         "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": 211.85708618164062,

-        "y": 101.23810407798737,

-        "z": "bc55b65a.bac808",

+        "x": 238.86749267578125,

+        "y": 95.24853324890137,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "ba2f1a27.8f7c88"

+                "668a4a6a.11fb74"

             ]

         ]

     },

     {

-        "id": "887ebd07.82fca",

+        "id": "f0e43a5a.fb4558",

         "type": "block",

         "name": "block : atomic",

         "xml": "<block atomic=\"true\">",

         "atomic": "true",

         "outputs": 1,

-        "x": 213.23804473876953,

-        "y": 362.6666643349454,

-        "z": "bc55b65a.bac808",

+        "x": 240.24845123291016,

+        "y": 356.6770935058594,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "e036c242.ea2d7",

-                "8ac28eea.03b2e",

-                "bee946ca.5b9488",

-                "fa22ed9a.8f597",

-                "259c9f6d.05187",

-                "1c3377d1.23ec68",

-                "33f4194.b4adce6",

-                "cd58d769.440f18",

-                "50ac8040.e368f",

-                "82bd0bd5.564548"

+                "6dab251c.49205c",

+                "10940ab9.a5fb85",

+                "2aab9019.e3a45",

+                "be0c443b.256188",

+                "46389e76.c8e6",

+                "89f88258.b891f",

+                "dc405c48.cda4b",

+                "1170677a.a70a49",

+                "997721e4.3b61b",

+                "71ec508c.bf2e1",

+                "60143a97.af1404"

             ]

         ]

     },

     {

-        "id": "8ac28eea.03b2e",

+        "id": "10940ab9.a5fb85",

         "type": "set",

         "name": "set vnf-level-oper-status to Created",

         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",

         "comments": "",

-        "x": 647.3847961425781,

-        "y": 616.6705932617188,

-        "z": "bc55b65a.bac808",

+        "x": 674.3952026367188,

+        "y": 610.6810224326327,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "e036c242.ea2d7",

+        "id": "6dab251c.49205c",

         "type": "set",

         "name": "copy input data to service data",

         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",

         "comments": "",

-        "x": 639.2379837036133,

-        "y": 511.6668453216553,

-        "z": "bc55b65a.bac808",

+        "x": 666.2483901977539,

+        "y": 505.67727449256927,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "259c9f6d.05187",

+        "id": "46389e76.c8e6",

         "type": "execute",

         "name": "execute generate-vnf-index",

         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-index\"/>\n",

         "comments": "",

         "outputs": 1,

-        "x": 627.5714874267578,

-        "y": 461.33342933654785,

-        "z": "bc55b65a.bac808",

+        "x": 654.5818939208984,

+        "y": 455.34385850746185,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             []

         ]

     },

     {

-        "id": "4832dc07.c382d4",

+        "id": "60143a97.af1404",

         "type": "set",

         "name": "set vnf-index to service data",

         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\n",

         "comments": "",

-        "x": 638.5715637207031,

-        "y": 568.3334331512451,

-        "z": "bc55b65a.bac808",

+        "x": 665.5819702148438,

+        "y": 562.3438623221591,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "bee946ca.5b9488",

+        "id": "2aab9019.e3a45",

         "type": "switchNode",

         "name": "switch service-data.vnfs.vnf_length",

         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",

         "comments": "",

         "outputs": 1,

-        "x": 642.5713653564453,

-        "y": 241.3333559036255,

-        "z": "bc55b65a.bac808",

+        "x": 669.5817718505859,

+        "y": 235.34378507453948,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "b7b01487.9885f8",

-                "aecaf676.67f6b8"

+                "214b38d8.c822d8",

+                "308ac75b.244168"

             ]

         ]

     },

     {

-        "id": "b7b01487.9885f8",

+        "id": "214b38d8.c822d8",

         "type": "other",

         "name": "NULL",

         "xml": "<outcome value=''>\n",

         "comments": "",

         "outputs": 1,

-        "x": 877.2857513427734,

-        "y": 236.47617626190186,

-        "z": "bc55b65a.bac808",

+        "x": 904.2961578369141,

+        "y": 230.48660543281585,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "1f5394d7.70124b"

+                "bcebd76e.5a08d8"

             ]

         ]

     },

     {

-        "id": "1f5394d7.70124b",

+        "id": "bcebd76e.5a08d8",

         "type": "set",

         "name": "set vnf-index=0",

         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",

         "comments": "",

-        "x": 1037.5714569091797,

-        "y": 236.47626781463623,

-        "z": "bc55b65a.bac808",

+        "x": 1064.5818634033203,

+        "y": 230.48669698555022,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "aecaf676.67f6b8",

+        "id": "308ac75b.244168",

         "type": "other",

         "name": "other",

         "xml": "<outcome value='Other'>\n",

         "comments": "",

         "outputs": 1,

-        "x": 873.7142906188965,

-        "y": 269.76200771331787,

-        "z": "bc55b65a.bac808",

+        "x": 900.7246971130371,

+        "y": 263.77243688423187,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "6e2b33e1.03a57c"

+                "af41a2cb.7d1be"

             ]

         ]

     },

     {

-        "id": "bd7ad864.5375c8",

+        "id": "c6ca1095.8fc32",

         "type": "set",

         "name": "set vnf-index = vnf_length",

         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",

         "comments": "",

-        "x": 1266.571533203125,

-        "y": 248.04773330688477,

-        "z": "bc55b65a.bac808",

+        "x": 1293.5819396972656,

+        "y": 242.05816247779876,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "d9951812.e7fdb8",

+        "id": "c1df9f5.ae8c56",

         "type": "for",

         "name": "for each existing VNF",

         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",

         "comments": "",

         "outputs": 1,

-        "x": 1255.0001525878906,

-        "y": 283.04770517349243,

-        "z": "bc55b65a.bac808",

+        "x": 1282.0105590820312,

+        "y": 277.0581343444064,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "febea1ac.bb0d8"

+                "6e99eb9c.1d2854"

             ]

         ]

     },

     {

-        "id": "6e2b33e1.03a57c",

+        "id": "af41a2cb.7d1be",

         "type": "block",

         "name": "block",

         "xml": "<block>\n",

         "atomic": "false",

         "comments": "",

         "outputs": 1,

-        "x": 1008.4285736083984,

-        "y": 271.76197719573975,

-        "z": "bc55b65a.bac808",

+        "x": 1035.438980102539,

+        "y": 265.77240636665374,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "bd7ad864.5375c8",

-                "d9951812.e7fdb8"

+                "c6ca1095.8fc32",

+                "c1df9f5.ae8c56"

             ]

         ]

     },

     {

-        "id": "febea1ac.bb0d8",

+        "id": "6e99eb9c.1d2854",

         "type": "switchNode",

         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",

         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",

         "comments": "",

         "outputs": 1,

-        "x": 1648.285888671875,

-        "y": 283.61918926239014,

-        "z": "bc55b65a.bac808",

+        "x": 1675.2962951660156,

+        "y": 277.62961843330413,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "359b5cad.1078a4"

+                "b8a872f3.280e3"

             ]

         ]

     },

     {

-        "id": "359b5cad.1078a4",

+        "id": "b8a872f3.280e3",

         "type": "outcomeTrue",

         "name": "true",

         "xml": "<outcome value='true'>\n",

         "comments": "",

         "outputs": 1,

-        "x": 1929.571590423584,

-        "y": 282.19059467315674,

-        "z": "bc55b65a.bac808",

+        "x": 1956.5819969177246,

+        "y": 276.20102384407073,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             [

-                "e5d5a5d7.361b48"

+                "2b05b5cd.40cb0a"

             ]

         ]

     },

     {

-        "id": "fe823586.a40dc8",

+        "id": "1bd5d19c.ac71ae",

         "type": "comment",

         "name": "make sure this vnf-id doesn't exist already",

         "info": "",

         "comments": "",

-        "x": 1617.4285049438477,

-        "y": 247.1905813217163,

-        "z": "bc55b65a.bac808",

+        "x": 1644.4389114379883,

+        "y": 241.2010104926303,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "fa22ed9a.8f597",

+        "id": "be0c443b.256188",

         "type": "set",

         "name": "set new vnf_length",

         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",

         "comments": "",

-        "x": 599.5714874267578,

-        "y": 409.33342599868774,

-        "z": "bc55b65a.bac808",

+        "x": 626.5818939208984,

+        "y": 403.34385516960174,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "1c3377d1.23ec68",

+        "id": "89f88258.b891f",

         "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": 586.5714492797852,

-        "y": 879.59694480896,

-        "z": "bc55b65a.bac808",

+        "x": 613.5818557739258,

+        "y": 873.607373979874,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "82bd0bd5.564548",

+        "id": "71ec508c.bf2e1",

         "type": "save",

         "name": "save service relationship in AAI",

         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" />\n\n\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/vpn-resources/vpn-resource/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-resource.vpn-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" /-->",

         "comments": "",

         "outputs": 1,

-        "x": 649.2382202148438,

-        "y": 826.5968379974365,

-        "z": "bc55b65a.bac808",

+        "x": 676.2486267089844,

+        "y": 820.6072671683505,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             []

         ]

     },

     {

-        "id": "33f4194.b4adce6",

+        "id": "dc405c48.cda4b",

         "type": "set",

         "name": "set vnf-index and vnf-object-path",

         "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-index`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` \" />",

         "comments": "",

-        "x": 640.5714797973633,

-        "y": 657.5968637466431,

-        "z": "bc55b65a.bac808",

+        "x": 667.5818862915039,

+        "y": 651.6072929175571,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "cd58d769.440f18",

+        "id": "1170677a.a70a49",

         "type": "set",

         "name": "set vnf-request-input.",

         "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",

         "comments": "",

-        "x": 605.5711212158203,

-        "y": 360.3247985839844,

-        "z": "bc55b65a.bac808",

+        "x": 632.5815277099609,

+        "y": 354.33522775489837,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "e5d5a5d7.361b48",

+        "id": "2b05b5cd.40cb0a",

         "type": "returnFailure",

         "name": "return failure",

         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",

         "comments": "",

-        "x": 2058.1429595947266,

-        "y": 333.1906089782715,

-        "z": "bc55b65a.bac808",

+        "x": 2085.153366088867,

+        "y": 327.2010381491855,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "b6f6713f.1cb83",

+        "id": "8463cd7c.a7a22",

         "type": "comment",

         "name": "Take the parameter names by removing prefix",

         "info": "",

         "comments": "",

-        "x": 1351.5715713500977,

-        "y": 336.66667556762695,

-        "z": "bc55b65a.bac808",

+        "x": 1378.5819778442383,

+        "y": 330.67710473854095,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "a6480f2e.967df",

+        "id": "ecfeb487.443888",

         "type": "comment",

         "name": "TODO: change AAI models",

         "info": "",

         "comments": "",

-        "x": 629.1820449829102,

-        "y": 726.9742965698242,

-        "z": "bc55b65a.bac808",

+        "x": 656.1924514770508,

+        "y": 720.9847257407382,

+        "z": "872ff8dd.fe5e78",

         "wires": []

     },

     {

-        "id": "50ac8040.e368f",

+        "id": "997721e4.3b61b",

         "type": "save",

         "name": "save AnAI - vnf-instance.orchestration-status",

         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-index\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",

         "comments": "",

         "outputs": 1,

-        "x": 695.545783996582,

-        "y": 767.2470808029175,

-        "z": "bc55b65a.bac808",

+        "x": 722.5561904907227,

+        "y": 761.2575099738315,

+        "z": "872ff8dd.fe5e78",

         "wires": [

             []

         ]

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
index 9fbcd8f2..f7847c7c 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
@@ -47,6 +47,9 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />

             </set>

             <set>

+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />

+            </set>

+            <set>

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />