X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_validate-network-input-parameters.xml;h=19e617108e9dd8924b8d08b7cd8b332c9a76cc96;hb=08f2e4b41472eacaae9c8da516bddc3aedc7344a;hp=367abdfa2dcb99f9fb9e51ed200a327294a8f6f0;hpb=3948576d2ce46e492cfead3efd0aa883c280bd30;p=sdnc%2Foam.git

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 367abdfa..19e61710 100644
--- 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,30 +11,30 @@
                     </return>
                 </outcome>
             </switch>
-            <switch test="`$service-topology-operation-input.sdnc-request-header.svc-action`">
+            <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
                 <outcome value="create">
                     <block atomic="true">
                         <switch test="`$network-topology-operation-input.request-information.request-action`">
                             <outcome value="CreateNetworkInstance">
                                 <block atomic="true">
-                                    <for index="i" start="0" end="`$network-topology-information.network-request-input.network-input-parameters.param_length`">
+                                    <for index="i" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
                                         <block>
                                             <set>
                                                 <parameter name="tmp.name" value="" />
                                                 <parameter name="tmp.value" value="" />
                                             </set>
                                             <set>
-                                                <parameter name="tmp.name" value="'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name'" />
-                                                <parameter name="tmp.value" value="'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value'" />
+                                                <parameter name="tmp.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`" />
+                                                <parameter name="tmp.value" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`" />
                                             </set>
-                                            <switch test="'$tmp.name'">
+                                            <switch test="`$tmp.name`">
                                                 <outcome value="name">
                                                     <switch test="`$tmp.value`">
                                                         <outcome value="">
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -45,7 +45,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -56,7 +56,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -67,7 +67,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -78,7 +78,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -89,7 +89,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -100,7 +100,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -111,7 +111,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -122,7 +122,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -133,7 +133,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -144,7 +144,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -155,7 +155,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -166,7 +166,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -177,7 +177,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -188,7 +188,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -199,7 +199,7 @@
                                                             <return status="failure">
                                                                 <parameter name="ack-final" value="Y" />
                                                                 <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />
                                                             </return>
                                                         </outcome>
                                                     </switch>
@@ -208,7 +208,7 @@
                                                     <return status="failure">
                                                         <parameter name="ack-final" value="Y" />
                                                         <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
+                                                        <parameter name="error-message" value="`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`" />
                                                     </return>
                                                 </outcome>
                                             </switch>
@@ -228,7 +228,7 @@
                 </outcome>
                 <outcome value="activate">
                     <switch test="`$network-topology-operation-input.request-information.request-action`">
-                        <outcome value="ActivateNetworkInstance">
+                        <outcome value="ActivateDCINetworkInstance">
                             <block atomic="true">
                                 <call module="GENERIC-RESOURCE-API" rpc="validate-overlay-network-input-parameters" mode="sync" />
                             </block>
@@ -243,26 +243,21 @@
                     </switch>
                 </outcome>
                 <outcome value="deactivate">
-                    <block atomic="true">
-                        <outcome value="DeactivateNetworkInstance">
+                    <switch test="`$network-topology-operation-input.request-information.request-action`">
+                        <outcome value="DeActivateDCINetworkInstance">
                             <block atomic="true">
-                                <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
-                                    <block>
-                                        <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].id == 'id'`">
-                                            <outcome value="true">
-                                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">
-                                                    <outcome value="">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
-                                                        </return>
-                                                    </outcome>
-                                                </switch>
-                                            </outcome>
-                                        </switch>
-                                    </block>
-                                </for>
+                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
+                                    <parameter name="$network-topology-operation-input.network-information.network-id" value="" />
+                                </execute>
+                                <switch test="`$network-topology-operation-input.network-information.network-id`">
+                                    <outcome value="">
+                                        <return status="failure">
+                                            <parameter name="ack-final" value="Y" />
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+                                        </return>
+                                    </outcome>
+                                </switch>
                             </block>
                         </outcome>
                         <outcome value="Other">
@@ -272,6 +267,35 @@
                                 <parameter name="error-message" value="request-information.request-action is required to be DeactivateNetworkInstance for svc-action=deactivate" />
                             </return>
                         </outcome>
+                    </switch>
+                </outcome>
+                <outcome value="delete">
+                    <block atomic="true">
+                        <switch test="`$network-topology-operation-input.request-information.request-action`">
+                            <outcome value="DeleteNetworkInstance">
+                                <block atomic="true">
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
+                                        <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id" />
+                                    </execute>
+                                    <switch test="`$network-topology-operation-input.network-information.network-id`">
+                                        <outcome value="">
+                                            <return status="failure">
+                                                <parameter name="ack-final" value="Y" />
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                            <outcome value="Other">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete" />
+                                </return>
+                            </outcome>
+                        </switch>
                     </block>
                 </outcome>
                 <outcome value="Other">
@@ -281,38 +305,6 @@
                         <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
                     </return>
                 </outcome>
-                <outcome value="delete">
-                    <block atomic="true">
-                        <outcome value="DeleteNetworkInstance">
-                            <block atomic="true">
-                                <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
-                                    <block>
-                                        <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-                                            <outcome value="true">
-                                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">
-                                                    <outcome value="">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
-                                                        </return>
-                                                    </outcome>
-                                                </switch>
-                                            </outcome>
-                                        </switch>
-                                    </block>
-                                </for>
-                            </block>
-                        </outcome>
-                        <outcome value="Other">
-                            <return status="failure">
-                                <parameter name="ack-final" value="Y" />
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete" />
-                            </return>
-                        </outcome>
-                    </block>
-                </outcome>
             </switch>
         </block>
     </method>