Fix SDWAN lan-port-delete DG by passing valid index

SDWAN lan-port-config-delete DG, vf-module-id is passed
with correct vnf-index.

Change-Id: I23e4cb60fcf8c6db5c383fbaf63ddc9123f3210a
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: c4a473250721d08c9eef5170800efa2932bee15c

1 files changed, 9 insertions, 9 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml
index 30df6e08..7a7dba27 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml
@@ -1,6 +1,6 @@
 <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}'>

+        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}'>

     <method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>

         <block atomic="true">

             <switch test='`$service-data.vnfs.vnf_length`'>

@@ -61,7 +61,7 @@
                                         <set>

                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />

                                         </set>

-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' ></call>

+                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>

                                     </block>

                                 </outcome>

                             </switch>

@@ -99,8 +99,8 @@
                         <outcome value='false'>

                             <block atomic="true">

                                 <set>

-                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />

-                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-id`' />

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.`' />

                                 </set>

                                 <set>

                                     <parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />

@@ -125,18 +125,18 @@
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id

  + '/vf-module-data/vf-module-topology/'`"/>

                 <parameter name='vnf-object-path'

- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

+                           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/vnf-topology/'`"/>

                 <parameter name='service-object-path'

- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

+                           value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

  + $vf-module-topology-operation-input.service-information.service-instance-id

  + '/service-data/service-topology/'`"/>

             </set>

-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config' 

-        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>

+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config'

+                    key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>

             <return status='success'>

                 <parameter name="ack-final-indicator" value="Y" />

                 <parameter name="error-code" value="200" />