3 files changed, 244 insertions, 200 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index d0a402c7..59ffb6f6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -137,7 +137,7 @@
                             <parameter name="field1" value="__TIMESTAMP__" />
                             <parameter name="field2" value="dci-network-topology-operation-activate" />
                             <parameter name="field3" value="dci-connects.name" />
-                            <parameter name="field4" value="$prop.dci-connects.name" />
+                            <parameter name="field4" value="`$prop.dci-connects.name`" />
                             <parameter name="field5" value="dci-connects.id" />
                             <parameter name="field6" value="`$prop.dci-connects.id`" />
                             <parameter name="field7" value="dci-connects.tunnelType" />
@@ -148,10 +148,10 @@
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -159,10 +159,10 @@
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -295,7 +295,7 @@
                             <parameter name="field1" value="__TIMESTAMP__" />
                             <parameter name="field2" value="dci-network-topology-operation-activate" />
                             <parameter name="field3" value="dci-connects.name" />
-                            <parameter name="field4" value="$prop.dci-connects.name" />
+                            <parameter name="field4" value="`$prop.dci-connects.name`" />
                             <parameter name="field5" value="dci-connects.id" />
                             <parameter name="field6" value="`$prop.dci-connects.id`" />
                             <parameter name="field7" value="dci-connects.tunnelType" />
@@ -306,10 +306,10 @@
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -317,10 +317,10 @@
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
index 3de08ffe..23f67272 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
@@ -62,9 +62,9 @@
                <switch test="`$prop.dci-connects.tunnelType`">
                   <outcome value="L3-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" />
-                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
@@ -72,9 +72,9 @@
                   </outcome>
                   <outcome value="L2-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" />
-                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
@@ -135,9 +135,9 @@
                <switch test="`$prop.dci-connects.tunnelType`">
                   <outcome value="L3-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" />
-                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
@@ -145,9 +145,9 @@
                   </outcome>
                   <outcome value="L2-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" />
-                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
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" />