From 847da4acbcc8a828b186d119871edfde8459539c Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Sun, 14 Apr 2019 13:55:37 +0530
Subject: Fix SDWAN VPN-create DG to update relationship-list in AAI

update AAI with generic-vnf and sdwan-vpn relationship-list

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

Former-commit-id: 4b685f825bedb03d135f7f5c9b07f52efd718953
---
 ...RESOURCE-API_sdwan-vf-operation-vpn-create.json | 466 ++++++++++-----------
 ...-RESOURCE-API_sdwan-vf-operation-vpn-create.xml |   9 +-
 2 files changed, 235 insertions(+), 240 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main')

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 e8db0bf8..dd6f3215 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": "5892697a.9c21d8",
+        "id": "2de211e6.98e23e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 482.03125,
-        "y": 382.00000220537186,
-        "z": "c6a9f1ad.d0abe",
+        "x": 468,
+        "y": 381.0000009536743,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "3419ca3e.28a196",
-                "18fb5a27.0012c6",
-                "987ea69b.4f3758",
-                "6b48247.18bfcdc",
-                "12914a5f.e6b036",
-                "5fd7b0fa.16e31",
-                "623a4487.e99e9c",
-                "4156b8b2.c36818",
-                "9723e968.8650b8",
-                "7be42a51.991f94",
-                "4a04380d.9f4fa8",
-                "ea1ae816.a77cc8",
-                "43b512b5.67ddbc",
-                "64fa1f85.6660d",
-                "37949d89.629082"
+                "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"
             ]
         ]
     },
     {
-        "id": "309bc096.5fac7",
+        "id": "489fcd29.cfaa34",
         "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": 324.03126525878906,
-        "y": 165.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 310.00001525878906,
+        "y": 164.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "1f3522ef.5a48ed"
+                "105708eb.457607"
             ]
         ]
     },
     {
-        "id": "1f3522ef.5a48ed",
+        "id": "105708eb.457607",
         "type": "method",
         "name": "sdwan-vf-operation-vpn-create",
         "xml": "<method rpc='sdwan-vf-operation-vpn-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 323.03126525878906,
-        "y": 265.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 309.00001525878906,
+        "y": 264.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "5892697a.9c21d8"
+                "2de211e6.98e23e"
             ]
         ]
     },
     {
-        "id": "3582a035.23289",
+        "id": "a574a3fb.d3201",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153.53126525878906,
-        "y": 77.00000125169754,
-        "z": "c6a9f1ad.d0abe",
+        "x": 139.50001525878906,
+        "y": 76,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "309bc096.5fac7"
+                "489fcd29.cfaa34"
             ]
         ]
     },
     {
-        "id": "3419ca3e.28a196",
+        "id": "6436367.bae22c8",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 782.3606719970703,
-        "y": 273.49612647295,
-        "z": "c6a9f1ad.d0abe",
+        "x": 768.3294219970703,
+        "y": 272.49612522125244,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "e71de9cd.25e818"
+                "a118e404.bdd118"
             ]
         ]
     },
     {
-        "id": "e71de9cd.25e818",
+        "id": "a118e404.bdd118",
         "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": 1034.3607635498047,
-        "y": 272.1627896428108,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1020.3295135498047,
+        "y": 271.1627883911133,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "637c1185.e9ab2"
+                "40e93eeb.bac38"
             ]
         ]
     },
     {
-        "id": "46c73b2c.401b84",
+        "id": "948c1668.1af8e8",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n\n",
         "comments": "",
-        "x": 1406.0272521972656,
-        "y": 274.16279250383377,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1391.9960021972656,
+        "y": 273.16279125213623,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "637c1185.e9ab2",
+        "id": "40e93eeb.bac38",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1252.6940803527832,
-        "y": 274.1627715229988,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1238.6628303527832,
+        "y": 273.16277027130127,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "46c73b2c.401b84"
+                "948c1668.1af8e8"
             ]
         ]
     },
     {
-        "id": "6b48247.18bfcdc",
+        "id": "e7ab9a67.b605f8",
         "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": 856.2814559936523,
-        "y": 495.6666596531868,
-        "z": "c6a9f1ad.d0abe",
+        "x": 842.2502059936523,
+        "y": 494.66665840148926,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "de525177.578e5"
+                "62290f8b.75c82"
             ]
         ]
     },
     {
-        "id": "de525177.578e5",
+        "id": "62290f8b.75c82",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1071.059799194336,
-        "y": 493.2222436070442,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1057.028549194336,
+        "y": 492.2222423553467,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "f754a25f.6ce5b",
-                "a4e3fb1c.255518"
+                "59b05bb9.0b68b4",
+                "72944c92.a776a4"
             ]
         ]
     },
     {
-        "id": "f754a25f.6ce5b",
+        "id": "59b05bb9.0b68b4",
         "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": 1267.3160018920898,
-        "y": 470.9703820347786,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1253.2847518920898,
+        "y": 469.97038078308105,
+        "z": "f1f197ca.402af8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4e3fb1c.255518",
+        "id": "72944c92.a776a4",
         "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": 1236.7604293823242,
-        "y": 507.9704983830452,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1222.7291793823242,
+        "y": 506.97049713134766,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "af1423f9.97927",
+        "id": "d0552bf7.11fd78",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 1240.2816581726074,
-        "y": 430.3333280682564,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1226.2504081726074,
+        "y": 429.33332681655884,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "18fb5a27.0012c6",
+        "id": "1f79f37c.52109d",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 796.7812652587891,
-        "y": 228.99999552965164,
-        "z": "c6a9f1ad.d0abe",
+        "x": 782.7500152587891,
+        "y": 227.9999942779541,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "f110968e.0e58a8"
+                "f848aa6e.cfe238"
             ]
         ]
     },
     {
-        "id": "f110968e.0e58a8",
+        "id": "f848aa6e.cfe238",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 983.4479446411133,
-        "y": 228.33329325914383,
-        "z": "c6a9f1ad.d0abe",
+        "x": 969.4166946411133,
+        "y": 227.3332920074463,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "241d819c.c8566e"
+                "63764309.2b5d2c"
             ]
         ]
     },
     {
-        "id": "241d819c.c8566e",
+        "id": "63764309.2b5d2c",
         "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": 1165.1145706176758,
-        "y": 228.33329325914383,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1151.0833206176758,
+        "y": 227.3332920074463,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "987ea69b.4f3758",
+        "id": "86c4e83c.6dd4c8",
         "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": 838.0312547683716,
-        "y": 348.99999648332596,
-        "z": "c6a9f1ad.d0abe",
+        "x": 824.0000047683716,
+        "y": 347.9999952316284,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "f6ea0a95.1bfcf8",
-                "7969b2ec.a074ec"
+                "47ea1345.69aafc",
+                "1d47e1b9.b5ac9e"
             ]
         ]
     },
     {
-        "id": "f6ea0a95.1bfcf8",
+        "id": "47ea1345.69aafc",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.031265258789,
-        "y": 324.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1055.000015258789,
+        "y": 323.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "95e71927.be46c8"
+                "4b7cf824.56d218"
             ]
         ]
     },
     {
-        "id": "7969b2ec.a074ec",
+        "id": "1d47e1b9.b5ac9e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.031265258789,
-        "y": 364.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1055.000015258789,
+        "y": 363.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "53dfed7f.4e81b4"
+                "ff6c5552.af6328"
             ]
         ]
     },
     {
-        "id": "95e71927.be46c8",
+        "id": "4b7cf824.56d218",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1211.531265258789,
-        "y": 324.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1197.500015258789,
+        "y": 323.99999237060547,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "53dfed7f.4e81b4",
+        "id": "ff6c5552.af6328",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1213.3883094787598,
-        "y": 364.9365056157112,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1199.3570594787598,
+        "y": 363.9365043640137,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "bd7a9ede.140ae",
-                "804dd88d.6a51d8"
+                "34f94cf0.e3aea4",
+                "b3996c0f.5f9d2"
             ]
         ]
     },
     {
-        "id": "804dd88d.6a51d8",
+        "id": "b3996c0f.5f9d2",
         "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": 1366.086784362793,
-        "y": 334.55560430837795,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1352.055534362793,
+        "y": 333.5556030566804,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "bd7a9ede.140ae",
+        "id": "34f94cf0.e3aea4",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1422.5152893066406,
-        "y": 387.77773410081863,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1408.4840393066406,
+        "y": 386.7777328491211,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "549e64ff.4f02fc"
+                "441d1901.20ad48"
             ]
         ]
     },
     {
-        "id": "96b53f57.6e1a2",
+        "id": "f0d652ef.7b8d",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1646.1660194396973,
-        "y": 346.0317915081978,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1632.1347694396973,
+        "y": 345.03179025650024,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "549e64ff.4f02fc",
+        "id": "441d1901.20ad48",
         "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": 1697.801010131836,
-        "y": 387.3492367863655,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1683.769760131836,
+        "y": 386.34923553466797,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "789deb75.f505c4"
+                "d51340c3.db8f7"
             ]
         ]
     },
     {
-        "id": "789deb75.f505c4",
+        "id": "d51340c3.db8f7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1598.53120803833,
-        "y": 445.92066794633865,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1584.49995803833,
+        "y": 444.9206666946411,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "60c9009a.34691"
+                "20af1164.21510e"
             ]
         ]
     },
     {
-        "id": "60c9009a.34691",
+        "id": "20af1164.21510e",
         "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": 1746.2813110351562,
-        "y": 445.77786001516506,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1732.2500610351562,
+        "y": 444.7778587634675,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "4156b8b2.c36818",
+        "id": "240305a4.5a5a9a",
         "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": 851.8844451904297,
-        "y": 798.4962475895882,
-        "z": "c6a9f1ad.d0abe",
+        "x": 837.8531951904297,
+        "y": 797.4962463378906,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "623a4487.e99e9c",
+        "id": "944e3f22.30053",
         "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": 863.218017578125,
-        "y": 751.162949860096,
-        "z": "c6a9f1ad.d0abe",
+        "x": 849.186767578125,
+        "y": 750.1629486083984,
+        "z": "f1f197ca.402af8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fd7b0fa.16e31",
+        "id": "9465c248.bcdbd",
         "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": 835.2180786132812,
-        "y": 702.162949860096,
-        "z": "c6a9f1ad.d0abe",
+        "x": 821.1868286132812,
+        "y": 701.1629486083984,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "12914a5f.e6b036",
+        "id": "1d935a3c.53bb66",
         "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": 835.2176055908203,
-        "y": 648.1542380452156,
-        "z": "c6a9f1ad.d0abe",
+        "x": 821.1863555908203,
+        "y": 647.1542367935181,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "9723e968.8650b8",
+        "id": "5d2253aa.4bfbec",
         "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": 845.5314331054688,
-        "y": 896.0000686645508,
-        "z": "c6a9f1ad.d0abe",
+        "x": 831.5001831054688,
+        "y": 895.0000674128532,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "64fa1f85.6660d",
+        "id": "166cfcae.a53de3",
         "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": 852.0312938690186,
-        "y": 941.5000165104866,
-        "z": "c6a9f1ad.d0abe",
+        "x": 838.0000438690186,
+        "y": 940.5000152587891,
+        "z": "f1f197ca.402af8",
         "wires": [
             []
         ]
     },
     {
-        "id": "37949d89.629082",
-        "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\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource:relationship-list' \n      key='site-resource.site-resource-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-site\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-sites/sdwan-site/' + $prop.site-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.site-vf-index`\" /-->\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 849.0312213897705,
-        "y": 987.500047981739,
-        "z": "c6a9f1ad.d0abe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7be42a51.991f94",
+        "id": "b6ddeb01.d7f708",
         "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": 799.7537670135498,
-        "y": 1034.6739071011543,
-        "z": "c6a9f1ad.d0abe",
+        "x": 785.7225170135498,
+        "y": 1033.6739058494568,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "4a04380d.9f4fa8",
+        "id": "83d0d62b.725028",
         "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": 863.2851715087891,
-        "y": 584.5039075016975,
-        "z": "c6a9f1ad.d0abe",
+        "x": 849.2539215087891,
+        "y": 583.50390625,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "b830a75.ba7e858"
+                "4fef64f6.74978c"
             ]
         ]
     },
     {
-        "id": "b830a75.ba7e858",
+        "id": "4fef64f6.74978c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1150.5080490112305,
-        "y": 584.726221382618,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1136.4767990112305,
+        "y": 583.7262201309204,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "e85749e.f646cb8",
-                "44026e82.c4236"
+                "70539f79.6843b",
+                "69460cae.8c8bb4"
             ]
         ]
     },
     {
-        "id": "e85749e.f646cb8",
+        "id": "70539f79.6843b",
         "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": 1338.729892730713,
-        "y": 567.0595255494118,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1324.698642730713,
+        "y": 566.0595242977142,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "b01f15f5.803658"
+                "63c5ecf6.3d2174"
             ]
         ]
     },
     {
-        "id": "44026e82.c4236",
+        "id": "69460cae.8c8bb4",
         "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": 1349.5695533752441,
-        "y": 607.0595236420631,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1335.5383033752441,
+        "y": 606.0595223903656,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "9f894ed7.8915b"
+                "c6e54399.0667f"
             ]
         ]
     },
     {
-        "id": "b01f15f5.803658",
+        "id": "63c5ecf6.3d2174",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1525.729892730713,
-        "y": 563.0595255494118,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1511.698642730713,
+        "y": 562.0595242977142,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "e28f739a.4fef3"
+                "7b7eb3bd.411e2c"
             ]
         ]
     },
     {
-        "id": "9f894ed7.8915b",
+        "id": "c6e54399.0667f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1519.5695533752441,
-        "y": 603.0595236420631,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1505.5383033752441,
+        "y": 602.0595223903656,
+        "z": "f1f197ca.402af8",
         "wires": [
             [
-                "3dd20fe.b268ef"
+                "660aadb7.bbfbd4"
             ]
         ]
     },
     {
-        "id": "e28f739a.4fef3",
+        "id": "7b7eb3bd.411e2c",
         "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": 1675.73002243042,
-        "y": 561.6595321297646,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1661.69877243042,
+        "y": 560.659530878067,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "3dd20fe.b268ef",
+        "id": "660aadb7.bbfbd4",
         "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": 1706.9029941558838,
-        "y": 601.5206804871559,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1692.8717441558838,
+        "y": 600.5206792354584,
+        "z": "f1f197ca.402af8",
         "wires": []
     },
     {
-        "id": "ea1ae816.a77cc8",
+        "id": "8a6622c.9c3e9e",
         "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": 964.5351715087891,
-        "y": 174.00390750169754,
-        "z": "c6a9f1ad.d0abe",
+        "x": 950.5039215087891,
+        "y": 173.00390625,
+        "z": "f1f197ca.402af8",
         "wires": [
             []
         ]
     },
     {
-        "id": "43b512b5.67ddbc",
+        "id": "d3e9377a.b7b628",
         "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",
         "comments": "",
-        "x": 837.5313110351562,
-        "y": 847.0312881469727,
-        "z": "c6a9f1ad.d0abe",
+        "x": 823.5000610351562,
+        "y": 846.0312868952751,
+        "z": "f1f197ca.402af8",
         "wires": []
+    },
+    {
+        "id": "4cde94b6.d8700c",
+        "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",
+        "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 f352d1d3..3e5e8d90 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
@@ -128,9 +128,7 @@
                 <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' 
@@ -140,9 +138,6 @@
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-vpns/sdwan-vpn/' + $prop.vpn-vf-index`" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="sdwan-vpn.id" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vpn-vf-index`" />
-                <!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource:relationship-list' 
-      key='site-resource.site-resource-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' 
-      force="true" pfx="tmp.AnAI-data"><parameter name="relationship-list.relationship[0].related-to" value="sdwan-site" /><parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-sites/sdwan-site/' + $prop.site-vf-index`" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="sdwan-vpn.id" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.site-vf-index`" /-->
             </save>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
@@ -151,4 +146,4 @@
             </return>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
-- 
cgit 1.2.3-korg