Fix BRG DGs

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_validate-brg-input.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml
index 131405e..3486129 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml
@@ -9,25 +9,13 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />\r
-</return></outcome></switch><switch test='`$brg-topology-operation-input.request-information.request-action`'>\r
-<outcome value='CreateSecurityZoneInstance'><block>\r
-</block></outcome><outcome value='DeleteSecurityZoneInstance'><block>\r
-</block></outcome><outcome value=''><return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="request-information.request-action is a required input" />\r
-</return></outcome><outcome value='Other'><return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="Invalid request-information.request-action " />\r
 </return></outcome></switch><switch test='`$brg-topology-operation-input.service-information.service-instance-id`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="service-information.service-instance-id is a required input" />\r
 </return></outcome></switch><switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\r
-<outcome value='assign'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>\r
-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
+<outcome value='assign'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
@@ -47,21 +35,21 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="brg-information.onap-model-information.model-customization-uuid is a required input" />\r
-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vlan-tag`'>\r
+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vgmux-bearer-ip`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />\r
-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.trusted-network-role`'>\r
+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vni`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.trusted-network-role is a required input" />\r
-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.untrusted-network-role`'>\r
+    <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />\r
+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address `'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="brg-operation-input.brg-request-input.untrusted-network-role is a required input" />\r
+    <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />\r
 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\r
   key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'\r
   pfx='ar-model'>\r
@@ -76,12 +64,7 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />\r
-</return></outcome></get-resource></block></outcome><outcome value='Other'><return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=assign" />\r
-</return></outcome></switch></block></outcome><outcome value='create'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>\r
-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
+</return></outcome></get-resource></block></outcome><outcome value='create'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
@@ -91,12 +74,7 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />\r
-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=create" />\r
-</return></outcome></switch></block></outcome><outcome value='activate'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>\r
-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
+</return></outcome></switch></block></outcome><outcome value='activate'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
@@ -106,12 +84,7 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />\r
-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=activate" />\r
-</return></outcome></switch></block></outcome><outcome value='deactivate'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>\r
-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
+</return></outcome></switch></block></outcome><outcome value='deactivate'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
@@ -121,12 +94,7 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />\r
-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=deactivate" />\r
-</return></outcome></switch></block></outcome><outcome value='delete'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>\r
-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
+</return></outcome></switch></block></outcome><outcome value='delete'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
@@ -136,20 +104,11 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />\r
-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=delete" />\r
-</return></outcome></switch></block></outcome><outcome value='unassign'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>\r
-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
+</return></outcome></switch></block></outcome><outcome value='unassign'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="allotted-resource-information.allotted-resource-id is a required input" />\r
-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=unassign" />\r
 </return></outcome></switch></block></outcome></switch><return status='success'>\r
 <parameter name="ack-final-indicator" value="Y" />\r
 <parameter name="error-code" value="200" />\r