From eae37304af2e7bccec4f3361be585cd2229fe651 Mon Sep 17 00:00:00 2001
From: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Date: Thu, 28 Sep 2017 23:53:16 +0530
Subject: Added DG for overlay input validation

Following changes are included:
1) Validated presence of mandatory input parameters
2) Validation of values for both sites.
3) Handling of l2 and l3.

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

Former-commit-id: 39f275c0e95a08a41e9c84c8662288b5af1f36ec
---
 ...OURCE-API_validate-network-input-parameters.xml | 321 ++++++++-------------
 ...I_validate-overlay-network-input-parameters.xml | 249 ++++++++++++++++
 2 files changed, 364 insertions(+), 206 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml

(limited to 'platform-logic/generic-resource-api/src/main/xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index 620fe9ca..56325af1 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
@@ -1,213 +1,212 @@
-<service-logic
-		xmlns='http://www.openecomp.org/sdnc/svclogic'
-		xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-	<method rpc='validate-network-input-parameters' mode='sync'>
+<?xml version="1.0" encoding="UTF-8"?>
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
+	<method rpc="validate-network-input-parameters" mode="sync">
 		<block atomic="true">
-			<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
-				<outcome value=''>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
+			<switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
+				<outcome value="">
+					<return status="failure">
+						<parameter name="ack-final" value="Y" />
 						<parameter name="error-code" value="500" />
 						<parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />
 					</return>
 				</outcome>
 			</switch>
-			<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>
-				<outcome value='assign'>
+			<switch test="`$service-topology-operation-input.sdnc-request-header.svc-action`">
+				<outcome value="assign">
 					<block atomic="true">
-						<switch test='`$network-topology-operation-input.request-information.request-action`'>
-							<outcome value='CreateNetworkInstance'>
+						<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`">
 										<block>
 											<set>
-												<parameter name='tmp.name' value='' />
-												<parameter name='tmp.value' value='' />
+												<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'">
-												<outcome value='name'>
+												<outcome value="name">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='service-type'>
+												<outcome value="service-type">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='site1-name'>
+												<outcome value="site1-name">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='site2-name'>
+												<outcome value="site2-name">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='sna1_name'>
+												<outcome value="sna1_name">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='sna2_name'>
+												<outcome value="sna2_name">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='pe1_id'>
+												<outcome value="pe1_id">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='pe2_id'>
+												<outcome value="pe2_id">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='ac1-id'>
+												<outcome value="ac1-id">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='ac2-id'>
+												<outcome value="ac2-id">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='ac1-ip'>
+												<outcome value="ac1-ip">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='ac2-ip'>
+												<outcome value="ac2-ip">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='ac1_peer_ip'>
+												<outcome value="ac1_peer_ip">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='ac2_peer_ip'>
+												<outcome value="ac2_peer_ip">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='ac1_svlan'>
+												<outcome value="ac1_svlan">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value='ac2_svlan'>
+												<outcome value="ac2_svlan">
 													<switch test="`$tmp.value`">
-														<outcome value=''>
-															<return status='failure'>
-																<parameter name='ack-final' value='Y'/>
+														<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>
-												<outcome value=''>
-													<return status='failure'>
-														<parameter name='ack-final' value='Y'/>
+												<outcome value="">
+													<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'`" />
 													</return>
@@ -217,9 +216,9 @@
 									</for>
 								</block>
 							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
+							<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 CreateNetworkInstance for svc-action=assign" />
 								</return>
@@ -227,124 +226,34 @@
 						</switch>
 					</block>
 				</outcome>
-				<outcome value='activate'>
-					<switch test='`$network-topology-operation-input.request-information.request-action`'>
-						<outcome value='ActivateNetworkInstance'>
+				<outcome value="activate">
+					<switch test="`$network-topology-operation-input.request-information.request-action`">
+						<outcome value="ActivateNetworkInstance">
 							<block atomic="true">
-								<for index="i" start="0" end="`$network-topology-information.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'"/>
-										</set>
-										<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.name is a required input" />
-														</return>
-													</outcome>
-												</switch>
-											</outcome>
-											<outcome value='description'>
-												<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.name is a required input" />
-														</return>
-													</outcome>
-												</switch>
-											</outcome>
-											<outcome value='router_id'>
-												<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.name is a required input" />
-														</return>
-													</outcome>
-												</switch>
-											</outcome>
-											<outcome value='local_networks'>
-												<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.name is a required input" />
-														</return>
-													</outcome>
-												</switch>
-											</outcome>
-											<outcome value='evpn_irts'>
-												<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.name is a required input" />
-														</return>
-													</outcome>
-												</switch>
-											</outcome>
-											<outcome value='evpn_erts'>
-												<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.name is a required input" />
-														</return>
-													</outcome>
-												</switch>
-											</outcome>
-											<outcome value='l3_vni'>
-												<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.name is a required input" />
-														</return>
-													</outcome>
-												</switch>
-											</outcome>
-										</switch>
-									</block>
-								</for>
+								<call module="GENERIC-RESOURCE-API" rpc="validate-overlay-network-input-parameters" mode="sync" />
 							</block>
 						</outcome>
-						<outcome value='Other'>
-							<return status='failure'>
-								<parameter name='ack-final' value='Y'/>
+						<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 ActivateNetworkInstance for svc-action=activate" />
 							</return>
 						</outcome>
 					</switch>
 				</outcome>
-				<outcome value='deactivate'>
+				<outcome value="deactivate">
 					<block atomic="true">
-						<outcome value='DeactivateNetworkInstance'>
+						<outcome value="DeactivateNetworkInstance">
 							<block atomic="true">
-								<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
+								<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'>
+											<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'/>
+													<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>
@@ -356,34 +265,34 @@
 								</for>
 							</block>
 						</outcome>
-						<outcome value='Other'>
-							<return status='failure'>
-								<parameter name='ack-final' value='Y'/>
+						<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 CreateNetworkInstance for svc-action=assign" />
 							</return>
 						</outcome>
 					</block>
 				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
+				<outcome value="Other">
+					<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'`" />
 					</return>
 				</outcome>
-				<outcome value='delete'>
+				<outcome value="delete">
 					<block atomic="true">
-						<outcome value='DeleteNetworkInstance'>
+						<outcome value="DeleteNetworkInstance">
 							<block atomic="true">
-								<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
+								<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'>
+											<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'/>
+													<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>
@@ -395,9 +304,9 @@
 								</for>
 							</block>
 						</outcome>
-						<outcome value='Other'>
-							<return status='failure'>
-								<parameter name='ack-final' value='Y'/>
+						<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 CreateNetworkInstance for svc-action=assign" />
 							</return>
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
new file mode 100644
index 00000000..38671516
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
+	<method rpc="validate-overlay-network-input-parameters" mode="sync">
+		<for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+			<block atomic="true">
+				<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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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>
+						</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="" />
+				</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="" />
+						</execute>
+					</outcome>
+					<outcome value="L2-DCI" />
+					<outcome value="other">
+						<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>
+		</for>
+	</method>
+</service-logic>
\ No newline at end of file
-- 
cgit 1.2.3-korg