X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fsotn_nni%2FGENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json;h=1f85f4c86370d9c7abe3e0de113b29271daa70eb;hp=951a18f4ea6c0c61e95a7981e1d8032ec5e878eb;hb=f515a8831e0036414d69d73030e871dec88180f8;hpb=1df36cd2a20f26dfa1c80bc5c3baaa03140f1987

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
index 951a18f4..1f85f4c8 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
@@ -1,20 +1,35 @@
 [
     {
-        "id": "ed294889.e18cd8",
-        "type": "dgstart",
-        "name": "DGSTART",
+        "id": "7b71bd92.fd2814",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
         "outputs": 1,
-        "x": 117,
-        "y": 57,
-        "z": "a8db409e.810378",
+        "x": 459,
+        "y": 325.0000009536743,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "d573cd56.a0362"
+                "cd94e5aa.ecbb7",
+                "2023e2ef.c2aaae",
+                "b67caacf.835018",
+                "dc45507c.2c758",
+                "404d2254.b54cb4",
+                "f8f7ecd5.33f1b",
+                "192e11b1.7d71e6",
+                "a92fbbfb.a65698",
+                "19fc51d8.0cda46",
+                "14342bec.b0bb44",
+                "eaf312a9.dac698",
+                "657f9098.60c5e8",
+                "d49f5116.ef68d8"
             ]
         ]
     },
     {
-        "id": "d573cd56.a0362",
+        "id": "9fc16420.cc4ed8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,466 +37,511 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 248.2856903076172,
-        "y": 106.23810863494873,
-        "z": "a8db409e.810378",
+        "x": 301.00001525878906,
+        "y": 108.99999237060547,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "ab294e07.a9e7f"
+                "5abbcf9c.c62d48"
             ]
         ]
     },
     {
-        "id": "ab294e07.a9e7f",
+        "id": "5abbcf9c.c62d48",
         "type": "method",
-        "name": "method sotn-vf-operation-l2vpn-create",
+        "name": "sotn-vf-operation-l2vpn-create",
         "xml": "<method rpc='sotn-vf-operation-l2vpn-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 251.42861938476562,
-        "y": 191.00003242492676,
-        "z": "a8db409e.810378",
+        "x": 300.00001525878906,
+        "y": 208.99999237060547,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "3b2ee2be.0d5776"
+                "7b71bd92.fd2814"
             ]
         ]
     },
     {
-        "id": "3b2ee2be.0d5776",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "ad2ea8c5.fcd77",
+        "type": "dgstart",
+        "name": "DGSTART",
         "outputs": 1,
-        "x": 664.2380447387695,
-        "y": 394.6666717529297,
-        "z": "a8db409e.810378",
+        "x": 130.50001525878906,
+        "y": 20,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "7075470e.ead518",
-                "a887fb8.23d1908",
-                "c96cd735.589ad8",
-                "6d0e8b42.1f8964",
-                "49bfb25c.1c60ac",
-                "3b8acefc.66b31a",
-                "6eb961ad.5ae338",
-                "adbadf0e.275b3",
-                "c0c21f0e.1b5958",
-                "f1922be.86c2058",
-                "d0ca9568.fe847",
-                "5bbdffcc.b3f3b8"
+                "9fc16420.cc4ed8"
             ]
         ]
     },
     {
-        "id": "a887fb8.23d1908",
-        "type": "set",
-        "name": "set vnf-level-oper-status to Created",
-        "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",
+        "id": "2023e2ef.c2aaae",
+        "type": "for",
+        "name": "for loop idx - VF input parameters",
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
         "comments": "",
-        "x": 1086.3848571777344,
-        "y": 758.6706044944003,
-        "z": "a8db409e.810378",
-        "wires": []
+        "outputs": 1,
+        "x": 834.2502317428589,
+        "y": 333.66668009757996,
+        "z": "8baeaca1.28233",
+        "wires": [
+            [
+                "cf0ba013.1e08c8"
+            ]
+        ]
     },
     {
-        "id": "7075470e.ead518",
-        "type": "set",
-        "name": "copy input data to service data",
-        "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",
+        "id": "cf0ba013.1e08c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
-        "x": 1078.2380447387695,
-        "y": 653.6668565543368,
-        "z": "a8db409e.810378",
-        "wires": []
+        "outputs": 1,
+        "x": 1049.0285749435425,
+        "y": 331.2222640514374,
+        "z": "8baeaca1.28233",
+        "wires": [
+            [
+                "38f94a22.124166",
+                "7ae6315a.90c6e8"
+            ]
+        ]
     },
     {
-        "id": "49bfb25c.1c60ac",
+        "id": "38f94a22.124166",
         "type": "execute",
-        "name": "execute generate-vnf-index",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-id\"/>\n",
+        "name": "execute split parameterName",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1066.571548461914,
-        "y": 603.3334405692294,
-        "z": "a8db409e.810378",
+        "x": 1245.2847776412964,
+        "y": 308.97040247917175,
+        "z": "8baeaca1.28233",
         "wires": [
             []
         ]
     },
     {
-        "id": "c0c21f0e.1b5958",
+        "id": "7ae6315a.90c6e8",
         "type": "set",
-        "name": "set vnf-index to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",
+        "name": "set parameterName",
+        "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
+        "comments": "",
+        "x": 1214.7292051315308,
+        "y": 345.97051882743835,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "5639a33f.aee984",
+        "type": "comment",
+        "name": "Take the parameter names by removing prefix",
+        "info": "",
         "comments": "",
-        "x": 1077.5716247558594,
-        "y": 710.3334443839267,
-        "z": "a8db409e.810378",
+        "x": 1218.250433921814,
+        "y": 268.33334851264954,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "c96cd735.589ad8",
+        "id": "cd94e5aa.ecbb7",
         "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "name": "switch vf-modules.vf-module_length",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1093.5713653564453,
-        "y": 273.3333633216098,
-        "z": "a8db409e.810378",
+        "x": 816.0000305175781,
+        "y": 187.00001692771912,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "9138e1fa.f1d37",
-                "bf45ff7d.c852e"
+                "543dc8c7.d54a4",
+                "7bbfeaa9.0bd62c"
             ]
         ]
     },
     {
-        "id": "9138e1fa.f1d37",
+        "id": "543dc8c7.d54a4",
         "type": "other",
-        "name": "NULL",
+        "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1328.2857513427734,
-        "y": 268.47618367988616,
-        "z": "a8db409e.810378",
+        "x": 1047.0000410079956,
+        "y": 163.00001406669617,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "4dbced61.ca9034"
+                "be09761b.de8e3"
             ]
         ]
     },
     {
-        "id": "4dbced61.ca9034",
-        "type": "set",
-        "name": "set vnf-index=0",
-        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
-        "comments": "",
-        "x": 1488.5714569091797,
-        "y": 268.47627523262054,
-        "z": "a8db409e.810378",
-        "wires": []
-    },
-    {
-        "id": "bf45ff7d.c852e",
+        "id": "7bbfeaa9.0bd62c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1324.7142906188965,
-        "y": 301.7620151313022,
-        "z": "a8db409e.810378",
+        "x": 1047.0000410079956,
+        "y": 203.00001406669617,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "dbddb28c.bce1e8"
+                "655e11f8.e1faa8"
             ]
         ]
     },
     {
-        "id": "33a0ff35.932e78",
+        "id": "be09761b.de8e3",
         "type": "set",
-        "name": "set vnf-index = vnf_length",
-        "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
+        "name": "set vf-index",
+        "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1717.571533203125,
-        "y": 280.0477407248691,
-        "z": "a8db409e.810378",
+        "x": 1189.5000410079956,
+        "y": 163.00001406669617,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "36e21bba.2e2ef4",
-        "type": "for",
-        "name": "for each existing VNF",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "id": "655e11f8.e1faa8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1706.0001525878906,
-        "y": 315.04771259147674,
-        "z": "a8db409e.810378",
+        "x": 1191.3570852279663,
+        "y": 202.93652606010437,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "7dde789c.f76928"
+                "4b883294.d65484",
+                "b58a8196.c8fd18"
             ]
         ]
     },
     {
-        "id": "dbddb28c.bce1e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "b58a8196.c8fd18",
+        "type": "set",
+        "name": "set vf-index",
+        "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
+        "comments": "",
+        "x": 1344.0555601119995,
+        "y": 172.5556247527711,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "4b883294.d65484",
+        "type": "for",
+        "name": "for each existing vf-index",
+        "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1459.4285736083984,
-        "y": 303.76198461372405,
-        "z": "a8db409e.810378",
+        "x": 1400.4840650558472,
+        "y": 225.7777545452118,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "33a0ff35.932e78",
-                "36e21bba.2e2ef4"
+                "46919469.ed5074"
             ]
         ]
     },
     {
-        "id": "7dde789c.f76928",
+        "id": "23d12f2a.b840a8",
+        "type": "comment",
+        "name": "make sure this network doesn't exist already",
+        "info": "",
+        "comments": "",
+        "x": 1624.1347951889038,
+        "y": 184.03181195259094,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "46919469.ed5074",
         "type": "switchNode",
-        "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
+        "name": "switch vf-module-id found",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2099.285888671875,
-        "y": 315.61919668037444,
-        "z": "a8db409e.810378",
+        "x": 1675.7697858810425,
+        "y": 225.34925723075867,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "5924827c.34c2fc"
+                "9a5788e3.06116"
             ]
         ]
     },
     {
-        "id": "5924827c.34c2fc",
+        "id": "9a5788e3.06116",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2380.571590423584,
-        "y": 314.19060209114105,
-        "z": "a8db409e.810378",
+        "x": 1576.4999837875366,
+        "y": 283.9206883907318,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "46ba128f.50acd4"
+                "1914f90.a238b87"
             ]
         ]
     },
     {
-        "id": "88b8e912.2900e8",
-        "type": "comment",
-        "name": "make sure this vnf-id doesn't exist already",
-        "info": "",
+        "id": "1914f90.a238b87",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
         "comments": "",
-        "x": 2068.4285049438477,
-        "y": 279.1905887397006,
-        "z": "a8db409e.810378",
+        "x": 1724.2500867843628,
+        "y": 283.7778804595582,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "6d0e8b42.1f8964",
+        "id": "f8f7ecd5.33f1b",
         "type": "set",
-        "name": "set new vnf_length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
+        "name": "copy input data to service data",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n<!--<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />-->\n\n\n\n",
         "comments": "",
-        "x": 1038.571548461914,
-        "y": 551.3334372313693,
-        "z": "a8db409e.810378",
+        "x": 829.8532209396362,
+        "y": 636.4962680339813,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "3b8acefc.66b31a",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "id": "404d2254.b54cb4",
+        "type": "execute",
+        "name": "execute generate-vf-module-index",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 841.1867933273315,
+        "y": 589.1629703044891,
+        "z": "8baeaca1.28233",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dc45507c.2c758",
+        "type": "set",
+        "name": "set new vf-module_length",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
         "comments": "",
-        "x": 1025.5715103149414,
-        "y": 1021.5969560416415,
-        "z": "a8db409e.810378",
+        "x": 813.1868543624878,
+        "y": 540.1629703044891,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "6eb961ad.5ae338",
+        "id": "b67caacf.835018",
         "type": "set",
-        "name": "set vnf-index and vnf-object-path",
-        "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/'` \" />",
+        "name": "set vf-module-request-input.",
+        "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
         "comments": "",
-        "x": 1079.5715408325195,
-        "y": 799.5968749793246,
-        "z": "a8db409e.810378",
+        "x": 813.1863813400269,
+        "y": 486.15425848960876,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "46ba128f.50acd4",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'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",
+        "id": "192e11b1.7d71e6",
+        "type": "set",
+        "name": "set vf-module-level-oper-status",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
         "comments": "",
-        "x": 2509.1429595947266,
-        "y": 365.1906163962558,
-        "z": "a8db409e.810378",
+        "x": 823.5002088546753,
+        "y": 734.0000891089439,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "adbadf0e.275b3",
+        "id": "eaf312a9.dac698",
         "type": "save",
-        "name": "save AnAI - l2vpn.operational-status",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"   \n\t\tkey='connectivity.connectivity-id = $prop.connectivity-id' >\n<parameter name=\"operational-status\" value=\"Created\" />\n",
+        "name": "save connectivity resource in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.vpn-vf-index'>\n<parameter name='connectivity-id' value='`$prop.vpn-vf-index`' />\n<parameter name='operational-status' value='Created' />\n\n\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='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />-->\n<!--<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` \" />-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1134.5458450317383,
-        "y": 909.247092035599,
-        "z": "a8db409e.810378",
+        "x": 830.0000696182251,
+        "y": 779.5000369548798,
+        "z": "8baeaca1.28233",
         "wires": [
             []
         ]
     },
     {
-        "id": "204db5a4.c326da",
-        "type": "comment",
-        "name": "TODO: change AAI models",
-        "info": "",
+        "id": "a92fbbfb.a65698",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1068.1821060180664,
-        "y": 868.9743078025058,
-        "z": "a8db409e.810378",
+        "x": 777.7225427627563,
+        "y": 872.6739275455475,
+        "z": "8baeaca1.28233",
         "wires": []
     },
     {
-        "id": "e76c21c2.4a838",
-        "type": "execute",
-        "name": "execute split parameterName",
-        "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",
+        "id": "19fc51d8.0cda46",
+        "type": "for",
+        "name": "for loop i - Network input parameters",
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1494.7395935058594,
-        "y": 362.7500076564029,
-        "z": "a8db409e.810378",
+        "x": 841.2539472579956,
+        "y": 422.5039279460907,
+        "z": "8baeaca1.28233",
         "wires": [
-            []
+            [
+                "757b8d75.3d0a94"
+            ]
         ]
     },
     {
-        "id": "11945653.6c33ba",
+        "id": "757b8d75.3d0a94",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1298.4833908081055,
-        "y": 367.0018806727603,
-        "z": "a8db409e.810378",
+        "x": 1128.476824760437,
+        "y": 422.7262418270111,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "e76c21c2.4a838",
-                "e0fb04c6.a15c88"
+                "8a7ad1b3.ba99a8",
+                "597f978e.f5f578"
             ]
         ]
     },
     {
-        "id": "f1922be.86c2058",
-        "type": "for",
-        "name": "for loop idx - VNF input parameters",
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
+        "id": "8a7ad1b3.ba99a8",
+        "type": "switchNode",
+        "name": "switch name",
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1083.7050476074219,
-        "y": 369.4462967189029,
-        "z": "a8db409e.810378",
+        "x": 1316.6986684799194,
+        "y": 405.05954599380493,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "11945653.6c33ba"
+                "f3762745.5848d8"
             ]
         ]
     },
     {
-        "id": "d0ca9568.fe847",
-        "type": "set",
-        "name": "set vnf-request-input.",
-        "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",
-        "comments": "",
-        "x": 1040.7046813964844,
-        "y": 439.7710037501529,
-        "z": "a8db409e.810378",
-        "wires": []
-    },
-    {
-        "id": "e0fb04c6.a15c88",
-        "type": "set",
-        "name": "set parameterName",
-        "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",
-        "comments": "",
-        "x": 1471.7395935058594,
-        "y": 408.7500076564029,
-        "z": "a8db409e.810378",
-        "wires": []
-    },
-    {
-        "id": "5bbdffcc.b3f3b8",
-        "type": "for",
-        "name": "for each sdwan-get-request-input-param",
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
+        "id": "597f978e.f5f578",
+        "type": "switchNode",
+        "name": "switch topology",
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 1096.7395935058594,
-        "y": 491.7500076564029,
-        "z": "a8db409e.810378",
+        "x": 1327.5383291244507,
+        "y": 445.0595440864563,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "e0f56e7c.d34a1"
+                "751a61f6.1024c8"
             ]
         ]
     },
     {
-        "id": "e0f56e7c.d34a1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "f3762745.5848d8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1322.9722595214844,
-        "y": 490.0937576564029,
-        "z": "a8db409e.810378",
+        "x": 1503.6986684799194,
+        "y": 401.05954599380493,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "5be518f3.e26978"
+                "254d198b.dac90e"
             ]
         ]
     },
     {
-        "id": "5be518f3.e26978",
-        "type": "switchNode",
-        "name": "switch vnf name",
-        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
+        "id": "751a61f6.1024c8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479.4722595214844,
-        "y": 488.09381869155914,
-        "z": "a8db409e.810378",
+        "x": 1497.5383291244507,
+        "y": 441.0595440864563,
+        "z": "8baeaca1.28233",
         "wires": [
             [
-                "3bfa8dc2.ee3a5a"
+                "bd2b112e.cf89f"
             ]
         ]
     },
     {
-        "id": "3bfa8dc2.ee3a5a",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "254d198b.dac90e",
+        "type": "set",
+        "name": "set name",
+        "xml": "<set>\n<parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n\n",
+        "comments": "",
+        "x": 1653.6987981796265,
+        "y": 399.6595525741577,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "bd2b112e.cf89f",
+        "type": "set",
+        "name": "set topology",
+        "xml": "<set>\n<parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 1684.8717699050903,
+        "y": 439.5207009315491,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "14342bec.b0bb44",
+        "type": "set",
+        "name": "set vf-module-object-path",
+        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vpn-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
+        "comments": "",
+        "x": 815.5000867843628,
+        "y": 685.0313085913658,
+        "z": "8baeaca1.28233",
+        "wires": []
+    },
+    {
+        "id": "657f9098.60c5e8",
+        "type": "save",
+        "name": "save service relationship in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $vf-module-topology-operation-input.vnf-information.vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n<!--key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1640.4726257324219,
-        "y": 488.0938797267154,
-        "z": "a8db409e.810378",
+        "x": 830.000147819519,
+        "y": 827.0001780986786,
+        "z": "8baeaca1.28233",
         "wires": [
-            [
-                "5f201fd1.6acc3"
-            ]
+            []
         ]
     },
     {
-        "id": "5f201fd1.6acc3",
+        "id": "d49f5116.ef68d8",
         "type": "set",
-        "name": "set vnf name",
-        "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
+        "name": "set vnf-index",
+        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n\n\n",
         "comments": "",
-        "x": 1798.4727478027344,
-        "y": 486.69391634780914,
-        "z": "a8db409e.810378",
+        "x": 739,
+        "y": 124,
+        "z": "8baeaca1.28233",
         "wires": []
     }
 ]
\ No newline at end of file