From ec2376cfd5d3730a2efd84050c1c13d1faf8156a Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Mon, 15 Apr 2019 19:33:39 +0530
Subject: context-parameter returned to caller DG is not correct

parameter tmp.vidx is used in vpn-activate DG,
updated validate-vpn DG by returning tmp.vidx
inplace of tmp.nidx

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

Former-commit-id: 58a3b6851697cd28042583d6f60a6845694a2f74
---
 ...URCE-API_validate-sdwan-vf-vpn-input-parameters.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
index de558b80..29b26cd9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
@@ -122,14 +122,14 @@
                                                     <outcome value='true'>
                                                         <block atomic="true">
                                                             <set>
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
                                                             </set>
                                                         </block>
                                                     </outcome>
                                                 </switch>
                                             </for>
-                                            <switch test="`$tmp.nidx`">
+                                            <switch test="`$tmp.vidx`">
                                                 <outcome value=''>
                                                     <return status='failure'>
                                                         <parameter name='ack-final' value='Y'/>
@@ -141,7 +141,7 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
                                     <outcome value='Created'>
                                         <block atomic="true"></block>
                                     </outcome>
@@ -195,14 +195,14 @@
                                                     <outcome value='true'>
                                                         <block atomic="true">
                                                             <set>
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
                                                             </set>
                                                         </block>
                                                     </outcome>
                                                 </switch>
                                             </for>
-                                            <switch test="`$tmp.nidx`">
+                                            <switch test="`$tmp.vidx`">
                                                 <outcome value=''>
                                                     <return status='failure'>
                                                         <parameter name='ack-final' value='Y'/>
@@ -214,7 +214,7 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
                                     <outcome value='Active'>
                                         <block atomic="true"></block>
                                     </outcome>
@@ -268,14 +268,14 @@
                                                     <outcome value='true'>
                                                         <block atomic="true">
                                                             <set>
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
                                                             </set>
                                                         </block>
                                                     </outcome>
                                                 </switch>
                                             </for>
-                                            <switch test="`$tmp.nidx`">
+                                            <switch test="`$tmp.vidx`">
                                                 <outcome value=''>
                                                     <return status='failure'>
                                                         <parameter name='ack-final' value='Y'/>
@@ -287,7 +287,7 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
                                     <outcome value='PendingDelete'>
                                         <block atomic="true"></block>
                                     </outcome>
-- 
cgit 1.2.3-korg