diff options
author | 2017-10-20 14:37:33 -0400 | |
---|---|---|
committer | 2017-10-20 14:37:33 -0400 | |
commit | 067ac3647384f53d9bdad34f4e0267859ccd75f0 (patch) | |
tree | 8d8758693de566d7f18d94f252cb63b6e3e8520a /platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml | |
parent | 93bb9d70960c1eba2659e05f323531a1859a6c15 (diff) |
Fix BRG DGs
Fix cut/paste errors in BRG allotted resource directed
graphs and add missing restapi template.
Change-Id: Ie5dcea412b79f10e5c3651a0f2177120210cc136
Issue-ID: SDNC-140
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: e8cf6822f4c60748e6cebe548d1c2ecae973e515
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml')
-rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml | 63 |
1 files changed, 11 insertions, 52 deletions
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 131405ed..3486129d 100644 --- 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'/>
<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='`$brg-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='`$brg-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='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>
-<outcome value='assign'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>
-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+<outcome value='assign'><block atomic="true"><switch test='`$brg-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" />
@@ -47,21 +35,21 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="brg-information.onap-model-information.model-customization-uuid is a required input" />
-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vlan-tag`'>
+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vgmux-bearer-ip`'>
<outcome value=''><return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />
-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.trusted-network-role`'>
+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vni`'>
<outcome value=''><return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.trusted-network-role is a required input" />
-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.untrusted-network-role`'>
+ <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />
+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address `'>
<outcome value=''><return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="brg-operation-input.brg-request-input.untrusted-network-role is a required input" />
+ <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />
</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'
pfx='ar-model'>
@@ -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 ' + $brg-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='`$brg-topology-operation-input.request-information.request-action`'>
-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+</return></outcome></get-resource></block></outcome><outcome value='create'><block atomic="true"><switch test='`$brg-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='`$brg-topology-operation-input.request-information.request-action`'>
-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+</return></outcome></switch></block></outcome><outcome value='activate'><block atomic="true"><switch test='`$brg-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='`$brg-topology-operation-input.request-information.request-action`'>
-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+</return></outcome></switch></block></outcome><outcome value='deactivate'><block atomic="true"><switch test='`$brg-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='`$brg-topology-operation-input.request-information.request-action`'>
-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+</return></outcome></switch></block></outcome><outcome value='delete'><block atomic="true"><switch test='`$brg-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='`$brg-topology-operation-input.request-information.request-action`'>
-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+</return></outcome></switch></block></outcome><outcome value='unassign'><block atomic="true"><switch test='`$brg-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" />
|