SDWAN vpn vf-module-topology added null check

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sdwan / GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.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 de558b8..60492b5 100644 (file)
--- 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
@@ -30,6 +30,15 @@
                     </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='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\r
                 <outcome value='create'>\r
                     <block atomic="true">\r
@@ -122,14 +131,14 @@
                                                     <outcome value='true'>\r
                                                         <block atomic="true">\r
                                                             <set>\r
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />\r
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />\r
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\r
                                                             </set>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </switch>\r
                                             </for>\r
-                                            <switch test="`$tmp.nidx`">\r
+                                            <switch test="`$tmp.vidx`">\r
                                                 <outcome value=''>\r
                                                     <return status='failure'>\r
                                                         <parameter name='ack-final' value='Y'/>\r
@@ -141,7 +150,7 @@
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
-                                <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`'>\r
+                                <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`'>\r
                                     <outcome value='Created'>\r
                                         <block atomic="true"></block>\r
                                     </outcome>\r
@@ -195,14 +204,14 @@
                                                     <outcome value='true'>\r
                                                         <block atomic="true">\r
                                                             <set>\r
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />\r
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />\r
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\r
                                                             </set>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </switch>\r
                                             </for>\r
-                                            <switch test="`$tmp.nidx`">\r
+                                            <switch test="`$tmp.vidx`">\r
                                                 <outcome value=''>\r
                                                     <return status='failure'>\r
                                                         <parameter name='ack-final' value='Y'/>\r
@@ -214,7 +223,7 @@
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
-                                <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`'>\r
+                                <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`'>\r
                                     <outcome value='Active'>\r
                                         <block atomic="true"></block>\r
                                     </outcome>\r
@@ -268,14 +277,14 @@
                                                     <outcome value='true'>\r
                                                         <block atomic="true">\r
                                                             <set>\r
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />\r
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />\r
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\r
                                                             </set>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </switch>\r
                                             </for>\r
-                                            <switch test="`$tmp.nidx`">\r
+                                            <switch test="`$tmp.vidx`">\r
                                                 <outcome value=''>\r
                                                     <return status='failure'>\r
                                                         <parameter name='ack-final' value='Y'/>\r
@@ -287,7 +296,7 @@
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
-                                <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`'>\r
+                                <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`'>\r
                                     <outcome value='PendingDelete'>\r
                                         <block atomic="true"></block>\r
                                     </outcome>\r