Chore: Add gerrit maven verify GHA workflow

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_validate-network-input-parameters.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index 9c13bbf..0987a77 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
@@ -11,23 +11,23 @@
                     </return>\r
                 </outcome>\r
             </switch>\r
-            <switch test="`$service-topology-operation-input.sdnc-request-header.svc-action`">\r
+            <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">\r
                 <outcome value="create">\r
                     <block atomic="true">\r
                         <switch test="`$network-topology-operation-input.request-information.request-action`">\r
                             <outcome value="CreateNetworkInstance">\r
                                 <block atomic="true">\r
-                                    <for index="i" start="0" end="`$network-topology-information.network-request-input.network-input-parameters.param_length`">\r
+                                    <for index="i" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">\r
                                         <block>\r
                                             <set>\r
                                                 <parameter name="tmp.name" value="" />\r
                                                 <parameter name="tmp.value" value="" />\r
                                             </set>\r
                                             <set>\r
-                                                <parameter name="tmp.name" value="'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name'" />\r
-                                                <parameter name="tmp.value" value="'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value'" />\r
+                                                <parameter name="tmp.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`" />\r
+                                                <parameter name="tmp.value" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`" />\r
                                             </set>\r
-                                            <switch test="'$tmp.name'">\r
+                                            <switch test="`$tmp.name`">\r
                                                 <outcome value="name">\r
                                                     <switch test="`$tmp.value`">\r
                                                         <outcome value="">\r
@@ -208,7 +208,7 @@
                                                     <return status="failure">\r
                                                         <parameter name="ack-final" value="Y" />\r
                                                         <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />\r
+                                                        <parameter name="error-message" value="`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`" />\r
                                                     </return>\r
                                                 </outcome>\r
                                             </switch>\r
@@ -247,7 +247,7 @@
                         <outcome value="DeActivateDCINetworkInstance">\r
                             <block atomic="true">\r
                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">\r
-                                    <parameter name="$network-topology-operation-input.network-information.network-id" value="" />\r
+                                    <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id" />\r
                                 </execute>\r
                                 <switch test="`$network-topology-operation-input.network-information.network-id`">\r
                                     <outcome value="">\r
@@ -269,20 +269,13 @@
                         </outcome>\r
                     </switch>\r
                 </outcome>\r
-                <outcome value="Other">\r
-                    <return status="failure">\r
-                        <parameter name="ack-final" value="Y" />\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />\r
-                    </return>\r
-                </outcome>\r
                 <outcome value="delete">\r
                     <block atomic="true">\r
                         <switch test="`$network-topology-operation-input.request-information.request-action`">\r
                             <outcome value="DeleteNetworkInstance">\r
                                 <block atomic="true">\r
                                     <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">\r
-                                        <parameter name="$network-topology-operation-input.network-information.network-id" value="" />\r
+                                        <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id" />\r
                                     </execute>\r
                                     <switch test="`$network-topology-operation-input.network-information.network-id`">\r
                                         <outcome value="">\r
@@ -305,6 +298,13 @@
                         </switch>\r
                     </block>\r
                 </outcome>\r
+                <outcome value="Other">\r
+                    <return status="failure">\r
+                        <parameter name="ack-final" value="Y" />\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />\r
+                    </return>\r
+                </outcome>\r
             </switch>\r
         </block>\r
     </method>\r