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

1 files changed, 8 insertions, 8 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
index 52dbdc33..74cc16b0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
@@ -2,7 +2,7 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

+<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

 

 

 </set><set>

@@ -14,7 +14,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

@@ -29,21 +29,21 @@
 <outcome value='success'>

 <block atomic="true">

 <set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

+<parameter name='bk-brg-ar' value='$mdsal-ar.' />

 </set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>

 <outcome value='1'>

 <block atomic='true'>

 <set>

-<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

+<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

+</set><switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

 <outcome value='Created'>

 <block>

 </block></outcome><outcome value='Other'>

 <block>

 </block></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

 

 </set></block></outcome></switch></block></outcome><outcome value='Other'>

 <block atomic="true">