Fix SDNC parameters save in AAI failure

1. SDNC is fixed by passing proper UUID and version ID.
2. SDNC is fixed by removing validations for vnf
   resource creation DG
3. Fixed sdwan-wan-port-static.json template by passing generated wan-portId

Issue-ID: SDNC-773
Signed-off-by: prakash.e <prakash.e@huawei.com>
Change-Id: I0021983f0721dde6592d86bef602b8b4641215a3

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json
index 4760d35..413069e 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "ad9a9168.e57ff",\r
+        "id": "a55c86e0.b5aa88",\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": 956.03125,\r
-        "y": 159.13152408599854,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 969.829511642456,\r
+        "y": 145.13152599334717,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "e7246404.3ab3d8"\r
+                "89879683.435e28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ad25904.845b18",\r
+        "id": "654795a8.0c14ac",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -24,720 +24,720 @@
         "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": 228.7017364501953,\r
-        "y": 186.96871662139893,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 242.49999809265137,\r
+        "y": 172.96871852874756,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "f16fce6c.5d5ba"\r
+                "9d67b8bb.5c3018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f16fce6c.5d5ba",\r
+        "id": "9d67b8bb.5c3018",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-device-create",\r
         "xml": "<method rpc='sdwan-vf-operation-device-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 227.7017364501953,\r
-        "y": 286.9687166213989,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 241.49999809265137,\r
+        "y": 272.96871852874756,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "c112bcf.84b4e4"\r
+                "b03e92e3.4a48b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a36f303.fc1c1d",\r
+        "id": "5c240948.ac8cb8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 114.20173835754395,\r
-        "y": 79.96872520446777,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 128,\r
+        "y": 65.9687271118164,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "6ad25904.845b18"\r
+                "654795a8.0c14ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c112bcf.84b4e4",\r
+        "id": "b03e92e3.4a48b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 386.70172119140625,\r
-        "y": 402.9687252044678,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 400.4999828338623,\r
+        "y": 388.9687271118164,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "abed0b7b.e9c438",\r
-                "724392ca.bd7b5c",\r
-                "2b72757.931558a",\r
-                "a49a2243.bbcb2",\r
-                "c992605b.552a5",\r
-                "40876e67.4cc8d",\r
-                "86ee3fd8.45a8b",\r
-                "414cae1d.205f6",\r
-                "7ba39512.c516ac",\r
-                "3a2a0968.648d36",\r
-                "7024b9ac.3160d8",\r
-                "fdab20c0.e8295",\r
-                "d3c28e8a.2aecc",\r
-                "b7d7095a.45e048"\r
+                "949786f1.863f68",\r
+                "ea17361a.fd7708",\r
+                "efdf1074.6df6a",\r
+                "398e0031.2e059",\r
+                "cb5e3f0e.d096d",\r
+                "759de3b6.0709dc",\r
+                "115eabc8.0c7c94",\r
+                "a28188f1.6060e8",\r
+                "97ec72bd.6232e",\r
+                "e24672d6.3f64f",\r
+                "56ec94bf.93da3c",\r
+                "9d805d88.8f8ee",\r
+                "64fa5b44.3987c4",\r
+                "8956e9de.67f788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abed0b7b.e9c438",\r
+        "id": "949786f1.863f68",\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": 704.0311584472656,\r
-        "y": 160.4648609161377,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 717.8294200897217,\r
+        "y": 146.46486282348633,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "ad9a9168.e57ff"\r
+                "a55c86e0.b5aa88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ed9f1d2.fc2b7",\r
+        "id": "5c7606f2.618b18",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1327.697738647461,\r
-        "y": 161.13152694702148,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1341.496000289917,\r
+        "y": 147.13152885437012,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7246404.3ab3d8",\r
+        "id": "89879683.435e28",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1174.3645668029785,\r
-        "y": 161.13150596618652,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1188.1628284454346,\r
+        "y": 147.13150787353516,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "4ed9f1d2.fc2b7"\r
+                "5c7606f2.618b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b72757.931558a",\r
+        "id": "efdf1074.6df6a",\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": 784.9518966674805,\r
-        "y": 561.6354055404663,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 798.7501583099365,\r
+        "y": 547.6354074478149,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "1cf539f3.af1b96"\r
+                "aa19f798.d86af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cf539f3.af1b96",\r
+        "id": "aa19f798.d86af8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 999.7302398681641,\r
-        "y": 559.1909894943237,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1013.5285015106201,\r
+        "y": 545.1909914016724,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "1a9f780a.a03398",\r
-                "dcb3e18.352e72"\r
+                "5ba25a3d.6d9bd4",\r
+                "bcc6d89b.3d5508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a9f780a.a03398",\r
+        "id": "5ba25a3d.6d9bd4",\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": 1195.986442565918,\r
-        "y": 536.9391279220581,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1209.784704208374,\r
+        "y": 522.9391298294067,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dcb3e18.352e72",\r
+        "id": "bcc6d89b.3d5508",\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": 1165.4308700561523,\r
-        "y": 573.9392442703247,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1179.2291316986084,\r
+        "y": 559.9392461776733,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "724392ca.bd7b5c",\r
+        "id": "ea17361a.fd7708",\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": 718.4517517089844,\r
-        "y": 115.96872997283936,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 732.2500133514404,\r
+        "y": 101.96873188018799,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "b66cc394.12346"\r
+                "fb03dd5b.a92d3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b66cc394.12346",\r
+        "id": "fb03dd5b.a92d3",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 905.1184310913086,\r
-        "y": 115.30202770233154,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 918.9166927337646,\r
+        "y": 101.30202960968018,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "c5ad3c03.3e718"\r
+                "54203a8b.1592b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5ad3c03.3e718",\r
+        "id": "54203a8b.1592b4",\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": 1086.785057067871,\r
-        "y": 115.30202770233154,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1100.5833187103271,\r
+        "y": 101.30202960968018,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40876e67.4cc8d",\r
+        "id": "759de3b6.0709dc",\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.vf-id`' />\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\n",\r
         "comments": "",\r
-        "x": 769.5548782348633,\r
-        "y": 728.4649872779846,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 783.3531398773193,\r
+        "y": 714.4649891853333,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a49a2243.bbcb2",\r
+        "id": "398e0031.2e059",\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": 775.8880348205566,\r
-        "y": 624.1229696273804,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 789.6862964630127,\r
+        "y": 610.122971534729,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c992605b.552a5",\r
+        "id": "cb5e3f0e.d096d",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-device-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 801.8884124755859,\r
-        "y": 680.1232032775879,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 815.686674118042,\r
+        "y": 666.1232051849365,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "86ee3fd8.45a8b",\r
+        "id": "115eabc8.0c7c94",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/>    \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.vf-id\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": 764.7017707824707,\r
-        "y": 778.9688324928284,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 778.5000324249268,\r
+        "y": 764.968834400177,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "414cae1d.205f6",\r
+        "id": "a28188f1.6060e8",\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`' />\n",\r
         "comments": "",\r
-        "x": 772.2018737792969,\r
-        "y": 826.9687967300415,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 786.0001354217529,\r
+        "y": 812.9687986373901,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8a9b81e.4dea68",\r
+        "id": "2bd76b30.e44c14",\r
         "type": "save",\r
         "name": "save sdwan vpn resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vf-id' >\n<parameter name='device-id' value='`$prop.vf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\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.vf-id + '/vf-module-data/'` \" />\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vf-id' >\n<parameter name='device-id' value='`$prop.vf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\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.vf-id + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1206.701789855957,\r
-        "y": 852.4687442779541,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1220.500051498413,\r
+        "y": 838.4687461853027,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3a2a0968.648d36",\r
+        "id": "e24672d6.3f64f",\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=\"device\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/devices/device/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"device.device-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 775.7016677856445,\r
-        "y": 920.4687957763672,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 789.4999294281006,\r
+        "y": 906.4687976837158,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7ba39512.c516ac",\r
+        "id": "97ec72bd.6232e",\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": 724.4241981506348,\r
-        "y": 966.6426386833191,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 738.2224597930908,\r
+        "y": 952.6426405906677,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "faa86376.49175",\r
+        "id": "5aff085f.4f6678",\r
         "type": "execute",\r
         "name": "execute generate-vf-id",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1251.8685150146484,\r
-        "y": 240.30206966400146,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1265.6667766571045,\r
+        "y": 226.3020715713501,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "491e4f90.e2d44",\r
+        "id": "6d401f41.38c65",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1004.8680419921875,\r
-        "y": 254.95347213745117,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1018.6663036346436,\r
+        "y": 240.9534740447998,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "faa86376.49175",\r
-                "1889b968.9cafa7",\r
-                "c8eb51dd.8bc9f"\r
+                "5aff085f.4f6678",\r
+                "5b632a30.5bb984",\r
+                "3542675.5ce1998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74ee118f.3bdb3",\r
+        "id": "931487e.1357f78",\r
         "type": "set",\r
         "name": "set prop.vf-id",\r
         "xml": "<set>\n<parameter name='prop.vf-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n",\r
         "comments": "",\r
-        "x": 1210.3999099731445,\r
-        "y": 457.985107421875,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1224.1981716156006,\r
+        "y": 443.98510932922363,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dfbd61c4.ba851",\r
+        "id": "4589ca44.abd4b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1004.3995361328125,\r
-        "y": 410.9848394393921,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1018.1977977752686,\r
+        "y": 396.9848413467407,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "74ee118f.3bdb3",\r
-                "1889b968.9cafa7",\r
-                "f58396e4.0282e8"\r
+                "931487e.1357f78",\r
+                "5b632a30.5bb984",\r
+                "5d9e7b7e.ca4bf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1889b968.9cafa7",\r
+        "id": "5b632a30.5bb984",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1239.8996353149414,\r
-        "y": 334.98486328125,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1253.6978969573975,\r
+        "y": 320.98486518859863,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "ecce0898.ef26d8",\r
-                "e6c1d3e3.fb47b"\r
+                "66c1c6a1.0380b8",\r
+                "7a26fc83.04adb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e28abe4b.99802",\r
+        "id": "4aab28a9.38e418",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1701.6139278411865,\r
-        "y": 254.12758922576904,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1715.4121894836426,\r
+        "y": 240.12759113311768,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "4d6a716f.84ac8"\r
+                "6d61baf9.e5ff54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d6a716f.84ac8",\r
+        "id": "6d61baf9.e5ff54",\r
         "type": "set",\r
         "name": "set vf-index=0",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1849.8995761871338,\r
