SDWAN WAN port create exception issue fix 09/85809/4
authorshashikanth.vh <shashikanth.vh@huawei.com>
Fri, 19 Apr 2019 11:32:30 +0000 (11:32 +0000)
committerShashikanth VH <shashikanth.vh@huawei.com>
Wed, 24 Apr 2019 11:24:38 +0000 (11:24 +0000)
1.Generated vf module id not updated in service data
2.site-resource vnf relation-ship should be with wan-port-config
  and not with sdwan-vpn

Change-Id: Ie5c153eb35799d93719b277492f43a5f3723e93d
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 0c8135ecd3666e8502122ebd622dd67930da4f00

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

index f862a2d..c339883 100644 (file)
@@ -1,6 +1,6 @@
 [\r
     {\r
-        "id": "bc28da2b.7303d8",\r
+        "id": "5de743a6.6e9fdc",\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": 323.0104064941406,\r
-        "y": 132.99999237060547,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 292.03125,\r
+        "y": 127.03125,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "dad83918.445348"\r
+                "831852f4.73c97"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dad83918.445348",\r
+        "id": "831852f4.73c97",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-wanport-create",\r
         "xml": "<method rpc='sdwan-vf-operation-wanport-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 322.0104064941406,\r
-        "y": 232.99999237060547,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 291.03125,\r
+        "y": 227.03125,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "ffb1ada3.8a76c"\r
+                "f0bca81d.b6a0f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55cf0e90.e3564",\r
+        "id": "8410a95b.8b6678",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 179.51040267944336,\r
-        "y": 42,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 148.53124618530273,\r
+        "y": 36.03125762939453,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "bc28da2b.7303d8"\r
+                "5de743a6.6e9fdc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffb1ada3.8a76c",\r
+        "id": "f0bca81d.b6a0f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 481.01039123535156,\r
-        "y": 349.0000009536743,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 450.03123474121094,\r
+        "y": 343.03125858306885,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "470949db.a87688",\r
-                "1946860c.52d49a",\r
-                "986d9d2e.d652e",\r
-                "176bae50.e7ba42",\r
-                "1c96aac1.62b6a5",\r
-                "d12731ca.f4e9a",\r
-                "ad8e03c8.3f99",\r
-                "99ca206c.689c4",\r
-                "45a27310.e17b0c",\r
-                "98b0c583.6fb0e8",\r
-                "f3463186.010ce",\r
-                "4efead29.a28254",\r
-                "187c318b.c5572e",\r
-                "29c03152.ef4a3e"\r
+                "54bfa066.4da69",\r
+                "1eb4450c.b37a3b",\r
+                "ff1f4bbb.9c88d8",\r
+                "262e8a6c.764e06",\r
+                "1438dd60.41b403",\r
+                "fa6eaef6.2d96",\r
+                "fdda37d.d3044c8",\r
+                "9b9a9c47.ff729",\r
+                "89e460e0.31c23",\r
+                "cf5e55a3.da5e38",\r
+                "3ce6fee1.f7c372",\r
+                "37eaec79.c59c14",\r
+                "981dfc9a.eb48b",\r
+                "461f9f03.a33d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "470949db.a87688",\r
+        "id": "54bfa066.4da69",\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": 781.3398132324219,\r
-        "y": 240.49612522125244,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 750.3606567382812,\r
+        "y": 234.52738285064697,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "4bf0f7e7.44aea8"\r
+                "53ca6ad5.693354"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4bf0f7e7.44aea8",\r
+        "id": "53ca6ad5.693354",\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": 1033.3399047851562,\r
-        "y": 239.16278839111328,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1002.3607482910156,\r
+        "y": 233.1940460205078,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "3d05a6f7.8cda9a"\r
+                "3af25422.f8b80c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d918203.c2e31e",\r
+        "id": "61e228fb.8092e8",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1405.0063934326172,\r
-        "y": 241.16279125213623,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1374.0272369384766,\r
+        "y": 235.19404888153076,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d05a6f7.8cda9a",\r
+        "id": "3af25422.f8b80c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1251.6732215881348,\r
-        "y": 241.16277027130127,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1220.6940650939941,\r
+        "y": 235.1940279006958,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "d918203.c2e31e"\r
+                "61e228fb.8092e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "176bae50.e7ba42",\r
+        "id": "262e8a6c.764e06",\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": 855.2605972290039,\r
-        "y": 462.66665840148926,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 824.2814407348633,\r
+        "y": 456.6979160308838,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "18c22866.3fa9a8"\r
+                "6641b8fa.11e218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18c22866.3fa9a8",\r
+        "id": "6641b8fa.11e218",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1070.0389404296875,\r
-        "y": 460.2222423553467,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1039.0597839355469,\r
+        "y": 454.2534999847412,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "f7311df1.3a06f",\r
-                "eb8b9c09.06311"\r
+                "4c2187d7.70c4d8",\r
+                "32a53869.510578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7311df1.3a06f",\r
+        "id": "4c2187d7.70c4d8",\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": 1266.2951431274414,\r
-        "y": 437.97038078308105,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1235.3159866333008,\r
+        "y": 432.0016384124756,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "eb8b9c09.06311",\r
+        "id": "32a53869.510578",\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": 1235.7395706176758,\r
-        "y": 474.97049713134766,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1204.7604141235352,\r
+        "y": 469.0017547607422,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f77b19d7.8bb178",\r
+        "id": "ab557068.64844",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1239.260799407959,\r
-        "y": 397.33332681655884,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1208.2816429138184,\r
+        "y": 391.36458444595337,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1946860c.52d49a",\r
+        "id": "1eb4450c.b37a3b",\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": 795.7604064941406,\r
-        "y": 195.9999942779541,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 764.78125,\r
+        "y": 190.03125190734863,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "89c152d0.6fb2c"\r
+                "e279b1ab.b937f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89c152d0.6fb2c",\r
+        "id": "e279b1ab.b937f",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 982.4270858764648,\r
-        "y": 195.3332920074463,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 951.4479293823242,\r
+        "y": 189.36454963684082,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "869ba82c.b1cd68"\r
+                "c52a39f4.c6da18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "869ba82c.b1cd68",\r
+        "id": "c52a39f4.c6da18",\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": 1164.0937118530273,\r
-        "y": 195.3332920074463,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1133.1145553588867,\r
+        "y": 189.36454963684082,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "986d9d2e.d652e",\r
+        "id": "ff1f4bbb.9c88d8",\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": 837.0103960037231,\r
-        "y": 315.9999952316284,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 806.0312395095825,\r
+        "y": 310.03125286102295,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "6d96cae7.544aa4",\r
-                "7b4aef1d.e8397"\r
+                "cd7442d9.34306",\r
+                "6d930136.d20cb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d96cae7.544aa4",\r
+        "id": "cd7442d9.34306",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1068.0104064941406,\r
-        "y": 291.99999237060547,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1037.03125,\r
+        "y": 286.03125,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "8b1de33b.f87d8"\r
+                "c51e25a8.593288"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b4aef1d.e8397",\r
+        "id": "6d930136.d20cb",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1068.0104064941406,\r
-        "y": 331.99999237060547,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1037.03125,\r
+        "y": 326.03125,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "e6620c2c.848df"\r
+                "8a36da98.f826b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b1de33b.f87d8",\r
+        "id": "c51e25a8.593288",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1210.5104064941406,\r
-        "y": 291.99999237060547,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1179.53125,\r
+        "y": 286.03125,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e6620c2c.848df",\r
+        "id": "8a36da98.f826b8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1212.3674507141113,\r
-        "y": 331.9365043640137,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1181.3882942199707,\r
+        "y": 325.9677619934082,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "9a648de3.1f16d",\r
-                "8d5a09c0.be4698"\r
+                "26e4ea27.208ad6",\r
+                "44db3104.e81c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d5a09c0.be4698",\r
+        "id": "44db3104.e81c6",\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": 1365.0659255981445,\r
-        "y": 301.5556030566804,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1334.086769104004,\r
+        "y": 295.58686068607494,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9a648de3.1f16d",\r
+        "id": "26e4ea27.208ad6",\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": 1421.4944305419922,\r
-        "y": 354.7777328491211,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1390.5152740478516,\r
+        "y": 348.8089904785156,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "35f2967d.f1236a"\r
+                "3b7c03ef.0af89c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9105950c.e52f88",\r
+        "id": "5b9f74ec.1882ec",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1645.1451606750488,\r
-        "y": 313.03179025650024,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1614.1660041809082,\r
+        "y": 307.0630478858948,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "35f2967d.f1236a",\r
+        "id": "3b7c03ef.0af89c",\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": 1696.7801513671875,\r
-        "y": 354.34923553466797,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1665.8009948730469,\r
+        "y": 348.3804931640625,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "7879d3b9.a48b9c"\r
+                "84bba4b1.816e38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7879d3b9.a48b9c",\r
+        "id": "84bba4b1.816e38",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1597.5103492736816,\r
-        "y": 412.9206666946411,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1566.531192779541,\r
+        "y": 406.95192432403564,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             [\r
-                "d7b29734.9c35b8"\r
+                "4d582e07.7c7a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7b29734.9c35b8",\r
+        "id": "4d582e07.7c7a1",\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": 1745.2604522705078,\r
-        "y": 412.7778587634675,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 1714.2812957763672,\r
+        "y": 406.80911639286205,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "99ca206c.689c4",\r
+        "id": "9b9a9c47.ff729",\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.site-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",\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.wan-port-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<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",\r
         "comments": "",\r
-        "x": 849.8635559082031,\r
-        "y": 742.4961910247803,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 821.8844604492188,\r
+        "y": 730.527437210083,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad8e03c8.3f99",\r
+        "id": "fdda37d.d3044c8",\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.wan-port-vf-index\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 862.1971206665039,\r
-        "y": 688.1629104614258,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 831.2179641723633,\r
+        "y": 682.1941680908203,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d12731ca.f4e9a",\r
+        "id": "fa6eaef6.2d96",\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": 834.1970672607422,\r
-        "y": 635.1628475189209,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 803.2179107666016,\r
+        "y": 629.1941051483154,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c96aac1.62b6a5",\r
+        "id": "1438dd60.41b403",\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": 846.1967353820801,\r
-        "y": 525.1542224884033,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 815.2175788879395,\r
+        "y": 519.1854801177979,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45a27310.e17b0c",\r
+        "id": "89e460e0.31c23",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
-        "xml": "<set>\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.wan-port-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
+        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.wan-port-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.wan-port-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": 838.0104808807373,\r
-        "y": 794.0000371932983,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 807.0313243865967,\r
+        "y": 788.0312948226929,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98b0c583.6fb0e8",\r
+        "id": "cf5e55a3.da5e38",\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": 852.5105400085449,\r
-        "y": 843.9999303817749,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 821.5313835144043,\r
+        "y": 838.0311880111694,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "187c318b.c5572e",\r
+        "id": "981dfc9a.eb48b",\r
         "type": "save",\r
         "name": "save sdwan vpn resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $prop.vnf-index' >\n<parameter name=\"wan-port-config-id\" value=\"`$prop.vnf-index`\" />\n<parameter name=\"wan-port-config-name\" value=\"`$prop.wan.name`\" />\n<parameter name=\"device-id\" value=\"`$prop.wan.deviceName`\" />\n<parameter name='vlan-id' value=\"`$prop.wan.vlanId`\" />\n<parameter name=\"ip-address\" value=\"`$prop.wan.ipAddress`\" />\n<parameter name=\"provider-ip-address\" value=\"`$prop.wan.providerIpAddress`\" />\n<parameter name=\"input-bandwidth\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"output-bandwidth\" value=\"`$prop.wan.outputBandwidth`\" />\n<parameter name=\"description\" value=\"`$prop.wan.description`\" />\n<parameter name=\"port-type\" value=\"`$prop.wan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.wan.portNumber`\" />\n<parameter name=\"transport-network-name\" value=\"`$prop.wan.transportNetworkName`\" />\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.site-vf-index + '/vf-module-data/'` \" />\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $prop.wan-port-vf-index' >\n<parameter name=\"wan-port-config-id\" value=\"`$prop.wan-port-vf-index`\" />\n<parameter name=\"wan-port-config-name\" value=\"`$prop.wan.name`\" />\n<parameter name=\"device-id\" value=\"`$prop.wan.deviceName`\" />\n<parameter name='vlan-id' value=\"`$prop.wan.vlanId`\" />\n<parameter name=\"ip-address\" value=\"`$prop.wan.ipAddress`\" />\n<parameter name=\"provider-ip-address\" value=\"`$prop.wan.providerIpAddress`\" />\n<parameter name=\"input-bandwidth\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"output-bandwidth\" value=\"`$prop.wan.outputBandwidth`\" />\n<parameter name=\"description\" value=\"`$prop.wan.description`\" />\n<parameter name=\"port-type\" value=\"`$prop.wan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.wan.portNumber`\" />\n<parameter name=\"transport-network-name\" value=\"`$prop.wan.transportNetworkName`\" />\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.wan-port-vf-index + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856.0104484558105,\r
-        "y": 887.4999761581421,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 825.0312919616699,\r
+        "y": 881.5312337875366,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "29c03152.ef4a3e",\r
+        "id": "461f9f03.a33d2",\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.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\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
+        "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=\"wan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/wan-port-configs/wan-port-config/' + $prop.wan-port-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"wan-port-config.wan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.wan-port-vf-index`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 853.0103759765625,\r
-        "y": 933.5000076293945,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 822.0312194824219,\r
+        "y": 927.5312652587891,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f3463186.010ce",\r
+        "id": "3ce6fee1.f7c372",\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": 803.7329216003418,\r
-        "y": 980.6738667488098,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 772.7537651062012,\r
+        "y": 974.7051243782043,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4efead29.a28254",\r
+        "id": "37eaec79.c59c14",\r
         "type": "call",\r
         "name": "call sdwan-get-wan-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 845.8992767333984,\r
-        "y": 587.8888759613037,\r
-        "z": "eaff5db6.7dde1",\r
+        "x": 814.9201202392578,\r
+        "y": 581.9201335906982,\r
+        "z": "56fc6b1a.95dca4",\r
         "wires": [\r
             []\r
         ]\r
index c849449..f630eee 100644 (file)
@@ -69,7 +69,7 @@
                 <parameter name="ctx-destination" value="prop.wan-port-vf-index"/>\r
             </execute>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.site-vf-index`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.wan-port-vf-index`' />\r
                 <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.`' />\r
                 <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.`' />\r
                 <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.`' />\r
@@ -80,6 +80,7 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\r
             </set>\r
             <set>\r
+                <parameter name='vf-module-id' value='`$prop.wan-port-vf-index`' />\r
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/vnfs/vnf/'\r
                 <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
             </set>\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \r
-      key='wan-port-config.wan-port-config-id = $prop.vnf-index' >\r
-                <parameter name="wan-port-config-id" value="`$prop.vnf-index`" />\r
+      key='wan-port-config.wan-port-config-id = $prop.wan-port-vf-index' >\r
+                <parameter name="wan-port-config-id" value="`$prop.wan-port-vf-index`" />\r
                 <parameter name="wan-port-config-name" value="`$prop.wan.name`" />\r
                 <parameter name="device-id" value="`$prop.wan.deviceName`" />\r
                 <parameter name='vlan-id' value="`$prop.wan.vlanId`" />\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='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.site-vf-index + '/vf-module-data/'` " />\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.wan-port-vf-index + '/vf-module-data/'` " />\r
             </save>\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
       key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
       force="true" pfx="tmp.AnAI-data">\r
-                <parameter name="relationship-list.relationship[0].related-to" value="sdwan-vpn" />\r
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-vpns/sdwan-vpn/' + $prop.site-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.site-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
+                <parameter name="relationship-list.relationship[0].related-to" value="wan-port-config" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/wan-port-configs/wan-port-config/' + $prop.wan-port-vf-index`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="wan-port-config.wan-port-config-id" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.wan-port-vf-index`" />\r
             </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r