Fix tunnelxconn DGs

Tunnelxconn DGs had cut/paste errors (referred to security-zone
incorrectly).  Also, restapi templates were missing.

Change-Id: Ib7aad71796301632e9269aa9e3e5e5fd266d7a94
Issue-ID: SDNC-139
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: 76c06d99c067aa7be038e496753caee30ee01d0b

1 files changed, 6 insertions, 47 deletions

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 d03d75df..f020d51d 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
@@ -9,25 +9,13 @@
 	<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='`$tunnelxconn-topology-operation-input.request-information.request-action`'>

-<outcome value='CreateSecurityZoneInstance'><block>

-</block></outcome><outcome value='DeleteSecurityZoneInstance'><block>

-</block></outcome><outcome value=''><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 a required input" />

-</return></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="Invalid request-information.request-action " />

 </return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.service-information.service-instance-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="service-information.service-instance-id is a required input" />

 </return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`'>

-<outcome value='assign'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.request-information.request-action`'>

-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+<outcome value='assign'><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'/>

 	<parameter name="error-code" value="500" />

@@ -76,12 +64,7 @@
 	<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`" />

-</return></outcome></get-resource></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=assign" />

-</return></outcome></switch></block></outcome><outcome value='create'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.request-information.request-action`'>

-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</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'/>

 	<parameter name="error-code" value="500" />

@@ -91,12 +74,7 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=create" />

-</return></outcome></switch></block></outcome><outcome value='activate'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.request-information.request-action`'>

-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></switch></block></outcome><outcome value='activate'><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'/>

 	<parameter name="error-code" value="500" />

@@ -106,12 +84,7 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=activate" />

-</return></outcome></switch></block></outcome><outcome value='deactivate'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.request-information.request-action`'>

-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></switch></block></outcome><outcome value='deactivate'><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'/>

 	<parameter name="error-code" value="500" />

@@ -121,12 +94,7 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=deactivate" />

-</return></outcome></switch></block></outcome><outcome value='delete'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.request-information.request-action`'>

-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></switch></block></outcome><outcome value='delete'><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'/>

 	<parameter name="error-code" value="500" />

@@ -136,20 +104,11 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=delete" />

-</return></outcome></switch></block></outcome><outcome value='unassign'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.request-information.request-action`'>

-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></switch></block></outcome><outcome value='unassign'><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'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.allotted-resource-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=unassign" />

 </return></outcome></switch></block></outcome></switch><return status='success'>

 <parameter name="ack-final-indicator" value="Y" />

 <parameter name="error-code" value="200" />