Fix SDWAN VPN-create DG to update relationship-list in AAI 63/85263/2
authorprakash.e <prakash.e@huawei.com>
Sun, 14 Apr 2019 08:25:37 +0000 (13:55 +0530)
committerprakash.e <prakash.e@huawei.com>
Sun, 14 Apr 2019 08:33:00 +0000 (14:03 +0530)
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

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml

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