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=e54026dcfd0b2403ada96324be43a851eedade34;hb=a8e7d59abcc55950e76f36cf4c2d280f55a38381;hp=6ba9d2304cbec988f09212de8a973d735cb05d5d;hpb=4d38cecf0f03e1244ca0c605c5802632b36f3b82;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 6ba9d230..e54026dc 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
@@ -263,37 +263,34 @@
                 </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>
+                        <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="" />
+                                    </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>
             </switch>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>