-        "y": 251.12764358520508,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1863.6978378295898,\r
+        "y": 237.1276454925537,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad9a94b.6789668",\r
+        "id": "31602a2e.23f6d6",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1705.0424251556396,\r
-        "y": 299.41338062286377,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1718.8406867980957,\r
+        "y": 285.4133825302124,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "aa7a0bdb.e96638"\r
+                "794d6b8.233bf94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa7a0bdb.e96638",\r
+        "id": "794d6b8.233bf94",\r
         "type": "set",\r
         "name": "set vf-index = vf_length",\r
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n",\r
         "comments": "",\r
-        "x": 1888.90016746521,\r
-        "y": 299.6991491317749,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1902.698429107666,\r
+        "y": 285.69915103912354,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ecce0898.ef26d8",\r
+        "id": "66c1c6a1.0380b8",\r
         "type": "set",\r
         "name": "set new vF_length",\r
         "xml": "<set>\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": 1417.8996391296387,\r
-        "y": 363.984827041626,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1431.6979007720947,\r
+        "y": 349.9848289489746,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b86e63fd.fc195",\r
+        "id": "4261b847.26d008",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1654.471076965332,\r
-        "y": 394.1277618408203,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1668.269338607788,\r
+        "y": 380.12776374816895,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "5a9cb21d.1f494c"\r
+                "f7fccba6.c15138"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a9cb21d.1f494c",\r
+        "id": "f7fccba6.c15138",\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=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 1793.0424346923828,\r
-        "y": 394.12772274017334,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1806.8406963348389,\r
+        "y": 380.127724647522,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f10259c.95f9fa",\r
+        "id": "5d0b6c.7fe7e494",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 853.3991165161133,\r
-        "y": 378.9847173690796,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 867.1973781585693,\r
+        "y": 364.9847192764282,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "dfbd61c4.ba851"\r
+                "4589ca44.abd4b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5868d60.4eb9c",\r
+        "id": "cd8f5874.903778",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856.8679389953613,\r
-        "y": 318.9534797668457,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 870.6662006378174,\r
+        "y": 304.95348167419434,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "491e4f90.e2d44"\r
+                "6d401f41.38c65"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "585f0966.3b4ab8",\r
+        "id": "9419aeb4.031d3",\r
         "type": "comment",\r
         "name": "if SO provide vf-id use that else create new",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1554.3991317749023,\r
-        "y": 214.98472118377686,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1568.1973934173584,\r
+        "y": 200.9847230911255,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fdab20c0.e8295",\r
+        "id": "9d805d88.8f8ee",\r
         "type": "switchNode",\r
         "name": "switch vf-id",\r
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 715.8679351806641,\r
-        "y": 343.95348834991455,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 729.6661968231201,\r
+        "y": 329.9534902572632,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "c5868d60.4eb9c",\r
-                "2f10259c.95f9fa"\r
+                "cd8f5874.903778",\r
+                "5d0b6c.7fe7e494"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7024b9ac.3160d8",\r
+        "id": "56ec94bf.93da3c",\r
         "type": "switchNode",\r
         "name": "switch vnf-index",\r
         "xml": "<switch test='`$vnf-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 715.7330017089844,\r
-        "y": 208.99999523162842,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 729.5312633514404,\r
+        "y": 194.99999713897705,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "a1384c59.cdef8"\r
+                "8e07f88.10c5a08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1384c59.cdef8",\r
+        "id": "8e07f88.10c5a08",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 877.7330474853516,\r
-        "y": 207.9999942779541,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 891.5313091278076,\r
+        "y": 193.99999618530273,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "b60890ce.7212a"\r
+                "33f9f4dc.b667cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b60890ce.7212a",\r
+        "id": "33f9f4dc.b667cc",\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=\"vnf id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1026.983139038086,\r
-        "y": 205.7778720855713,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1040.781400680542,\r
+        "y": 191.77787399291992,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e6c1d3e3.fb47b",\r
+        "id": "7a26fc83.04adb4",\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": 1479.7329788208008,\r
-        "y": 280.0000104904175,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1493.5312404632568,\r
+        "y": 266.0000123977661,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "e28abe4b.99802",\r
-                "ad9a94b.6789668"\r
+                "4aab28a9.38e418",\r
+                "31602a2e.23f6d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62be0465.8c201c",\r
+        "id": "98ab03a3.4fb31",\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": 1471.7329788208008,\r
-        "y": 402.49998474121094,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1485.5312404632568,\r
+        "y": 388.49998664855957,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "b86e63fd.fc195"\r
+                "4261b847.26d008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f58396e4.0282e8",\r
+        "id": "5d9e7b7e.ca4bf4",\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": 1235.7329788208008,\r
-        "y": 406.49998474121094,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1249.5312404632568,\r
+        "y": 392.49998664855957,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "62be0465.8c201c"\r
+                "98ab03a3.4fb31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3c28e8a.2aecc",\r
+        "id": "64fa5b44.3987c4",\r
         "type": "set",\r
         "name": "set prop.sdncCreate=false",\r
         "xml": "<set>\n<parameter name='prop.sdncCreate' value='false' />\n",\r
         "comments": "",\r
-        "x": 746.2329788208008,\r
-        "y": 71.99999809265137,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 760.0312404632568,\r
+        "y": 58,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8eb51dd.8bc9f",\r
+        "id": "3542675.5ce1998",\r
         "type": "set",\r
         "name": "set prop.sdncCreate=true",\r
         "xml": "<set>\n<parameter name='prop.sdncCreate' value='true' />\n",\r
         "comments": "",\r
-        "x": 1265.2329864501953,\r
-        "y": 202.99999713897705,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1279.0312480926514,\r
+        "y": 188.99999904632568,\r
+        "z": "13a3e634.05943a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7d7095a.45e048",\r
+        "id": "8956e9de.67f788",\r
         "type": "switchNode",\r
         "name": "switch prop.sdncCreate",\r
         "xml": "<switch test='`$prop.sdncCreate`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 754.2330436706543,\r
