diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-11-03 18:09:16 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-11-03 18:09:16 -0400 |
| commit | e9c89799f4c5eaf5eddea7591aefbd5ec666d8da (patch) | |
| tree | ff360bc954f41cfeb6f28d76c81f8b6b14e98c8c /platform-logic/generic-resource-api/src/main/xml | |
| parent | 015799def0f582771db21095a51201a84a66dd53 (diff) | |
Fix DG to match yang changes
Fix GENERIC-RESOURCE-API BRG and tunnelxconn DGs to expect
input containers
Change-Id: I8487a63c1b4db1afdd601cec74d0fc4f58bec2ea
Issue-ID: SDNC-166
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 89f844835b3867fa5291b468ff2d5c8739cbf45e
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
3 files changed, 7 insertions, 6 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml index 191556db..442e66be 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml @@ -124,7 +124,7 @@ value="`$brg-ar-identifiers.`" /> </set><set>
-<parameter name='brg-ar-assignments.vbrg-wan-ip' value='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address`'/>
+<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>
</set><set>
<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.'
value="`$brg-ar-assignments.`" />
@@ -145,7 +145,8 @@ value="`$brg-ar-assignments.`" /> <block atomic="true"><set>
<parameter name='tmp.cidx' value='`$cidx`' />
<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />
-<parameter name='tmp.found-cidx' value='true' /></set><break/></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
+<parameter name='tmp.found-cidx' value='true' /></set><break/>
+</break></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
<outcome value='false'>
<block atomic="true"><set>
<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
@@ -233,4 +234,4 @@ value="`$brg-ar-assignments.`" /> <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></outcome></get-resource></block></method></service-logic> +</return></block></outcome></get-resource></block></method></service-logic>
\ No newline at end of file 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 a695f198..c63efde9 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 @@ -45,7 +45,7 @@ <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.brg-wan-ip-address `'>
+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.brg-wan-mac-address `'>
<outcome value=''><return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
@@ -113,4 +113,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic> +</return></block></method></service-logic>
\ No newline at end of file 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 907f7342..3cf8e6ed 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,7 +35,7 @@ <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.brg-wan-mac-address`'>
+</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" />
|