X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_validate-tunnelxconn-input.xml;h=58b7467fdd7a3824a4d0e51e31e41057f069331f;hb=6b8eabe5941f4e2433d50c8dd7e4056766daae5e;hp=f020d51dd7acb7e85dd86c8c736a37e78054e134;hpb=76c06d99c067aa7be038e496753caee30ee01d0b;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
index f020d51d..58b7467f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
@@ -35,22 +35,12 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="tunnelxconn-information.onap-model-information.model-customization-uuid is a required input" />
-</return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag`'>
+</return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.brg-wan-mac-address`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag is a required input" />
-</return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`'>
-<outcome value=''><return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role is a required input" />
-</return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`'>
-<outcome value=''><return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="tunnelxconn-operation-input.tunnelxconn-request-input.untrusted-network-role is a required input" />
-</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+    <parameter name="error-message" value="tunnelxconn-topology-operation-input.brg-wan-mac-address is a required input" />
+</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'
   pfx='ar-model'>
 
@@ -58,12 +48,12 @@
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />
+    <parameter name="error-message" value="`'No allotted resource model found for model customization UUID ' + $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />
+    <parameter name="error-message" value="`'No allotted resource model found for model customization UUID ' + $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />
 </return></outcome></get-resource></block></outcome><outcome value='create'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>