-        "y": 876.0000257492065,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 768.0313053131104,\r
+        "y": 862.0000276565552,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "bb597028.866e9",\r
-                "18aecad0.0cad25"\r
+                "530d4a6f.95a5a4",\r
+                "ed2fc8ce.6d54b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18aecad0.0cad25",\r
+        "id": "ed2fc8ce.6d54b8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 969.2330417633057,\r
-        "y": 887.0000257492065,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 983.0313034057617,\r
+        "y": 873.0000276565552,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "8ea3c05b.19b31"\r
+                "f6984691.7e9e18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb597028.866e9",\r
+        "id": "530d4a6f.95a5a4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 972.2330417633057,\r
-        "y": 848.9999942779541,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 986.0313034057617,\r
+        "y": 834.9999961853027,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             [\r
-                "c8a9b81e.4dea68"\r
+                "2bd76b30.e44c14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ea3c05b.19b31",\r
+        "id": "f6984691.7e9e18",\r
         "type": "save",\r
         "name": "update sdwan vpn resource in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vf-id' >\n<parameter name='device-id' value='`$prop.vf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\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.vf-id + '/vf-module-data/'` \" />\n",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vf-id' >\n<parameter name='device-id' value='`$prop.vf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\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.vf-id + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1203.2329864501953,\r
-        "y": 892.999997138977,\r
-        "z": "46bf2b6e.2c0e64",\r
+        "x": 1217.0312480926514,\r
+        "y": 878.9999990463257,\r
+        "z": "13a3e634.05943a",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
index b09a059..cf08b57 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.json
@@ -1,431 +1,431 @@
 [\r
     {\r
-        "id": "f782e37.109032",\r
+        "id": "3563dba1.d09964",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 583,\r
-        "y": 401.1628177165985,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 431.0104064941406,\r
+        "y": 355.1628177165985,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "3a0d40d2.1b88f",\r
-                "fdf59618.623758",\r
-                "d535f520.a2b4c8",\r
-                "5957a088.cf332",\r
-                "9afb8db9.2b0d5",\r
-                "1b22ffce.90ac5",\r
-                "9c073f69.f288d",\r
-                "8cc9cbda.e9db18",\r
-                "1db1621b.e18c6e",\r
-                "33fd1f45.d7ff5",\r
-                "2ebef402.b67dec",\r
-                "a78628f7.4e9428",\r
-                "9f1428de.0587b8",\r
-                "69722b7c.abba54",\r
-                "86d99a3f.07f208"\r
+                "5ddfe38c.3aa86c",\r
+                "5a21a65a.69db48",\r
+                "cc416a47.18fef8",\r
+                "be6d233d.af70d",\r
+                "a80fd5f3.86e118",\r
+                "d2ca1c0d.40fdc",\r
+                "768823c2.5ac1cc",\r
+                "94ccf971.360848",\r
+                "4d1e575f.68db78",\r
+                "6992ab61.1740b4",\r
+                "494976dc.41e7f8",\r
+                "40bceee5.21d0e",\r
+                "c03fc9ca.e96578",\r
+                "742cd454.7acabc",\r
+                "e5ba2a4b.c03198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a0d40d2.1b88f",\r
+        "id": "5ddfe38c.3aa86c",\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": 929.2501602172852,\r
-        "y": 383.82948660850525,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 777.2605667114258,\r
+        "y": 337.82948660850525,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "edd147b1.5a9678"\r
+                "598a5263.1331ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "edd147b1.5a9678",\r
+        "id": "598a5263.1331ac",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1144.0285034179688,\r
-        "y": 381.38507056236267,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 992.0389099121094,\r
+        "y": 335.38507056236267,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "239191e9.78691e",\r
-                "1a76d1a9.524ade"\r
+                "76ce96e5.bf7bc8",\r
+                "55b2b4f6.971cdc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "239191e9.78691e",\r
+        "id": "76ce96e5.bf7bc8",\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": 1340.2847061157227,\r
-        "y": 359.13320899009705,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1188.2951126098633,\r
+        "y": 313.13320899009705,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1a76d1a9.524ade",\r
+        "id": "55b2b4f6.971cdc",\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": 1309.729133605957,\r
-        "y": 396.13332533836365,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1157.7395401000977,\r
+        "y": 350.13332533836365,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24f00d92.239812",\r
+        "id": "ba810934.3ff408",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 967.2503623962402,\r
-        "y": 340.4961540699005,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 815.2607688903809,\r
+        "y": 294.4961540699005,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d535f520.a2b4c8",\r
+        "id": "cc416a47.18fef8",\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": 908.1867752075195,\r
-        "y": 542.3257596492767,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 756.1971817016602,\r
+        "y": 496.32575964927673,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fdf59618.623758",\r
+        "id": "5a21a65a.69db48",\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": 915.1863632202148,\r
-        "y": 437.3170254230499,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 763.1967697143555,\r
+        "y": 391.3170254230499,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c073f69.f288d",\r
+        "id": "768823c2.5ac1cc",\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.vf-id`' />\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
         "comments": "",\r
-        "x": 920.3531188964844,\r
-        "y": 650.4963715076447,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 768.363525390625,\r
+        "y": 604.4963715076447,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cc9cbda.e9db18",\r
+        "id": "94ccf971.360848",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \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 + $vf-module-topology-operation-input.vf-module-information.vf-module-id\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": 908.5000438690186,\r
-        "y": 702.0002176761627,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 756.5104503631592,\r
+        "y": 656.0002176761627,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1db1621b.e18c6e",\r
+        "id": "4d1e575f.68db78",\r
         "type": "save",\r
         "name": "save sdwan lan-port-config resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"device-id\" value='`$prop.lan.deviceName`' />\n<parameter name=\"port-switch\" value='`$prop.lan.portSwitch`' />\n<parameter name=\"port-type\" value='`$prop.lan.portType`' />\n<parameter name=\"port-number\" value='`$prop.lan.portnumber`' />\n<parameter name=\"ipv4-address\" value='`$prop.lan.ipAddress`' />\n<parameter name='vlan-tag' value='`$prop.lan.vlanId`' />\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.vf-id + '/vf-module-data/'` \" />\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"device-id\" value='`$prop.lan.deviceName`' />\n<parameter name=\"port-switch\" value='`$prop.lan.portSwitch`' />\n<parameter name=\"port-type\" value='`$prop.lan.portType`' />\n<parameter name=\"port-number\" value='`$prop.lan.portnumber`' />\n<parameter name=\"ipv4-address\" value='`$prop.lan.ipAddress`' />\n<parameter name='vlan-tag' value='`$prop.lan.vlanId`' />\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.vf-id + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 963.5000228881836,\r
-        "y": 794.5002000331879,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 811.5104293823242,\r
+        "y": 748.5002000331879,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "33fd1f45.d7ff5",\r
+        "id": "6992ab61.1740b4",\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=\"lan-port-config\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"lan-port-config-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 923.4999389648438,\r
-        "y": 841.5001881122589,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 771.5103454589844,\r
+        "y": 795.5001881122589,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2ebef402.b67dec",\r
+        "id": "494976dc.41e7f8",\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": 874.222484588623,\r
-        "y": 888.6740472316742,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 722.2328910827637,\r
+        "y": 842.6740472316742,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5957a088.cf332",\r
+        "id": "be6d233d.af70d",\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": 884.4205684661865,\r
-        "y": 90.66670227050781,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 732.4309749603271,\r
+        "y": 44.66670227050781,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "26211aa4.6aca76"\r
+                "a4292aa6.75e0c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26211aa4.6aca76",\r
+        "id": "a4292aa6.75e0c8",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1071.0872478485107,\r
-        "y": 90,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 919.0976543426514,\r
+        "y": 44,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "60b9b040.3db19"\r
+                "f5b1afdf.f5a4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60b9b040.3db19",\r
+        "id": "f5b1afdf.f5a4e",\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": 1252.7538738250732,\r
-        "y": 90,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1100.7642803192139,\r
+        "y": 44,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9afb8db9.2b0d5",\r
+        "id": "a80fd5f3.86e118",\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": 922.6705904006958,\r
-        "y": 267.66669631004333,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 770.6809968948364,\r
+        "y": 221.66669631004333,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "925220d0.8e6e8",\r
-                "8d034f0b.c8c8d"\r
+                "c9c58b29.2dfa58",\r
+                "8390bbc5.321ad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "925220d0.8e6e8",\r
+        "id": "c9c58b29.2dfa58",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1153.6706008911133,\r
-        "y": 243.66669344902039,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1001.6810073852539,\r
+        "y": 197.66669344902039,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "f6929bd3.916468"\r
+                "dc09b12c.dd3fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d034f0b.c8c8d",\r
+        "id": "8390bbc5.321ad8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1153.6706008911133,\r
-        "y": 283.6666934490204,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1001.6810073852539,\r
+        "y": 237.66669344902039,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "28516ca8.58b9a4"\r
+                "3643e6d4.7f439a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6929bd3.916468",\r
+        "id": "dc09b12c.dd3fe",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1296.1706008911133,\r
-        "y": 243.66669344902039,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1144.181007385254,\r
+        "y": 197.66669344902039,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "28516ca8.58b9a4",\r
+        "id": "3643e6d4.7f439a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1298.027645111084,\r
-        "y": 283.6032054424286,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1146.0380516052246,\r
+        "y": 237.6032054424286,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "fe45ce64.2ccb7",\r
-                "e4014c75.a1a78"\r
+                "38575d2d.74e912",\r
+                "98424ce4.789a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4014c75.a1a78",\r
+        "id": "98424ce4.789a1",\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": 1450.7261199951172,\r
-        "y": 253.22230413509533,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1298.7365264892578,\r
+        "y": 207.22230413509533,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe45ce64.2ccb7",\r
+        "id": "38575d2d.74e912",\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": 1507.1546249389648,\r
-        "y": 306.444433927536,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1355.1650314331055,\r
+        "y": 260.444433927536,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "c9dd9d48.363c4"\r
+                "6f409c8c.594684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93986914.2633c8",\r
+        "id": "12f39766.bab9b9",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1730.8053550720215,\r
-        "y": 264.69849133491516,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1578.815761566162,\r
+        "y": 218.69849133491516,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9dd9d48.363c4",\r
+        "id": "6f409c8c.594684",\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": 1782.4403457641602,\r
-        "y": 306.0159366130829,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1630.4507522583008,\r
+        "y": 260.0159366130829,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "3a28d2c1.9fee3e"\r
+                "34043894.3a1738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a28d2c1.9fee3e",\r
+        "id": "34043894.3a1738",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1683.1705436706543,\r
-        "y": 364.58736777305603,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1531.180950164795,\r
+        "y": 318.58736777305603,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "c7dfb468.8d2468"\r
+                "e047ad76.2601d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7dfb468.8d2468",\r
+        "id": "e047ad76.2601d",\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": 1830.9206466674805,\r
-        "y": 364.44455984188244,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1678.931053161621,\r
+        "y": 318.44455984188244,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b22ffce.90ac5",\r
+        "id": "d2ca1c0d.40fdc",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lanport-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 954.0000381469727,\r
-        "y": 490.1628510951996,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 802.0104446411133,\r
+        "y": 444.1628510951996,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a78628f7.4e9428",\r
+        "id": "40bceee5.21d0e",\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`' />\n",\r
         "comments": "",\r
-        "x": 925.0000076293945,\r
-        "y": 744.1667354106903,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 773.0104141235352,\r
+        "y": 698.1667354106903,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ceaeb6e4.45d088",\r
+        "id": "53017383.9c8f0c",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 252.00000762939453,\r
-        "y": 117.16673541069031,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 100.01041412353516,\r
+        "y": 71.16673541069031,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "b9aae3a1.4ae74"\r
+                "b88f4175.84605"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9aae3a1.4ae74",\r
+        "id": "b88f4175.84605",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -433,145 +433,145 @@
         "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": 366.5000057220459,\r
-        "y": 224.16672682762146,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 214.51041221618652,\r
+        "y": 178.16672682762146,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "486cfe7f.88b42"\r
+                "9de4488f.4b0818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "486cfe7f.88b42",\r
+        "id": "9de4488f.4b0818",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-lanport-create",\r
         "xml": "<method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 365.5000057220459,\r
-        "y": 324.16672682762146,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 213.51041221618652,\r
+        "y": 278.16672682762146,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "f782e37.109032"\r
+                "3563dba1.d09964"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f1428de.0587b8",\r
+        "id": "c03fc9ca.e96578",\r
         "type": "execute",\r
         "name": "execute generate-vf-id",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 907.0000534057617,\r
-        "y": 598.6667287349701,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 755.0104598999023,\r
+        "y": 552.6667287349701,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "69722b7c.abba54",\r
+        "id": "742cd454.7acabc",\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": 873.9999885559082,\r
-        "y": 145.16673731803894,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 722.0103950500488,\r
+        "y": 99.16673731803894,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "c4314464.ea4888"\r
+                "3ed11716.45d018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4314464.ea4888",\r
+        "id": "3ed11716.45d018",\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": 1125.0000839233398,\r
-        "y": 140.83335781097412,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 973.0104904174805,\r
+        "y": 94.83335781097412,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "7e2619a7.4c1a38"\r
+                "6c9c624d.566c8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e2619a7.4c1a38",\r
+        "id": "6c9c624d.566c8c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1343.3334007263184,\r
-        "y": 142.8333396911621,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1191.343807220459,\r
+        "y": 96.83333969116211,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "e7b8aabb.779c28"\r
+                "acf4ddfd.c60e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7b8aabb.779c28",\r
+        "id": "acf4ddfd.c60e5",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1496.6665725708008,\r
-        "y": 142.83336067199707,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1344.6769790649414,\r
+        "y": 96.83336067199707,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86d99a3f.07f208",\r
+        "id": "e5ba2a4b.c03198",\r
         "type": "switchNode",\r
         "name": "switch vnf-index",\r
         "xml": "<switch test='`$vnf-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 888.0000076293945,\r
-        "y": 206.1667354106903,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 736.0104141235352,\r
+        "y": 160.1667354106903,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "885839d2.ea1b48"\r
+                "5ddfe829.c49618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "885839d2.ea1b48",\r
+        "id": "5ddfe829.c49618",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1050.0000534057617,\r
-        "y": 205.166734457016,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 898.0104598999023,\r
+        "y": 159.166734457016,\r
+        "z": "ad703000.c2e0d",\r
         "wires": [\r
             [\r
-                "1a2b1c2a.3b4624"\r
+                "8cdafc69.f1e95"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a2b1c2a.3b4624",\r
+        "id": "8cdafc69.f1e95",\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=\"vnf id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1199.250144958496,\r
-        "y": 202.94461226463318,\r
-        "z": "5ddf8caa.1b92e4",\r
+        "x": 1047.2605514526367,\r
+        "y": 156.94461226463318,\r
+        "z": "ad703000.c2e0d",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json
index b70f8ce..650d4f6 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json
@@ -1,6 +1,6 @@
 [\r
     {\r
-        "id": "f2c51e78.6ee01",\r
+        "id": "c770572a.fb6338",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -8,526 +8,526 @@
         "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": 233.5,\r
-        "y": 162.99999046325684,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 244.01040649414062,\r
+        "y": 137.999986410141,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "e7f78c27.133fa"\r
+                "2413db39.149ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7f78c27.133fa",\r
+        "id": "2413db39.149ee4",\r
         "type": "method",\r
         "name": "sdwan-vf-operation-site-create",\r
         "xml": "<method rpc='sdwan-vf-operation-site-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 232.5,\r
-        "y": 262.99999046325684,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 243.01040649414062,\r
+        "y": 237.999986410141,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "31fa463e.82923a"\r
+                "3b0ef51d.87c1aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bac9bd77.fe0f",\r
+        "id": "917c1ce4.ae467",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 85,\r
-        "y": 68.00000381469727,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 95.51040649414062,\r
+        "y": 42.99999976158142,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "f2c51e78.6ee01"\r
+                "c770572a.fb6338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31fa463e.82923a",\r
+        "id": "3b0ef51d.87c1aa",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 391.49998474121094,\r
-        "y": 378.9999990463257,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 402.01039123535156,\r
+        "y": 353.99999499320984,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "dda69c6e.0dcdc",\r
-                "73e90791.30e428",\r
-                "539f4691.77ee38",\r
-                "b886ea54.85e0f8",\r
-                "be0d3540.8ebb28",\r
-                "788efb60.76f4a4",\r
-                "154ced05.a101f3",\r
-                "76dbb250.b292cc",\r
-                "df7eb194.69b7e",\r
-                "6868f266.5fe7ec",\r
-                "e78bb1b3.a529d",\r
-                "2b07f61e.bf4a1a",\r
-                "fd37bb03.271ec8",\r
-                "395e35c1.a6a5fa"\r
+                "fea218a9.a2a6a8",\r
+                "b28a31c1.baab5",\r
+                "d187c119.ef8c",\r
+                "1f4a7270.75c83e",\r
+                "b816fc60.a5218",\r
+                "e97f4b5a.d20bc8",\r
+                "fc345089.c5339",\r
+                "740c748a.ebce9c",\r
+                "ccd8cb84.11c5d8",\r
+                "5663c20e.be57ac",\r
+                "8c48570.a7e2ba8",\r
+                "37b7efe8.c51dd",\r
+                "192f7a8f.f6f5f5",\r
+                "dd669d99.3d6e7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dda69c6e.0dcdc",\r
+        "id": "fea218a9.a2a6a8",\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": 691.8294067382812,\r
-        "y": 270.4961233139038,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 702.3398132324219,\r
+        "y": 245.49611926078796,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "e02bea98.6a2108"\r
+                "6a2c175f.9703e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e02bea98.6a2108",\r
+        "id": "6a2c175f.9703e8",\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": 943.8294982910156,\r
-        "y": 269.16278648376465,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 954.3399047851562,\r
+        "y": 244.1627824306488,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "44afa032.ce578"\r
+                "4fe97e86.0a138"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c12c2186.d601b",\r
+        "id": "676991e8.683f",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1315.4959869384766,\r
-        "y": 271.1627893447876,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1326.0063934326172,\r
+        "y": 246.16278529167175,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44afa032.ce578",\r
+        "id": "4fe97e86.0a138",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1162.1628150939941,\r
-        "y": 271.16276836395264,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1172.6732215881348,\r
+        "y": 246.1627643108368,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "c12c2186.d601b"\r
+                "676991e8.683f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b886ea54.85e0f8",\r
+        "id": "1f4a7270.75c83e",\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": 765.7501907348633,\r
-        "y": 492.6666564941406,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 776.2605972290039,\r
+        "y": 467.6666524410248,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "d6ac010b.ad6e"\r
+                "559d320b.26902c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6ac010b.ad6e",\r
+        "id": "559d320b.26902c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 980.5285339355469,\r
-        "y": 490.22224044799805,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 991.0389404296875,\r
+        "y": 465.2222363948822,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "265e23d4.36e02c",\r
-                "e3c83d1b.72db1"\r
+                "744b5a7d.c43364",\r
+                "3925a45.84b325c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "265e23d4.36e02c",\r
+        "id": "744b5a7d.c43364",\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": 1176.7847366333008,\r
-        "y": 467.9703788757324,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1187.2951431274414,\r
+        "y": 442.9703748226166,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e3c83d1b.72db1",\r
+        "id": "3925a45.84b325c",\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": 1146.2291641235352,\r
-        "y": 504.970495223999,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1156.7395706176758,\r
+        "y": 479.9704911708832,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6cbee016.f6042",\r
+        "id": "51aed84d.9e1858",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1149.7503929138184,\r
-        "y": 427.3333249092102,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1160.260799407959,\r
+        "y": 402.33332085609436,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "73e90791.30e428",\r
+        "id": "b28a31c1.baab5",\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": 706.25,\r
-        "y": 225.99999237060547,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 716.7604064941406,\r
+        "y": 200.99998831748962,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "d8c3ff3.9b067"\r
+                "2601ab8b.2465c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8c3ff3.9b067",\r
+        "id": "2601ab8b.2465c4",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 892.9166793823242,\r
-        "y": 225.33329010009766,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 903.4270858764648,\r
+        "y": 200.3332860469818,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "94ec6856.a83cd8"\r
+                "7b66cde0.5ed4e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94ec6856.a83cd8",\r
+        "id": "7b66cde0.5ed4e4",\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": 1074.5833053588867,\r
-        "y": 225.33329010009766,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1085.0937118530273,\r
+        "y": 200.3332860469818,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "539f4691.77ee38",\r
+        "id": "d187c119.ef8c",\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": 747.4999895095825,\r
-        "y": 345.9999933242798,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 758.0103960037231,\r
+        "y": 320.99998927116394,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "83439569.31aa38",\r
-                "bcb4cae0.4f9908"\r
+                "3c09952e.958fba",\r
+                "e6356a17.905c68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83439569.31aa38",\r
+        "id": "3c09952e.958fba",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 978.5,\r
-        "y": 321.99999046325684,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 989.0104064941406,\r
+        "y": 296.999986410141,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "ba3dff03.8dc24"\r
+                "fba8bc43.2cb3f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcb4cae0.4f9908",\r
+        "id": "e6356a17.905c68",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 978.5,\r
-        "y": 361.99999046325684,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 989.0104064941406,\r
+        "y": 336.999986410141,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "890fe4fa.c0f128"\r
+                "1e3ff05c.7e707"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba3dff03.8dc24",\r
+        "id": "fba8bc43.2cb3f",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1121,\r
-        "y": 321.99999046325684,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1131.5104064941406,\r
+        "y": 296.999986410141,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "890fe4fa.c0f128",\r
+        "id": "1e3ff05c.7e707",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1122.8570442199707,\r
-        "y": 361.93650245666504,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1133.3674507141113,\r
+        "y": 336.9364984035492,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "3895380d.b43d08",\r
-                "ba2eca23.0f6508"\r
+                "734f7a0e.a807e4",\r
+                "6a7d1bd9.260064"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba2eca23.0f6508",\r
+        "id": "6a7d1bd9.260064",\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": 1275.555519104004,\r
-        "y": 331.5556011493318,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1286.0659255981445,\r
+        "y": 306.55559709621593,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3895380d.b43d08",\r
+        "id": "734f7a0e.a807e4",\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": 1331.9840240478516,\r
-        "y": 384.77773094177246,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1342.4944305419922,\r
+        "y": 359.7777268886566,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "8202a636.7f9518"\r
+                "1f870f52.7ed3d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51af10a6.1b1e3",\r
+        "id": "c40703ba.a6d6d",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1555.6347541809082,\r
-        "y": 343.0317883491516,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1566.1451606750488,\r
+        "y": 318.03178429603577,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8202a636.7f9518",\r
+        "id": "1f870f52.7ed3d1",\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": 1607.2697448730469,\r
-        "y": 384.34923362731934,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1617.7801513671875,\r
+        "y": 359.3492295742035,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "ce7e5cca.15004"\r
+                "f0ccc856.a88628"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce7e5cca.15004",\r
+        "id": "f0ccc856.a88628",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1507.999942779541,\r
-        "y": 442.9206647872925,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1518.5103492736816,\r
+        "y": 417.92066073417664,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             [\r
-                "7c5cfe61.fdc3f"\r
+                "fdfb4a25.63fa28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c5cfe61.fdc3f",\r
+        "id": "fdfb4a25.63fa28",\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": 1655.7500457763672,\r
-        "y": 442.7778568561189,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 1666.2604522705078,\r
+        "y": 417.77785280300304,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df7eb194.69b7e",\r
+        "id": "ccd8cb84.11c5d8",\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\n",\r
         "comments": "",\r
-        "x": 759.3531951904297,\r
-        "y": 772.4962134361267,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 769.8636016845703,\r
+        "y": 747.4962093830109,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76dbb250.b292cc",\r
+        "id": "740c748a.ebce9c",\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.site-vf-index\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 767.6866912841797,\r
-        "y": 719.1629462242126,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 778.1970977783203,\r
+        "y": 694.1629421710968,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "154ced05.a101f3",\r
+        "id": "fc345089.c5339",\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": 741.6866683959961,\r
-        "y": 665.1628398895264,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 752.1970748901367,\r
+        "y": 640.1628358364105,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "be0d3540.8ebb28",\r
+        "id": "b816fc60.a5218",\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": 756.6863288879395,\r
-        "y": 555.1542205810547,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 767.1967353820801,\r
+        "y": 530.1542165279388,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "788efb60.76f4a4",\r
+        "id": "e97f4b5a.d20bc8",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-site-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 772.686637878418,\r
-        "y": 607.1544017791748,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 783.1970443725586,\r
+        "y": 582.154397726059,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6868f266.5fe7ec",\r
+        "id": "5663c20e.be57ac",\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.site-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": 754.5000877380371,\r
-        "y": 823.0000586509705,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 765.0104942321777,\r
+        "y": 798.0000545978546,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e78bb1b3.a529d",\r
+        "id": "8c48570.a7e2ba8",\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`' />\n",\r
         "comments": "",\r
-        "x": 764.0001068115234,\r
-        "y": 871.9999680519104,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 774.5105133056641,\r
+        "y": 846.9999639987946,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd37bb03.271ec8",\r
+        "id": "192f7a8f.f6f5f5",\r
         "type": "save",\r
         "name": "save sdwan vpn resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $prop.site-vf-index' >\n<parameter name='site-resource-id' value='`$prop.site-vf-index`' />\n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='`$prop.site.type`' />\n<parameter name='role' value='`$prop.site.role`' />\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/'` \" />",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $prop.site-vf-index' >\n<parameter name='site-resource-id' value='`$prop.site-vf-index`' />\n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='`$prop.site.type`' />\n<parameter name='role' value='`$prop.site.role`' />\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.site-vf-index + '/vf-module-data/'` \" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 766.5000419616699,\r
-        "y": 917.4999742507935,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 777.0104484558105,\r
+        "y": 892.4999701976776,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "395e35c1.a6a5fa",\r
+        "id": "dd669d99.3d6e7",\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=\"site-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/site-resources/site-resource/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"site-resource.site-resource-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": 765.4999847412109,\r
-        "y": 964.5000219345093,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 776.0103912353516,\r
+        "y": 939.5000178813934,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2b07f61e.bf4a1a",\r
+        "id": "37b7efe8.c51dd",\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": 714.2225151062012,\r
-        "y": 1010.6738648414612,\r
-        "z": "147f59c8.d7f266",\r
+        "x": 724.7329216003418,\r
+        "y": 985.6738607883453,\r
+        "z": "7f7f8941.3fdb18",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file

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 58dcb22..88c8553 100644 (file)
--- 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,35 +1,35 @@
 [\r
     {\r
-        "id": "86705660.0abdc8",\r
+        "id": "f25c52a5.c1512",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 476.00390625,\r
-        "y": 401.9999997615814,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 431.0104064941406,\r
+        "y": 360.00000047683716,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "33a55b62.a48504",\r
-                "c9956259.20d27",\r
-                "92e109fc.d487c8",\r
-                "fa6a2af9.45d408",\r
-                "96b8a138.b9de9",\r
-                "1072d79c.c97df8",\r
-                "7fb4c42e.fff1cc",\r
-                "8252c529.c8dc08",\r
-                "d1676675.1b3088",\r
-                "80911d80.565f6",\r
-                "f1c0f2fa.5d8e8",\r
-                "69439d08.c30934",\r
-                "a6352f7.5aa86d"\r
+                "b0ec8338.580f5",\r
+                "f7ddfb47.5b2f08",\r
+                "b17c2a0a.9c7048",\r
+                "b301b0b4.47969",\r
+                "75b3686.06a8798",\r
+                "eda7bf6a.a6768",\r
+                "1c914e3e.bd19d2",\r
+                "e8fbb993.4260a8",\r
+                "ce57fa36.d86878",\r
+                "67b336e3.64c8a8",\r
+                "393d128d.77829e",\r
+                "3dff4920.e6f876",\r
+                "1788c292.f60a9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4414eba1.be7024",\r
+        "id": "fd150a68.54b208",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -37,512 +37,512 @@
         "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": 318.00392150878906,\r
-        "y": 185.99999117851257,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 273.0104217529297,\r
+        "y": 143.9999918937683,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "665e6349.0f20bc"\r
+                "58419eae.b9425"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "665e6349.0f20bc",\r
+        "id": "58419eae.b9425",\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": 317.00392150878906,\r
-        "y": 285.9999911785126,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 272.0104217529297,\r
+        "y": 243.9999918937683,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "86705660.0abdc8"\r
+                "f25c52a5.c1512"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5e65dcf.93a1d",\r
+        "id": "c35c953.b5e8868",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 147.50392150878906,\r
-        "y": 96.9999988079071,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 102.51042175292969,\r
+        "y": 54.99999952316284,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "4414eba1.be7024"\r
+                "fd150a68.54b208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9956259.20d27",\r
+        "id": "f7ddfb47.5b2f08",\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": 851.2541379928589,\r
-        "y": 410.66667890548706,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 806.2606382369995,\r
+        "y": 368.6666796207428,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "5f7e52d8.71003c"\r
+                "fcacce0e.8c56d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f7e52d8.71003c",\r
+        "id": "fcacce0e.8c56d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1066.0324811935425,\r
-        "y": 408.2222628593445,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1021.0389814376831,\r
+        "y": 366.2222635746002,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "b5888647.1272c8",\r
-                "f88a8224.ffbd4"\r
+                "e9bb9dc5.ab9e7",\r
+                "437b18ad.950888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5888647.1272c8",\r
+        "id": "e9bb9dc5.ab9e7",\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": 1262.2886838912964,\r
-        "y": 385.97040128707886,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1217.295184135437,\r
+        "y": 343.9704020023346,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f88a8224.ffbd4",\r
+        "id": "437b18ad.950888",\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": 1231.7331113815308,\r
-        "y": 422.97051763534546,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1186.7396116256714,\r
+        "y": 380.9705183506012,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "84649b93.490df8",\r
+        "id": "7d6fd9af.e0a388",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1235.254340171814,\r
-        "y": 345.33334732055664,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1190.2608404159546,\r
+        "y": 303.3333480358124,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "33a55b62.a48504",\r
+        "id": "b0ec8338.580f5",\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": 833.0039367675781,\r
-        "y": 264.0000157356262,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 788.0104370117188,\r
+        "y": 222.00001645088196,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "5e528a3d.403a94",\r
-                "e1430919.889a48"\r
+                "e3d991cc.0551d",\r
+                "fab03553.0f6bc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e528a3d.403a94",\r
+        "id": "e3d991cc.0551d",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1064.0039472579956,\r
-        "y": 240.00001287460327,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1019.0104475021362,\r
+        "y": 198.000013589859,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "d1fe70de.0d5a2"\r
+                "cd9f31aa.1f944"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1430919.889a48",\r
+        "id": "fab03553.0f6bc8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1064.0039472579956,\r
-        "y": 280.00001287460327,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1019.0104475021362,\r
+        "y": 238.000013589859,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "550ac6cc.1a43f8"\r
+                "9fa4f951.782718"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1fe70de.0d5a2",\r
+        "id": "cd9f31aa.1f944",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1206.5039472579956,\r
-        "y": 240.00001287460327,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1161.5104475021362,\r
+        "y": 198.000013589859,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "550ac6cc.1a43f8",\r
+        "id": "9fa4f951.782718",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1208.3609914779663,\r
-        "y": 279.9365248680115,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1163.367491722107,\r
+        "y": 237.9365255832672,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "2b30e41b.b2df2c",\r
-                "735539ef.d045e8"\r
+                "f792bd90.84c2f",\r
+                "a00871e4.c717d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "735539ef.d045e8",\r
+        "id": "a00871e4.c717d",\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": 1361.0594663619995,\r
-        "y": 249.5556235606782,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1316.0659666061401,\r
+        "y": 207.55562427593395,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b30e41b.b2df2c",\r
+        "id": "f792bd90.84c2f",\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": 1417.4879713058472,\r
-        "y": 302.7777533531189,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1372.4944715499878,\r
+        "y": 260.77775406837463,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "e7001097.30f29"\r
+                "2a945efe.523112"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87bb5bc0.359988",\r
+        "id": "a3b8abe8.a0e028",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1641.1387014389038,\r
-        "y": 261.03181076049805,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1596.1452016830444,\r
+        "y": 219.03181147575378,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7001097.30f29",\r
+        "id": "2a945efe.523112",\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": 1692.7736921310425,\r
-        "y": 302.34925603866577,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1647.780192375183,\r
+        "y": 260.3492567539215,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "c77c794f.c68788"\r
+                "f09636f3.8478b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c77c794f.c68788",\r
+        "id": "f09636f3.8478b8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1593.5038900375366,\r
-        "y": 360.9206871986389,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1548.5103902816772,\r
+        "y": 318.92068791389465,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "1ae23876.21a108"\r
+                "a87baae5.4ae3f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ae23876.21a108",\r
+        "id": "a87baae5.4ae3f8",\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": 1741.2539930343628,\r
-        "y": 360.7778792674653,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1696.2604932785034,\r
+        "y": 318.77787998272106,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1072d79c.c97df8",\r
+        "id": "eda7bf6a.a6768",\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": 846.8571271896362,\r
-        "y": 713.4962668418884,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 801.8636274337769,\r
+        "y": 671.4962675571442,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "96b8a138.b9de9",\r
+        "id": "75b3686.06a8798",\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": 858.1906995773315,\r
-        "y": 666.1629691123962,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 813.1971998214722,\r
+        "y": 624.162969827652,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa6a2af9.45d408",\r
+        "id": "b301b0b4.47969",\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": 830.1907606124878,\r
-        "y": 617.1629691123962,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 785.1972608566284,\r
+        "y": 575.162969827652,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "92e109fc.d487c8",\r
+        "id": "b17c2a0a.9c7048",\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": 830.1902875900269,\r
-        "y": 563.1542572975159,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 785.1967878341675,\r
+        "y": 521.1542580127716,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7fb4c42e.fff1cc",\r
+        "id": "1c914e3e.bd19d2",\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": 840.5041151046753,\r
-        "y": 811.000087916851,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 795.5106153488159,\r
+        "y": 769.0000886321068,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "69439d08.c30934",\r
+        "id": "3dff4920.e6f876",\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
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 847.0039758682251,\r
-        "y": 856.5000357627869,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 802.0104761123657,\r
+        "y": 814.5000364780426,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8252c529.c8dc08",\r
+        "id": "e8fbb993.4260a8",\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": 794.7264490127563,\r
-        "y": 949.6739263534546,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 749.732949256897,\r
+        "y": 907.6739270687103,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1676675.1b3088",\r
+        "id": "ce57fa36.d86878",\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": 858.2578535079956,\r
-        "y": 499.5039267539978,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 813.2643537521362,\r
+        "y": 457.50392746925354,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "63318660.a4e798"\r
+                "e6621181.b6207"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63318660.a4e798",\r
+        "id": "e6621181.b6207",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1145.480731010437,\r
-        "y": 499.7262406349182,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1100.4872312545776,\r
+        "y": 457.72624135017395,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "1e3ec759.b2be29",\r
-                "bfacfb85.875b78"\r
+                "cf9839cf.8bf478",\r
+                "7fad1cad.2e9334"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e3ec759.b2be29",\r
+        "id": "cf9839cf.8bf478",\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": 1333.7025747299194,\r
-        "y": 482.05954480171204,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1288.70907497406,\r
+        "y": 440.0595455169678,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "4c3c07dc.109bb8"\r
+                "2663612d.85d52e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfacfb85.875b78",\r
+        "id": "7fad1cad.2e9334",\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": 1344.5422353744507,\r
-        "y": 522.0595428943634,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1299.5487356185913,\r
+        "y": 480.05954360961914,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "8910bf6.fa8bd4"\r
+                "1951da82.25c5f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c3c07dc.109bb8",\r
+        "id": "2663612d.85d52e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1520.7025747299194,\r
-        "y": 478.05954480171204,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1475.70907497406,\r
+        "y": 436.0595455169678,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "330c74f0.0fa8ac"\r
+                "e034463.55bd5b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8910bf6.fa8bd4",\r
+        "id": "1951da82.25c5f5",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1514.5422353744507,\r
-        "y": 518.0595428943634,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1469.5487356185913,\r
+        "y": 476.05954360961914,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             [\r
-                "c760e70.ca63518"\r
+                "18d6441f.f0cc5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "330c74f0.0fa8ac",\r
+        "id": "e034463.55bd5b8",\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": 1670.7027044296265,\r
-        "y": 476.6595513820648,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1625.709204673767,\r
+        "y": 434.65955209732056,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c760e70.ca63518",\r
+        "id": "18d6441f.f0cc5c",\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": 1701.8756761550903,\r
-        "y": 516.5206997394562,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 1656.882176399231,\r
+        "y": 474.5207004547119,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80911d80.565f6",\r
+        "id": "67b336e3.64c8a8",\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": 954.5077972412109,\r
-        "y": 190.0039086341858,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 909.5142974853516,\r
+        "y": 148.00390934944153,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f1c0f2fa.5d8e8",\r
+        "id": "393d128d.77829e",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "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",\r
         "comments": "",\r
-        "x": 832.5039930343628,\r
-        "y": 762.0313073992729,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 787.5104932785034,\r
+        "y": 720.0313081145287,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6352f7.5aa86d",\r
+        "id": "1788c292.f60a9d",\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": 847.004054069519,\r
-        "y": 904.0001769065857,\r
-        "z": "12e5b519.7c42cb",\r
+        "x": 802.0105543136597,\r
+        "y": 862.0001776218414,\r
+        "z": "3b61dfe7.30ac3",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json
index c339883..e76571f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json
@@ -1,6 +1,6 @@
 [\r
     {\r
-        "id": "5de743a6.6e9fdc",\r
+        "id": "aee5dac3.29d8f8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -8,524 +8,524 @@
         "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": 292.03125,\r
-        "y": 127.03125,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 259.0104064941406,\r
+        "y": 136.99999237060547,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "831852f4.73c97"\r
+                "92f80405.527238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "831852f4.73c97",\r
+        "id": "92f80405.527238",\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": 291.03125,\r
-        "y": 227.03125,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 258.0104064941406,\r
+        "y": 236.99999237060547,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "f0bca81d.b6a0f8"\r
+                "8357a961.bd7368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8410a95b.8b6678",\r
+        "id": "a10fd13a.8313d",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 148.53124618530273,\r
-        "y": 36.03125762939453,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 115.51040267944336,\r
+        "y": 46,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "5de743a6.6e9fdc"\r
+                "aee5dac3.29d8f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0bca81d.b6a0f8",\r
+        "id": "8357a961.bd7368",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 450.03123474121094,\r
-        "y": 343.03125858306885,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 417.01039123535156,\r
+        "y": 353.0000009536743,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\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
+                "c20a7dc0.e21ea",\r
+                "b9fc1e5f.5b376",\r
+                "1b6a0c2c.530674",\r
+                "dfd3a664.1be748",\r
+                "f3dc4ebd.df298",\r
+                "cae5d4a0.b09a38",\r
+                "67d04e5d.908a3",\r
+                "fd081780.8915a8",\r
+                "4fc9e2ee.90febc",\r
+                "cdfc7ae4.0514d8",\r
+                "2814f80b.cacb28",\r
+                "da49c07c.27b0f",\r
+                "3699b36a.223adc",\r
+                "1bf42dc2.073fb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54bfa066.4da69",\r
+        "id": "c20a7dc0.e21ea",\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": 750.3606567382812,\r
-        "y": 234.52738285064697,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 717.3398132324219,\r
+        "y": 244.49612522125244,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "53ca6ad5.693354"\r
+                "fc97057b.994b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53ca6ad5.693354",\r
+        "id": "fc97057b.994b78",\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": 1002.3607482910156,\r
-        "y": 233.1940460205078,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 969.3399047851562,\r
+        "y": 243.16278839111328,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "3af25422.f8b80c"\r
+                "df301c25.93aef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61e228fb.8092e8",\r
+        "id": "311e101f.d5d19",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1374.0272369384766,\r
-        "y": 235.19404888153076,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1341.0063934326172,\r
+        "y": 245.16279125213623,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3af25422.f8b80c",\r
+        "id": "df301c25.93aef",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1220.6940650939941,\r
-        "y": 235.1940279006958,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1187.6732215881348,\r
+        "y": 245.16277027130127,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "61e228fb.8092e8"\r
+                "311e101f.d5d19"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "262e8a6c.764e06",\r
+        "id": "dfd3a664.1be748",\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": 824.2814407348633,\r
-        "y": 456.6979160308838,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 791.2605972290039,\r
+        "y": 466.66665840148926,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "6641b8fa.11e218"\r
+                "aad3c15.925ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6641b8fa.11e218",\r
+        "id": "aad3c15.925ee4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1039.0597839355469,\r
-        "y": 454.2534999847412,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1006.0389404296875,\r
+        "y": 464.2222423553467,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "4c2187d7.70c4d8",\r
-                "32a53869.510578"\r
+                "917fbe88.711cc",\r
+                "c43ea4c0.149928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c2187d7.70c4d8",\r
+        "id": "917fbe88.711cc",\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": 1235.3159866333008,\r
-        "y": 432.0016384124756,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1202.2951431274414,\r
+        "y": 441.97038078308105,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "32a53869.510578",\r
+        "id": "c43ea4c0.149928",\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": 1204.7604141235352,\r
-        "y": 469.0017547607422,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1171.7395706176758,\r
+        "y": 478.97049713134766,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab557068.64844",\r
+        "id": "5248680e.c068e8",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1208.2816429138184,\r
-        "y": 391.36458444595337,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1175.260799407959,\r
+        "y": 401.33332681655884,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1eb4450c.b37a3b",\r
+        "id": "b9fc1e5f.5b376",\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": 764.78125,\r
-        "y": 190.03125190734863,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 731.7604064941406,\r
+        "y": 199.9999942779541,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "e279b1ab.b937f"\r
+                "c77be859.d85c08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e279b1ab.b937f",\r
+        "id": "c77be859.d85c08",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 951.4479293823242,\r
-        "y": 189.36454963684082,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 918.4270858764648,\r
+        "y": 199.3332920074463,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "c52a39f4.c6da18"\r
+                "c9a6db6e.787d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c52a39f4.c6da18",\r
+        "id": "c9a6db6e.787d58",\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": 1133.1145553588867,\r
-        "y": 189.36454963684082,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1100.0937118530273,\r
+        "y": 199.3332920074463,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff1f4bbb.9c88d8",\r
+        "id": "1b6a0c2c.530674",\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": 806.0312395095825,\r
-        "y": 310.03125286102295,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 773.0103960037231,\r
+        "y": 319.9999952316284,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "cd7442d9.34306",\r
-                "6d930136.d20cb"\r
+                "9acf5c90.6cf6",\r
+                "ffb3f2fc.2e117"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd7442d9.34306",\r
+        "id": "9acf5c90.6cf6",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1037.03125,\r
-        "y": 286.03125,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1004.0104064941406,\r
+        "y": 295.99999237060547,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "c51e25a8.593288"\r
+                "8e0399d7.7006d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d930136.d20cb",\r
+        "id": "ffb3f2fc.2e117",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1037.03125,\r
-        "y": 326.03125,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1004.0104064941406,\r
+        "y": 335.99999237060547,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "8a36da98.f826b8"\r
+                "ef3e733d.2d036"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c51e25a8.593288",\r
+        "id": "8e0399d7.7006d8",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1179.53125,\r
-        "y": 286.03125,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1146.5104064941406,\r
+        "y": 295.99999237060547,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8a36da98.f826b8",\r
+        "id": "ef3e733d.2d036",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1181.3882942199707,\r
-        "y": 325.9677619934082,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1148.3674507141113,\r
+        "y": 335.9365043640137,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "26e4ea27.208ad6",\r
-                "44db3104.e81c6"\r
+                "1d25ad68.e6ab83",\r
+                "461a624f.09559c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44db3104.e81c6",\r
+        "id": "461a624f.09559c",\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": 1334.086769104004,\r
-        "y": 295.58686068607494,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1301.0659255981445,\r
+        "y": 305.5556030566804,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "26e4ea27.208ad6",\r
+        "id": "1d25ad68.e6ab83",\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": 1390.5152740478516,\r
-        "y": 348.8089904785156,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1357.4944305419922,\r
+        "y": 358.7777328491211,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "3b7c03ef.0af89c"\r
+                "620a6b7.d8fa094"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b9f74ec.1882ec",\r
+        "id": "406aa837.6a2a68",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1614.1660041809082,\r
-        "y": 307.0630478858948,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1581.1451606750488,\r
+        "y": 317.03179025650024,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3b7c03ef.0af89c",\r
+        "id": "620a6b7.d8fa094",\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": 1665.8009948730469,\r
-        "y": 348.3804931640625,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1632.7801513671875,\r
+        "y": 358.34923553466797,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "84bba4b1.816e38"\r
+                "89ef579f.c10518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84bba4b1.816e38",\r
+        "id": "89ef579f.c10518",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1566.531192779541,\r
-        "y": 406.95192432403564,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1533.5103492736816,\r
+        "y": 416.9206666946411,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             [\r
-                "4d582e07.7c7a1"\r
+                "b4a45077.2328e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d582e07.7c7a1",\r
+        "id": "b4a45077.2328e",\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": 1714.2812957763672,\r
-        "y": 406.80911639286205,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 1681.2604522705078,\r
+        "y": 416.7778587634675,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b9a9c47.ff729",\r
+        "id": "fd081780.8915a8",\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.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": 821.8844604492188,\r
-        "y": 730.527437210083,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 788.8636169433594,\r
+        "y": 740.4961795806885,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fdda37d.d3044c8",\r
+        "id": "67d04e5d.908a3",\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": 831.2179641723633,\r
-        "y": 682.1941680908203,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 798.1971206665039,\r
+        "y": 692.1629104614258,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa6eaef6.2d96",\r
+        "id": "cae5d4a0.b09a38",\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": 803.2179107666016,\r
-        "y": 629.1941051483154,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 770.1970672607422,\r
+        "y": 639.1628475189209,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1438dd60.41b403",\r
+        "id": "f3dc4ebd.df298",\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": 815.2175788879395,\r
-        "y": 519.1854801177979,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 782.1967353820801,\r
+        "y": 529.1542224884033,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89e460e0.31c23",\r
+        "id": "4fc9e2ee.90febc",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\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": 807.0313243865967,\r
-        "y": 788.0312948226929,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 774.0104808807373,\r
+        "y": 798.0000371932983,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cf5e55a3.da5e38",\r
+        "id": "cdfc7ae4.0514d8",\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": 821.5313835144043,\r
-        "y": 838.0311880111694,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 788.5105400085449,\r
+        "y": 847.9999303817749,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "981dfc9a.eb48b",\r
+        "id": "3699b36a.223adc",\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.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
+        "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-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.wan-port-vf-index + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 825.0312919616699,\r
-        "y": 881.5312337875366,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 792.0104484558105,\r
+        "y": 891.4999761581421,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "461f9f03.a33d2",\r
+        "id": "1bf42dc2.073fb2",\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=\"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": 822.0312194824219,\r
-        "y": 927.5312652587891,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 789.0103759765625,\r
+        "y": 937.5000076293945,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3ce6fee1.f7c372",\r
+        "id": "2814f80b.cacb28",\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": 772.7537651062012,\r
-        "y": 974.7051243782043,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 739.7329216003418,\r
+        "y": 984.6738667488098,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37eaec79.c59c14",\r
+        "id": "da49c07c.27b0f",\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": 814.9201202392578,\r
-        "y": 581.9201335906982,\r
-        "z": "56fc6b1a.95dca4",\r
+        "x": 781.8992767333984,\r
+        "y": 591.8888759613037,\r
+        "z": "3e6f238d.8b432c",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
index 3414cb9..85cd16f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "aeae6125.a8d28",\r
+        "id": "91da6f32.2ced7",\r
         "type": "method",\r
         "name": "method vnf-topology-operation-vpn-site-resource-create",\r
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 265,\r
-        "y": 223.9999925820157,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 271.0104064941406,\r
+        "y": 185.9999923435971,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "10f15a6d.ba1d76"\r
+                "3735ac23.817b64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3eb5635c.ae734c",\r
+        "id": "312112f7.2d48de",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 141.57138061523438,\r
-        "y": 76,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 147.581787109375,\r
+        "y": 37.99999976158142,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "1821ad11.5dad23"\r
+                "1748f570.5068bb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1821ad11.5dad23",\r
+        "id": "1748f570.5068bb",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -38,434 +38,465 @@
         "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": 243.85708618164062,\r
-        "y": 134.23810407798737,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 249.86749267578125,\r
+        "y": 96.2381038395688,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "aeae6125.a8d28"\r
+                "91da6f32.2ced7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10f15a6d.ba1d76",\r
+        "id": "3735ac23.817b64",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 245.23804473876953,\r
-        "y": 395.6666643349454,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 251.24845123291016,\r
+        "y": 357.6666640965268,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "175dc57.fde8c3b",\r
-                "3afb3c65.1ca3a4",\r
-                "fadde341.82f5a",\r
-                "9885c8cf.ded0d8",\r
-                "a5e91b3d.29e478",\r
-                "6e79157a.cf280c",\r
-                "fff46357.6f3ad",\r
-                "5da9f931.70bc48",\r
-                "df8e278a.898b28",\r
-                "3a3acb9a.529fc4",\r
-                "ff8a3cb6.2dc93",\r
-                "1bd26429.61c74c"\r
+                "66587be7.1fa444",\r
+                "a22f6305.02259",\r
+                "476531fa.dda8b",\r
+                "39075706.c01f38",\r
+                "14e1d1a2.1874ee",\r
+                "25011a4c.02d6d6",\r
+                "4c11cb80.4d3124",\r
+                "1d89ddb9.e37322",\r
+                "d6dc0995.ddb998",\r
+                "ae963bb8.b0bb08",\r
+                "8d6ea2db.f2c5d8",\r
+                "a6ce5913.ef9af",\r
+                "fb6b70fa.8a9a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3afb3c65.1ca3a4",\r
+        "id": "a22f6305.02259",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to Created",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",\r
         "comments": "",\r
-        "x": 667.3848571777344,\r
-        "y": 759.670597076416,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 673.395263671875,\r
+        "y": 721.6705968379974,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "175dc57.fde8c3b",\r
+        "id": "66587be7.1fa444",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",\r
         "comments": "",\r
-        "x": 659.2380447387695,\r
-        "y": 654.6668491363525,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 665.2484512329102,\r
+        "y": 616.666848897934,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a5e91b3d.29e478",\r
+        "id": "14e1d1a2.1874ee",\r
         "type": "execute",\r
         "name": "execute generate-vnf-index",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 647.5715484619141,\r
-        "y": 604.3334331512451,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 653.5819549560547,\r
+        "y": 566.3334329128265,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ff8a3cb6.2dc93",\r
+        "id": "ae963bb8.b0bb08",\r
         "type": "set",\r
         "name": "set vnf-index to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 658.5716247558594,\r
-        "y": 711.3334369659424,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 664.58203125,\r
+        "y": 673.3334367275238,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fadde341.82f5a",\r
+        "id": "476531fa.dda8b",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 674.5713653564453,\r
-        "y": 274.3333559036255,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 680.5817718505859,\r
+        "y": 236.3333556652069,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "fe0779f6.a341a8",\r
-                "9f0ded05.d925c"\r
+                "ca401c47.9c85b",\r
+                "c9cc10cf.5154b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe0779f6.a341a8",\r
+        "id": "ca401c47.9c85b",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 909.2857513427734,\r
-        "y": 269.47617626190186,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 915.2961578369141,\r
+        "y": 231.47617602348328,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "e3b683ce.f47fd"\r
+                "6401cbd2.e53fc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3b683ce.f47fd",\r
+        "id": "6401cbd2.e53fc4",\r
         "type": "set",\r
         "name": "set vnf-index=0",\r
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1069.5714569091797,\r
-        "y": 269.47626781463623,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1075.5818634033203,\r
+        "y": 231.47626757621765,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f0ded05.d925c",\r
+        "id": "c9cc10cf.5154b",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 905.7142906188965,\r
-        "y": 302.76200771331787,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 911.7246971130371,\r
+        "y": 264.7620074748993,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "411ddf99.4fbb3"\r
+                "e78d606c.5025f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6024395.bc24",\r
+        "id": "2f520d06.0faf82",\r
         "type": "set",\r
         "name": "set vnf-index = vnf_length",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",\r
         "comments": "",\r
-        "x": 1298.571533203125,\r
-        "y": 281.04773330688477,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1304.5819396972656,\r
+        "y": 243.0477330684662,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3b57b625.74c07a",\r
+        "id": "fec4dc30.b6a09",\r
         "type": "for",\r
         "name": "for each existing VNF",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1287.0001525878906,\r
-        "y": 316.04770517349243,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1293.0105590820312,\r
+        "y": 278.04770493507385,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "a7076dba.f36af"\r
+                "c1fa87b1.a47458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "411ddf99.4fbb3",\r
+        "id": "e78d606c.5025f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1040.4285736083984,\r
-        "y": 304.76197719573975,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1046.438980102539,\r
+        "y": 266.76197695732117,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "b6024395.bc24",\r
-                "3b57b625.74c07a"\r
+                "2f520d06.0faf82",\r
+                "fec4dc30.b6a09"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7076dba.f36af",\r
+        "id": "c1fa87b1.a47458",\r
         "type": "switchNode",\r
         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1680.285888671875,\r
-        "y": 316.61918926239014,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1686.2962951660156,\r
+        "y": 278.61918902397156,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "b4dc78a5.d896c8"\r
+                "826e3f48.b128f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4dc78a5.d896c8",\r
+        "id": "826e3f48.b128f",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1961.571590423584,\r
-        "y": 315.19059467315674,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1967.5819969177246,\r
+        "y": 277.19059443473816,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "51ac74f.88fd58c"\r
+                "b86791b.2510f7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4be264b1.270e6c",\r
+        "id": "3995a6f4.c8ea1a",\r
         "type": "comment",\r
         "name": "make sure this vnf-id doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1649.4285049438477,\r
-        "y": 280.1905813217163,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1655.4389114379883,\r
+        "y": 242.19058108329773,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9885c8cf.ded0d8",\r
+        "id": "39075706.c01f38",\r
         "type": "set",\r
         "name": "set new vnf_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",\r
         "comments": "",\r
-        "x": 619.5715484619141,\r
-        "y": 552.333429813385,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 625.5819549560547,\r
+        "y": 514.3334295749664,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e79157a.cf280c",\r
+        "id": "25011a4c.02d6d6",\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": 606.5715103149414,\r
-        "y": 1022.5969486236572,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 612.581916809082,\r
+        "y": 984.5969483852386,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a3acb9a.529fc4",\r
+        "id": "d6dc0995.ddb998",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-instance-id\n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n\n<!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--key='service-instance.service-instance-id = $service-data.service-instance-id -->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 669.23828125,\r
-        "y": 969.5968418121338,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 675.2486877441406,\r
+        "y": 931.5968415737152,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fff46357.6f3ad",\r
+        "id": "4c11cb80.4d3124",\r
         "type": "set",\r
         "name": "set vnf-index and vnf-object-path",\r
         "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",\r
         "comments": "",\r
-        "x": 660.5715408325195,\r
-        "y": 800.5968675613403,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 666.5819473266602,\r
+        "y": 762.5968673229218,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5da9f931.70bc48",\r
-        "type": "set",\r
-        "name": "set vnf-request-input.",\r
-        "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",\r
-        "comments": "",\r
-        "x": 625.5711822509766,\r
-        "y": 503.32480239868164,\r
-        "z": "3deddfaf.57c2f",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "51ac74f.88fd58c",\r
+        "id": "b86791b.2510f7",\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=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 2090.1429595947266,\r
-        "y": 366.1906089782715,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 2096.153366088867,\r
+        "y": 328.1906087398529,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df8e278a.898b28",\r
+        "id": "1d89ddb9.e37322",\r
         "type": "save",\r
         "name": "save AnAI - vnf-instance.orchestration-status",\r
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"Created\" />\n<parameter name=\"in-maint\" value = \"true\" />\n<parameter name=\"vnf-type\" value='`$prop.vnfName`' />\n<parameter name=\"vnf-name\" value = \"`$prop.vnfName`\"/>\n<parameter name=\"model-invariant-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name=\"model-version-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`\"/>\n<parameter name=\"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 715.5458450317383,\r
-        "y": 910.2470846176147,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 721.5562515258789,\r
+        "y": 872.2470843791962,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6f579a3f.d15af4",\r
+        "id": "f26d49c8.d35f88",\r
         "type": "comment",\r
         "name": "TODO: change AAI models",\r
         "info": "",\r
         "comments": "",\r
-        "x": 649.1821060180664,\r
-        "y": 869.9743003845215,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 655.192512512207,\r
+        "y": 831.9743001461029,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1bd26429.61c74c",\r
-        "type": "switchNode",\r
-        "name": "switch service-data.vnf-request-input.vnf-name",\r
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>\n",\r
+        "id": "d87f26c1.85e508",\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='`$vnf-topology-operation-input.vnf-request-input.vnf-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": 693.0000152587891,\r
-        "y": 393.0000114440918,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1081.75,\r
+        "y": 325.75,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
-            [\r
-                "33ff6eed.504462",\r
-                "e2af6995.223f28",\r
-                "cc14ee3a.bceeb"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "33ff6eed.504462",\r
-        "type": "outcomeTrue",\r
-        "name": "SDWAN-vpn",\r
-        "xml": "<outcome value='SDWAN-vpn'>",\r
+        "id": "c94a6245.0a51b",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 990.6667137145996,\r
-        "y": 378.0000114440918,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 885.4937973022461,\r
+        "y": 330.0018730163574,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "55868aa1.2254e4"\r
+                "d87f26c1.85e508",\r
+                "1354d63c.ef6932"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2af6995.223f28",\r
-        "type": "outcomeTrue",\r
-        "name": "SDWAN-site",\r
-        "xml": "<outcome value='SDWAN-site'>",\r
+        "id": "8d6ea2db.f2c5d8",\r
+        "type": "for",\r
+        "name": "for loop idx - VNF input parameters",\r
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 983.6666870117188,\r
-        "y": 428,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 670.7154541015625,\r
+        "y": 332.4462890625,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "496e33ab.398b4c"\r
+                "c94a6245.0a51b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc14ee3a.bceeb",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
+        "id": "a6ce5913.ef9af",\r
+        "type": "set",\r
+        "name": "set vnf-request-input.",\r
+        "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",\r
+        "comments": "",\r
+        "x": 627.715087890625,\r
+        "y": 402.77099609375,\r
+        "z": "dbd46c1f.195f5",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1354d63c.ef6932",\r
+        "type": "set",\r
+        "name": "set parameterName",\r
+        "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
+        "comments": "",\r
+        "x": 1058.75,\r
+        "y": 371.75,\r
+        "z": "dbd46c1f.195f5",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fb6b70fa.8a9a6",\r
+        "type": "for",\r
+        "name": "for each sdwan-get-request-input-param",\r
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 966.6666870117188,\r
-        "y": 478,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 683.75,\r
+        "y": 454.75,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
             [\r
-                "c9a98bce.5a8c88"\r
+                "1b7219c7.3675ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9a98bce.5a8c88",\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=\"Error: vnf-name should be either SDWAN-vpn or SDWAN-site.\" />\n",\r
+        "id": "1b7219c7.3675ce",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
-        "x": 1137.333366394043,\r
-        "y": 476.00001335144043,\r
-        "z": "3deddfaf.57c2f",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 909.982666015625,\r
+        "y": 453.09375,\r
+        "z": "dbd46c1f.195f5",\r
+        "wires": [\r
+            [\r
+                "9ce04d06.518268"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "55868aa1.2254e4",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "id": "9ce04d06.518268",\r
+        "type": "switchNode",\r
+        "name": "switch vnf name",\r
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 1172,\r
-        "y": 379,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1066.482666015625,\r
+        "y": 451.09381103515625,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
-            []\r
+            [\r
+                "61770f57.83d8c8"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "496e33ab.398b4c",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "id": "61770f57.83d8c8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 1163,\r
-        "y": 427,\r
-        "z": "3deddfaf.57c2f",\r
+        "x": 1227.4830322265625,\r
+        "y": 451.0938720703125,\r
+        "z": "dbd46c1f.195f5",\r
         "wires": [\r
-            []\r
+            [\r
+                "4601daba.0ca18c"\r
+            ]\r
         ]\r
+    },\r
+    {\r
+        "id": "4601daba.0ca18c",\r
+        "type": "set",\r
+        "name": "set vnf name",\r
+        "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",\r
+        "comments": "",\r
+        "x": 1385.483154296875,\r
+        "y": 449.69390869140625,\r
+        "z": "dbd46c1f.195f5",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
index 80df2aa..15bbecf 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
@@ -162,7 +162,9 @@
                         <parameter name='version' value='`$prop.device.version`' />\r
                         <parameter name='system-ip' value='`$prop.device.systemIp`' />\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`' /><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='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-uuid`' />\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.vf-id + '/vf-module-data/'` " />\r
                     </save>\r
                 </outcome>\r
@@ -181,7 +183,7 @@
                         <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-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\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.vf-id + '/vf-module-data/'` " />\r
                     </update>\r
                 </outcome>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
index d1578ec..27f1c43 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-create.xml
@@ -1,6 +1,6 @@
 <service-logic\r
-        xmlns='http://www.onap.org/sdnc/svclogic'\r
-        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
+    xmlns='http://www.onap.org/sdnc/svclogic'\r
+    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
     <method rpc='sdwan-vf-operation-lanport-create' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -98,13 +98,13 @@
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
  + '/vf-module-data/vf-module-topology/'`"/>\r
                 <parameter name='vnf-object-path'\r
-                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ 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
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
  + '/vnf-data/vnf-topology/'`"/>\r
                 <parameter name='service-object-path'\r
-                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
@@ -113,8 +113,8 @@
                 <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`' />\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='lan-port-config'\r
-                  key='lan-port-config.lan-port-config-id = $prop.vf-id' >\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
+      key='lan-port-config.lan-port-config-id = $prop.vf-id' >\r
                 <parameter name="lan-port-config-id" value="`$prop.vf-id`" />\r
                 <parameter name="device-id" value='`$prop.lan.deviceName`' />\r
                 <parameter name="port-switch" value='`$prop.lan.portSwitch`' />\r
@@ -125,12 +125,12 @@
                 <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-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\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.vf-id + '/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
+            <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="lan-port-config" />\r
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/lan-port-configs/lan-port-config/' + $prop.vf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="lan-port-config-id" />\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml
index e4bdd6f..b88f3af 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml
@@ -114,7 +114,7 @@
                 <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-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\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
             </save>\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
index 360cb47..7d8950a 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
@@ -112,7 +112,7 @@
                 <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-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\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

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml
index f630eee..a25f727 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml
@@ -121,7 +121,7 @@
                 <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-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\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

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
index 3e8b537..4b28893 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
@@ -1,6 +1,6 @@
 <service-logic\r
-        xmlns='http://www.onap.org/sdnc/svclogic'\r
-        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
+    xmlns='http://www.onap.org/sdnc/svclogic'\r
+    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
     <method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -29,24 +29,32 @@
                     </block>\r
                 </outcome>\r
             </switch>\r
-            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-name`'>\r
-                <outcome value='SDWAN-vpn'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-                <outcome value='SDWAN-site'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-                <outcome value='Other'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error: vnf-name should be either SDWAN-vpn or SDWAN-site." />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
+            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">\r
+                <block>\r
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                        <parameter name="original_string" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\r
+                        <parameter name="regex" value="_"/>\r
+                        <parameter name="ctx_memory_result_key" value="param-prefix"/>\r
+                    </execute>\r
+                    <set>\r
+                        <parameter name="`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>\r
+                    </set>\r
+                </block>\r
+            </for>\r
             <set>\r
                 <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\r
             </set>\r
+            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">\r
+                <block>\r
+                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">\r
+                        <outcome value='true'>\r
+                            <set>\r
+                                <parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
+                            </set>\r
+                        </outcome>\r
+                    </switch>\r
+                </block>\r
+            </for>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\r
             </set>\r
@@ -73,21 +81,28 @@
                 <parameter name='vnfId' value='`$prop.vnf-id`' />\r
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />\r
             </set>\r
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                  resource="generic-vnf"\r
-                  key="generic-vnf.vnf-id = $prop.vnf-id" >\r
-                <parameter name="orchestration-status" value="create" />\r
-                <parameter name="vnf-type" value="some vnf-type" />\r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+       resource="generic-vnf"   \r
+               key="generic-vnf.vnf-id = $prop.vnf-id" >\r
+                <parameter name="orchestration-status" value="Created" />\r
+                <parameter name="in-maint" value = "true" />\r
+                <parameter name="vnf-type" value='`$prop.vnfName`' />\r
+                <parameter name="vnf-name" value = "`$prop.vnfName`"/>\r
+                <parameter name="model-invariant-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`"/>\r
+                <parameter name="model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>\r
+                <parameter name="model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>\r
             </save>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
-                  key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\r
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id\r
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'\r
-                  force="true" pfx="tmp.AnAI-data">\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \r
+      key='service-instance.service-instance-id = $service-data.service-instance-id\r
+         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \r
+         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \r
+      force="true" pfx="tmp.AnAI-data">\r
                 <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />\r
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-id`" />\r
+                <!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                <!--key='service-instance.service-instance-id = $service-data.service-instance-id -->\r
             </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r

diff --git a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json
index ce9d4f2..fff33cc 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json
+++ b/platform-logic/restapi-templates/src/main/json/sdwan-wan-port-static.json
@@ -1,6 +1,7 @@
 {
     "tnps": [
         {
+            "id": ${prop.wan.wanPortId},
             "name": ${prop.wan.name},
             "siteId": ${prop.wan.siteId},
             "deviceId": ${prop.wan.deviceId},
@@ -20,10 +21,6 @@
                     "userKey": null
                 }
              },
-             "transportNetworkInfo": {
-                 "transportNetworkId": ${prop.wan.transportNetworkId},
-                 "workMode": "active"
-             },
             "attributes": {
                 "inputBandwidth": ${prop.wan.inputBandwidth},
                 "outputBandwidth": ${prop.wan.outputBandwidth},
@@ -43,3 +40,4 @@
         }
     ]
 }
+