Fixed lan-port-config resource in AAI 99/85899/1
authorprakash.e <prakash.e@huawei.com>
Sun, 21 Apr 2019 04:24:06 +0000 (09:54 +0530)
committerprakash.e <prakash.e@huawei.com>
Sun, 21 Apr 2019 04:24:19 +0000 (09:54 +0530)
Added vnf-index null check and Added lan-port-config
resource inplace of sdwan-vpn resource in AAI for
lan-port-create

Change-Id: If05b730da8932fb25396cb82688e302c6c5a4eab
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: 09c286f73a72a24f46ef09d5f2c5519eb79a05bd

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

index b4f838d..3ce166e 100644 (file)
 [\r
     {\r
-        "id": "3d343d97.916e12",\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": 285,\r
-        "y": 241.99999237060547,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "72bd87e4.7210f8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "72bd87e4.7210f8",\r
+        "id": "3ecdadeb.18aa62",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 444.99999237060547,\r
-        "y": 374.9999885559082,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "fa08bbfd.f36978",\r
-                "662c5c91.bf14f4",\r
-                "3a8662b6.7187de",\r
-                "d0f313c6.a0ddd",\r
-                "87f25b72.4b1968",\r
-                "c96f1257.64bf8",\r
-                "9ca9880e.f474f8",\r
-                "23949443.ee4acc",\r
-                "64302671.d03c08",\r
-                "305a60f0.cd87a",\r
-                "17d1be09.26b4d2",\r
-                "8ab4415a.f464b",\r
-                "b65f8656.be0f98",\r
-                "8944476b.d5f828"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "78ad706e.d12e1",\r
-        "type": "service-logic",\r
-        "name": "GENERIC-RESOURCE-API ${project.version}",\r
-        "module": "GENERIC-RESOURCE-API",\r
-        "version": "${project.version}",\r
-        "comments": "",\r
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
-        "outputs": 1,\r
-        "x": 286,\r
-        "y": 141.99999237060547,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "3d343d97.916e12"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "7c5370ed.0ab17",\r
-        "type": "dgstart",\r
-        "name": "DGSTART",\r
-        "outputs": 1,\r
-        "x": 115.5,\r
-        "y": 53,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 432.00389862060547,\r
+        "y": 378.9999885559082,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "78ad706e.d12e1"\r
+                "b1de8da9.db8a2",\r
+                "d704787.9944088",\r
+                "c4e200e6.2e02b",\r
+                "5f812e79.2be7e",\r
+                "2b234f37.76666",\r
+                "7dbca450.42794c",\r
+                "7e93696e.840218",\r
+                "676ec3b1.844d3c",\r
+                "e3e05047.2e5b8",\r
+                "91a71daa.ef5c2",\r
+                "b3c3b183.55c72",\r
+                "d01634bb.bb46b8",\r
+                "43cde2b5.87e1ac",\r
+                "c6fbc47.00d1938",\r
+                "98c6c3b2.42b6b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa08bbfd.f36978",\r
+        "id": "b1de8da9.db8a2",\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": 791.2501525878906,\r
-        "y": 357.66665744781494,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 778.2540588378906,\r
+        "y": 361.66665744781494,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "c93f649f.0099c8"\r
+                "d245ffbf.59c6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c93f649f.0099c8",\r
+        "id": "d245ffbf.59c6c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1006.0284957885742,\r
-        "y": 355.22224140167236,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 993.0324020385742,\r
+        "y": 359.22224140167236,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "8f744d78.f7a31",\r
-                "7468dc64.d34424"\r
+                "82c635c3.382618",\r
+                "bcda53d8.f6893"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f744d78.f7a31",\r
+        "id": "82c635c3.382618",\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": 1202.2846984863281,\r
-        "y": 332.97037982940674,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1189.2886047363281,\r
+        "y": 336.97037982940674,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7468dc64.d34424",\r
+        "id": "bcda53d8.f6893",\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": 1171.7291259765625,\r
-        "y": 369.97049617767334,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1158.7330322265625,\r
+        "y": 373.97049617767334,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "143889df.349216",\r
+        "id": "ac17a6a.af45258",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 829.2503547668457,\r
-        "y": 314.3333249092102,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 816.2542610168457,\r
+        "y": 318.3333249092102,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a8662b6.7187de",\r
+        "id": "c4e200e6.2e02b",\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": 770.186767578125,\r
-        "y": 516.1629304885864,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 757.190673828125,\r
+        "y": 520.1629304885864,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "662c5c91.bf14f4",\r
+        "id": "d704787.9944088",\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": 770.1862945556641,\r
-        "y": 462.15421867370605,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 764.1902618408203,\r
+        "y": 415.1541962623596,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64302671.d03c08",\r
+        "id": "7e93696e.840218",\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.lan-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.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": 782.3531112670898,\r
-        "y": 624.3335423469543,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 769.3570175170898,\r
+        "y": 628.3335423469543,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23949443.ee4acc",\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.lan-vf-index\"/>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 794.6866760253906,\r
-        "y": 570.0002617835999,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "305a60f0.cd87a",\r
+        "id": "676ec3b1.844d3c",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
-        "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $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": 770.500036239624,\r
-        "y": 675.8373885154724,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "17d1be09.26b4d2",\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
+        "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": 785.0000953674316,\r
-        "y": 725.837281703949,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 757.503942489624,\r
+        "y": 679.8373885154724,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ab4415a.f464b",\r
+        "id": "e3e05047.2e5b8",\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.lan-vf-index' >\n<parameter name=\"lan-port-config-id\" value=\"`$prop.vnf-index`\" />\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.site-vf-index + '/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-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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 817.5000152587891,\r
-        "y": 766.3373422622681,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 812.5039215087891,\r
+        "y": 772.3373708724976,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b65f8656.be0f98",\r
+        "id": "91a71daa.ef5c2",\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.lan-vf-index`\" />\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.lan-vf-index`\" />\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"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": 785.4999313354492,\r
-        "y": 815.3373589515686,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 772.5038375854492,\r
+        "y": 819.3373589515686,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8944476b.d5f828",\r
+        "id": "b3c3b183.55c72",\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": 736.2224769592285,\r
-        "y": 862.5112180709839,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "87f25b72.4b1968",\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": 729,\r
-        "y": 165.99999713897705,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "e80313cd.820e4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "e80313cd.820e4",\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": 981.0000915527344,\r
-        "y": 164.6666603088379,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "b80badb7.d9753"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "8bc04fc8.d6a11",\r
-        "type": "set",\r
-        "name": "set vnf-index",\r
-        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
-        "comments": "",\r
-        "x": 1352.6665802001953,\r
-        "y": 166.66666316986084,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 723.2263832092285,\r
+        "y": 866.5112180709839,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b80badb7.d9753",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1199.333408355713,\r
-        "y": 166.66664218902588,\r
-        "z": "be7b9c9c.26b5d",\r
-        "wires": [\r
-            [\r
-                "8bc04fc8.d6a11"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d0f313c6.a0ddd",\r
+        "id": "5f812e79.2be7e",\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": 743.4205932617188,\r
-        "y": 121.50386619567871,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 733.424467086792,\r
+        "y": 68.5038731098175,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "7ab34e25.1cd4e"\r
+                "ecb5481e.49db98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ab34e25.1cd4e",\r
+        "id": "ecb5481e.49db98",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 930.087272644043,\r
-        "y": 120.8371639251709,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 920.0911464691162,\r
+        "y": 67.83717083930969,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "984b3a64.7e1a38"\r
+                "5cc69be0.888194"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "984b3a64.7e1a38",\r
+        "id": "5cc69be0.888194",\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": 1111.7538986206055,\r
-        "y": 120.8371639251709,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1101.7577724456787,\r
+        "y": 67.83717083930969,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c96f1257.64bf8",\r
+        "id": "2b234f37.76666",\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": 784.6705827713013,\r
-        "y": 241.50386714935303,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 771.6744890213013,\r
+        "y": 245.50386714935303,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "ab6c63f4.e55a6",\r
-                "14b85aee.617c65"\r
+                "43b76269.61638c",\r
+                "80f9fdd1.5acfa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab6c63f4.e55a6",\r
+        "id": "43b76269.61638c",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1015.6705932617188,\r
-        "y": 217.50386428833008,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1002.6744995117188,\r
+        "y": 221.50386428833008,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "342d6918.bdf256"\r
+                "30daa7e7.f7d908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14b85aee.617c65",\r
+        "id": "80f9fdd1.5acfa",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1015.6705932617188,\r
-        "y": 257.5038642883301,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1002.6744995117188,\r
+        "y": 261.5038642883301,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "eedb45d.e2420b8"\r
+                "15ffa14c.a3471f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "342d6918.bdf256",\r
+        "id": "30daa7e7.f7d908",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1158.1705932617188,\r
-        "y": 217.50386428833008,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1145.1744995117188,\r
+        "y": 221.50386428833008,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eedb45d.e2420b8",\r
+        "id": "15ffa14c.a3471f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1160.0276374816895,\r
-        "y": 257.4403762817383,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1147.0315437316895,\r
+        "y": 261.4403762817383,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "a00dcbbe.533a58",\r
-                "7019e496.422f8c"\r
+                "81c65311.3e7fa",\r
+                "1c59d473.dd26bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7019e496.422f8c",\r
+        "id": "1c59d473.dd26bc",\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": 1312.7261123657227,\r
-        "y": 227.05947497440502,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1299.7300186157227,\r
+        "y": 231.05947497440502,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a00dcbbe.533a58",\r
+        "id": "81c65311.3e7fa",\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": 1369.1546173095703,\r
-        "y": 280.2816047668457,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1356.1585235595703,\r
+        "y": 284.2816047668457,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "19e6409a.9c554f"\r
+                "aaf0ab5e.460008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f530bc4a.54c5c",\r
+        "id": "85ce8231.1cc8f",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1592.805347442627,\r
-        "y": 238.53566217422485,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1579.809253692627,\r
+        "y": 242.53566217422485,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "19e6409a.9c554f",\r
+        "id": "aaf0ab5e.460008",\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": 1644.4403381347656,\r
-        "y": 279.8531074523926,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1631.4442443847656,\r
+        "y": 283.8531074523926,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "24af0b91.ce5344"\r
+                "1a7eae6b.66a2b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24af0b91.ce5344",\r
+        "id": "1a7eae6b.66a2b2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1545.1705360412598,\r
-        "y": 338.4245386123657,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1532.1744422912598,\r
+        "y": 342.4245386123657,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             [\r
-                "bf4e4104.4edb"\r
+                "40223de2.189ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf4e4104.4edb",\r
+        "id": "40223de2.189ee4",\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": 1692.920639038086,\r
-        "y": 338.28173068119213,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 1679.924545288086,\r
+        "y": 342.28173068119213,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ca9880e.f474f8",\r
+        "id": "7dbca450.42794c",\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": 804.0000152587891,\r
-        "y": 408.99999809265137,\r
-        "z": "be7b9c9c.26b5d",\r
+        "x": 803.0039367675781,\r
+        "y": 468.0000219345093,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d01634bb.bb46b8",\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": 774.00390625,\r
+        "y": 722.00390625,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "80c0749d.c5b758",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 101.00390625,\r
+        "y": 95.00390625,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "1e8e9be2.f38a84"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e8e9be2.f38a84",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 215.50390434265137,\r
+        "y": 202.00389766693115,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "441193b5.7a563c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "441193b5.7a563c",\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": 214.50390434265137,\r
+        "y": 302.00389766693115,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "3ecdadeb.18aa62"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "43cde2b5.87e1ac",\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": 756.0039520263672,\r
+        "y": 576.5038995742798,\r
+        "z": "dfb806d8.8899e8",\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "c6fbc47.00d1938",\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": 723.0038871765137,\r
+        "y": 123.00390815734863,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "a2640a51.5d0d78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a2640a51.5d0d78",\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": 974.0039825439453,\r
+        "y": 118.67052865028381,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "d22976f8.730608"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d22976f8.730608",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1192.3372993469238,\r
+        "y": 120.6705105304718,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "92022bc5.0cdcc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "92022bc5.0cdcc8",\r
+        "type": "set",\r
+        "name": "set vnf-index",\r
+        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
+        "comments": "",\r
+        "x": 1345.6704711914062,\r
+        "y": 120.67053151130676,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "98c6c3b2.42b6b",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 737.00390625,\r
+        "y": 184.00390625,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "681068c6.40fb78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "681068c6.40fb78",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 899.0039520263672,\r
+        "y": 183.00390529632568,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": [\r
+            [\r
+                "f9b4e412.cab938"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f9b4e412.cab938",\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": 1048.2540435791016,\r
+        "y": 180.78178310394287,\r
+        "z": "dfb806d8.8899e8",\r
+        "wires": []\r
     }\r
-]
\ No newline at end of file
+]\r
+\r
index 607a19f..d253871 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <switch test='`$vnf-index`'>\r
+                <outcome value=''>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="vnf id not found in service-data" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value=''>\r
                     <set>\r
                     </set>\r
                 </block>\r
             </for>\r
-            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>\r
             <set>\r
                 <parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
             </set>\r
+            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                <parameter name="ctx-destination" value="prop.lan-vf-index"/>\r
+                <parameter name="ctx-destination" value="prop.vf-id"/>\r
             </execute>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.lan-vf-index`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\r
                 <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.`' />\r
                 <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.`' />\r
                 <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.`' />\r
-                <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.`' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\r
+                <!--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.`' /-->\r
+                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' /-->\r
             </set>\r
             <set>\r
+                <parameter name='vf-module-id' value='`$prop.vf-id`'/>\r
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/vnfs/vnf/'\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='lan-port-config.lan-port-config-id = $prop.lan-vf-index' >\r
-                <parameter name="lan-port-config-id" value="`$prop.vnf-index`" />\r
-                <parameter name="device-id" value="`$prop.lan.deviceName`" />\r
-                <parameter name="port-switch" value="`$prop.lan.portSwitch`" />\r
-                <parameter name="port-type" value="`$prop.lan.portType`" />\r
-                <parameter name="port-number" value="`$prop.lan.portnumber`" />\r
-                <parameter name="ipv4-address" value="`$prop.lan.ipAddress`" />\r
-                <parameter name='vlan-tag' value="`$prop.lan.vlanId`" />\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
+                <parameter name="port-type" value='`$prop.lan.portType`' />\r
+                <parameter name="port-number" value='`$prop.lan.portnumber`' />\r
+                <parameter name="ipv4-address" value='`$prop.lan.ipAddress`' />\r
+                <parameter name='vlan-tag' value='`$prop.lan.vlanId`' />\r
                 <parameter name='operational-status' value='Created' />\r
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\r
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\r
                 <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\r
-                <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.site-vf-index + '/vf-module-data/'` " />\r
+                <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.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
-                <parameter name="relationship-list.relationship[0].related-to" value="sdwan-vpn" />\r
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/sdwan-vpns/sdwan-vpn/' + $prop.lan-vf-index`" />\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
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.lan-vf-index`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vf-id`" />\r
             </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
             </return>\r
         </block>\r
     </method>\r
-</service-logic>
\ No newline at end of file
+</service-logic>\r
+\r