X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fsdwan%2FGENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json;h=88c8553b1a5a31330f780fbcd161f049749c8bff;hb=37115b5eac1f20ea2093b523bc2eade32d689c09;hp=e8db0bf8b60366f55dd0bf43903aaad99b0638be;hpb=d6346ad42dca37c99773040d88b19227d80a26a6;p=sdnc%2Foam.git

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..88c8553b 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,35 @@
 [
     {
-        "id": "5892697a.9c21d8",
+        "id": "f25c52a5.c1512",
         "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": 431.0104064941406,
+        "y": 360.00000047683716,
+        "z": "3b61dfe7.30ac3",
         "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"
+                "b0ec8338.580f5",
+                "f7ddfb47.5b2f08",
+                "b17c2a0a.9c7048",
+                "b301b0b4.47969",
+                "75b3686.06a8798",
+                "eda7bf6a.a6768",
+                "1c914e3e.bd19d2",
+                "e8fbb993.4260a8",
+                "ce57fa36.d86878",
+                "67b336e3.64c8a8",
+                "393d128d.77829e",
+                "3dff4920.e6f876",
+                "1788c292.f60a9d"
             ]
         ]
     },
     {
-        "id": "309bc096.5fac7",
+        "id": "fd150a68.54b208",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -39,616 +37,514 @@
         "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": 273.0104217529297,
+        "y": 143.9999918937683,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "1f3522ef.5a48ed"
+                "58419eae.b9425"
             ]
         ]
     },
     {
-        "id": "1f3522ef.5a48ed",
+        "id": "58419eae.b9425",
         "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": 272.0104217529297,
+        "y": 243.9999918937683,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "5892697a.9c21d8"
+                "f25c52a5.c1512"
             ]
         ]
     },
     {
-        "id": "3582a035.23289",
+        "id": "c35c953.b5e8868",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153.53126525878906,
-        "y": 77.00000125169754,
-        "z": "c6a9f1ad.d0abe",
+        "x": 102.51042175292969,
+        "y": 54.99999952316284,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "309bc096.5fac7"
+                "fd150a68.54b208"
             ]
         ]
     },
     {
-        "id": "3419ca3e.28a196",
-        "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",
-        "wires": [
-            [
-                "e71de9cd.25e818"
-            ]
-        ]
-    },
-    {
-        "id": "e71de9cd.25e818",
-        "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",
-        "wires": [
-            [
-                "637c1185.e9ab2"
-            ]
-        ]
-    },
-    {
-        "id": "46c73b2c.401b84",
-        "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",
-        "wires": []
-    },
-    {
-        "id": "637c1185.e9ab2",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1252.6940803527832,
-        "y": 274.1627715229988,
-        "z": "c6a9f1ad.d0abe",
-        "wires": [
-            [
-                "46c73b2c.401b84"
-            ]
-        ]
-    },
-    {
-        "id": "6b48247.18bfcdc",
+        "id": "f7ddfb47.5b2f08",
         "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": 806.2606382369995,
+        "y": 368.6666796207428,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "de525177.578e5"
+                "fcacce0e.8c56d"
             ]
         ]
     },
     {
-        "id": "de525177.578e5",
+        "id": "fcacce0e.8c56d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1071.059799194336,
-        "y": 493.2222436070442,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1021.0389814376831,
+        "y": 366.2222635746002,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "f754a25f.6ce5b",
-                "a4e3fb1c.255518"
+                "e9bb9dc5.ab9e7",
+                "437b18ad.950888"
             ]
         ]
     },
     {
-        "id": "f754a25f.6ce5b",
+        "id": "e9bb9dc5.ab9e7",
         "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": 1217.295184135437,
+        "y": 343.9704020023346,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4e3fb1c.255518",
+        "id": "437b18ad.950888",
         "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": 1186.7396116256714,
+        "y": 380.9705183506012,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "af1423f9.97927",
+        "id": "7d6fd9af.e0a388",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 1240.2816581726074,
-        "y": 430.3333280682564,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1190.2608404159546,
+        "y": 303.3333480358124,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "18fb5a27.0012c6",
-        "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",
-        "wires": [
-            [
-                "f110968e.0e58a8"
-            ]
-        ]
-    },
-    {
-        "id": "f110968e.0e58a8",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 983.4479446411133,
-        "y": 228.33329325914383,
-        "z": "c6a9f1ad.d0abe",
-        "wires": [
-            [
-                "241d819c.c8566e"
-            ]
-        ]
-    },
-    {
-        "id": "241d819c.c8566e",
-        "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",
-        "wires": []
-    },
-    {
-        "id": "987ea69b.4f3758",
+        "id": "b0ec8338.580f5",
         "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": 788.0104370117188,
+        "y": 222.00001645088196,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "f6ea0a95.1bfcf8",
-                "7969b2ec.a074ec"
+                "e3d991cc.0551d",
+                "fab03553.0f6bc8"
             ]
         ]
     },
     {
-        "id": "f6ea0a95.1bfcf8",
+        "id": "e3d991cc.0551d",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.031265258789,
-        "y": 324.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1019.0104475021362,
+        "y": 198.000013589859,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "95e71927.be46c8"
+                "cd9f31aa.1f944"
             ]
         ]
     },
     {
-        "id": "7969b2ec.a074ec",
+        "id": "fab03553.0f6bc8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.031265258789,
-        "y": 364.999993622303,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1019.0104475021362,
+        "y": 238.000013589859,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "53dfed7f.4e81b4"
+                "9fa4f951.782718"
             ]
         ]
     },
     {
-        "id": "95e71927.be46c8",
+        "id": "cd9f31aa.1f944",
         "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": 1161.5104475021362,
+        "y": 198.000013589859,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "53dfed7f.4e81b4",
+        "id": "9fa4f951.782718",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1213.3883094787598,
-        "y": 364.9365056157112,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1163.367491722107,
+        "y": 237.9365255832672,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "bd7a9ede.140ae",
-                "804dd88d.6a51d8"
+                "f792bd90.84c2f",
+                "a00871e4.c717d"
             ]
         ]
     },
     {
-        "id": "804dd88d.6a51d8",
+        "id": "a00871e4.c717d",
         "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": 1316.0659666061401,
+        "y": 207.55562427593395,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "bd7a9ede.140ae",
+        "id": "f792bd90.84c2f",
         "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": 1372.4944715499878,
+        "y": 260.77775406837463,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "549e64ff.4f02fc"
+                "2a945efe.523112"
             ]
         ]
     },
     {
-        "id": "96b53f57.6e1a2",
+        "id": "a3b8abe8.a0e028",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1646.1660194396973,
-        "y": 346.0317915081978,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1596.1452016830444,
+        "y": 219.03181147575378,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "549e64ff.4f02fc",
+        "id": "2a945efe.523112",
         "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": 1647.780192375183,
+        "y": 260.3492567539215,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "789deb75.f505c4"
+                "f09636f3.8478b8"
             ]
         ]
     },
     {
-        "id": "789deb75.f505c4",
+        "id": "f09636f3.8478b8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1598.53120803833,
-        "y": 445.92066794633865,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1548.5103902816772,
+        "y": 318.92068791389465,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "60c9009a.34691"
+                "a87baae5.4ae3f8"
             ]
         ]
     },
     {
-        "id": "60c9009a.34691",
+        "id": "a87baae5.4ae3f8",
         "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": 1696.2604932785034,
+        "y": 318.77787998272106,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "4156b8b2.c36818",
+        "id": "eda7bf6a.a6768",
         "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": 801.8636274337769,
+        "y": 671.4962675571442,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "623a4487.e99e9c",
+        "id": "75b3686.06a8798",
         "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": 813.1971998214722,
+        "y": 624.162969827652,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fd7b0fa.16e31",
+        "id": "b301b0b4.47969",
         "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": 785.1972608566284,
+        "y": 575.162969827652,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "12914a5f.e6b036",
+        "id": "b17c2a0a.9c7048",
         "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": 785.1967878341675,
+        "y": 521.1542580127716,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "9723e968.8650b8",
+        "id": "1c914e3e.bd19d2",
         "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": 795.5106153488159,
+        "y": 769.0000886321068,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "64fa1f85.6660d",
+        "id": "3dff4920.e6f876",
         "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",
-        "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",
+        "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-uuid`' />\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": 849.0312213897705,
-        "y": 987.500047981739,
-        "z": "c6a9f1ad.d0abe",
+        "x": 802.0104761123657,
+        "y": 814.5000364780426,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
     },
     {
-        "id": "7be42a51.991f94",
+        "id": "e8fbb993.4260a8",
         "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": 749.732949256897,
+        "y": 907.6739270687103,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "4a04380d.9f4fa8",
+        "id": "ce57fa36.d86878",
         "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": 813.2643537521362,
+        "y": 457.50392746925354,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "b830a75.ba7e858"
+                "e6621181.b6207"
             ]
         ]
     },
     {
-        "id": "b830a75.ba7e858",
+        "id": "e6621181.b6207",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1150.5080490112305,
-        "y": 584.726221382618,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1100.4872312545776,
+        "y": 457.72624135017395,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "e85749e.f646cb8",
-                "44026e82.c4236"
+                "cf9839cf.8bf478",
+                "7fad1cad.2e9334"
             ]
         ]
     },
     {
-        "id": "e85749e.f646cb8",
+        "id": "cf9839cf.8bf478",
         "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": 1288.70907497406,
+        "y": 440.0595455169678,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "b01f15f5.803658"
+                "2663612d.85d52e"
             ]
         ]
     },
     {
-        "id": "44026e82.c4236",
+        "id": "7fad1cad.2e9334",
         "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": 1299.5487356185913,
+        "y": 480.05954360961914,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "9f894ed7.8915b"
+                "1951da82.25c5f5"
             ]
         ]
     },
     {
-        "id": "b01f15f5.803658",
+        "id": "2663612d.85d52e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1525.729892730713,
-        "y": 563.0595255494118,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1475.70907497406,
+        "y": 436.0595455169678,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "e28f739a.4fef3"
+                "e034463.55bd5b8"
             ]
         ]
     },
     {
-        "id": "9f894ed7.8915b",
+        "id": "1951da82.25c5f5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1519.5695533752441,
-        "y": 603.0595236420631,
-        "z": "c6a9f1ad.d0abe",
+        "x": 1469.5487356185913,
+        "y": 476.05954360961914,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             [
-                "3dd20fe.b268ef"
+                "18d6441f.f0cc5c"
             ]
         ]
     },
     {
-        "id": "e28f739a.4fef3",
+        "id": "e034463.55bd5b8",
         "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": 1625.709204673767,
+        "y": 434.65955209732056,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "3dd20fe.b268ef",
+        "id": "18d6441f.f0cc5c",
         "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": 1656.882176399231,
+        "y": 474.5207004547119,
+        "z": "3b61dfe7.30ac3",
         "wires": []
     },
     {
-        "id": "ea1ae816.a77cc8",
+        "id": "67b336e3.64c8a8",
         "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": 909.5142974853516,
+        "y": 148.00390934944153,
+        "z": "3b61dfe7.30ac3",
         "wires": [
             []
         ]
     },
     {
-        "id": "43b512b5.67ddbc",
+        "id": "393d128d.77829e",
         "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": 837.5313110351562,
-        "y": 847.0312881469727,
-        "z": "c6a9f1ad.d0abe",
+        "x": 787.5104932785034,
+        "y": 720.0313081145287,
+        "z": "3b61dfe7.30ac3",
         "wires": []
+    },
+    {
+        "id": "1788c292.f60a9d",
+        "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": 802.0105543136597,
+        "y": 862.0001776218414,
+        "z": "3b61dfe7.30ac3",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file