From 0d8775f5778d7e19d167cd2b67ddf670c1e2c754 Mon Sep 17 00:00:00 2001
From: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Date: Wed, 11 Oct 2017 18:13:03 +0530
Subject: Fix for overlay DGs.

Changes includes:
1) use `` for expressions.
2) fix loading issue.

Change-Id: Iff71b5be7e606b3bc343cf9d5f9e81eba0e51e06
Issue-Id: SDNC-113
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: 0f1278b2a69a5c0ab0acd2693111d56577ed0d90
---
 ...I_validate-overlay-network-input-parameters.xml | 384 ++++++++++++---------
 1 file changed, 214 insertions(+), 170 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
index 11461f37..4a22bd06 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
@@ -6,232 +6,276 @@
                 <block>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.name`">
-                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                                <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>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site1_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site1_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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site1_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                                <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>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site2_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site2_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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site2_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                                <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>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site1_networkName" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site1_networkName`">
-                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site1_networkName" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                                <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>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site2_networkName" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site2_networkName`">
-                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site2_networkName" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                                <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>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site1_routerId" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site1_routerId`">
-                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site1_routerId" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                                <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>
+                            </block>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`">
+                        <outcome value="true">
+                            <block>
+                                <set>
+                                    <parameter name="validate.dci-connects.site2_routerId" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                                <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>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site1_importRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site1_importRT1`">
-                                <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>
+                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site1_importRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site2_importRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site2_importRT1`">
-                                <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>
+                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site2_importRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site1_exportRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site1_exportRT1`">
-                                <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>
+                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site1_exportRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT2'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site1_exportRT2" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site1_exportRT2`">
-                                <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>
+                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site1_exportRT2" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site1_vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site1_vni`">
-                                <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>
+                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site1_vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="validate.dci-connects.site2_vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.site2_vni`">
-                                <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>
+                                <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>
+                                <set>
+                                    <parameter name="validate.dci-connects.site2_vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                            </block>
                         </outcome>
                     </switch>
                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`">
                         <outcome value="true">
-                            <set>
-                                <parameter name="prop.dci-connects.tunnelType" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                            </set>
-                            <switch test="`$validate.dci-connects.tunnelType`">
-                                <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>
+                                <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>
+                                <set>
+                                    <parameter name="prop.dci-connects.tunnelType" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                </set>
+                            </block>
                         </outcome>
                     </switch>
                 </block>
                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
-                    <parameter name="$validate.dci-connects.name" value="" />
-                    <parameter name="$validate.dci-connects.site1_id" value="" />
-                    <parameter name="$validate.dci-connects.site2_id" value="" />
-                    <parameter name="$validate.dci-connects.site1_networkName" value="" />
-                    <parameter name="$validate.dci-connects.site2_networkName" value="" />
-                    <parameter name="$validate.dci-connects.site1_importRT1" value="" />
-                    <parameter name="$validate.dci-connects.site2_importRT1" value="" />
-                    <parameter name="$validate.dci-connects.site1_exportRT1" value="" />
-                    <parameter name="$validate.dci-connects.site2_exportRT1" value="" />
-                    <parameter name="$validate.dci-connects.site1_vni" value="" />
-                    <parameter name="$validate.dci-connects.site2_vni" value="" />
-                    <parameter name="$validate.dci-connects.tunnelType" value="" />
+                    <parameter name="`$validate.dci-connects.name`" value="" />
+                    <parameter name="`$validate.dci-connects.site1_id`" value="" />
+                    <parameter name="`$validate.dci-connects.site2_id`" value="" />
+                    <parameter name="`$validate.dci-connects.site1_networkName`" value="" />
+                    <parameter name="`$validate.dci-connects.site2_networkName`" value="" />
+                    <parameter name="`$validate.dci-connects.site1_importRT1`" value="" />
+                    <parameter name="`$validate.dci-connects.site2_importRT1`" value="" />
+                    <parameter name="`$validate.dci-connects.site1_exportRT1`" value="" />
+                    <parameter name="`$validate.dci-connects.site2_exportRT1`" value="" />
+                    <parameter name="`$validate.dci-connects.site1_vni`" value="" />
+                    <parameter name="`$validate.dci-connects.site2_vni`" value="" />
+                    <parameter name="`$validate.dci-connects.tunnelType`" value="" />
                 </execute>
                 <switch test="`$validate.dci-connects.tunnelType`">
                     <outcome value="L3-DCI">
                         <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
-                            <parameter name="$network-topology-operation-input.network-request-input.network-input-parameters.site1_routerId" value="" />
-                            <parameter name="$network-topology-operation-input.network-request-input.network-input-parameters.site2_routerId" value="" />
+                            <parameter name="`$network-topology-operation-input.network-request-input.network-input-parameters.site1_routerId`" value="" />
+                            <parameter name="`$network-topology-operation-input.network-request-input.network-input-parameters.site2_routerId`" value="" />
                         </execute>
                     </outcome>
                     <outcome value="L2-DCI" />
-- 
cgit 1.2.3-korg