Dev Tested with SO

Worked through changes to pass VNF-API preload
back to SO using VGW2BRG-macaddress as the vnf-name

Issue-ID: SDNC-176
Change-Id: Icfceaf6acf0e256a4471e73146fe84774d427d7c
Signed-off-by: Brian Freeman <bf1936@att.com>

Former-commit-id: 6a02f96408ec1322549dca9c96629c883e2b1e19

1 files changed, 7 insertions, 6 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
index 2855d9eb..f561acb9 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
@@ -36,7 +36,7 @@
 <block>

 <set>

 <parameter name='vnf-index' value='`$idx`' />

-</set><break/></block></outcome></switch></for></outcome></switch><switch test='`$vnf-index`'>

+</set><break></break></block></outcome></switch></for></outcome></switch><switch test='`$vnf-index`'>

 <outcome value='-1'>

 <return status='failure'>

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

@@ -103,7 +103,7 @@
 </execute><set>

 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli'

    value='`$aai-uid-split[$aai-uid-split_length - 1]`' />

-</set><break/></block></outcome></switch></for><switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli`'>

+</set><break></break></block></outcome></switch></for><switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli`'>

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

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

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

@@ -231,7 +231,7 @@
 <block>

 <set>

 <parameter name='network-index' value='`$idx`' />

-</set><break/></block></outcome></switch></for><switch test='`$network-index`'>

+</set><break></break></block></outcome></switch></for><switch test='`$network-index`'>

 <outcome value='-1'>

 <return status='failure'>

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

@@ -542,7 +542,7 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
 <parameter name="field3" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`"/>

 <parameter name="field4" value="Failed to insert VIPR_CONFIGURATION record"/>

 </record></outcome></save></block></for></for><set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.' value='tmp.vf-module-topology.' />

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.' value='$tmp.vf-module-topology.' />

 </set><set>

 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'

    value='$vf-module-topology-operation-input.sdnc-request-header.' />

@@ -557,7 +557,8 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.'

    value='$vf-module-topology-operation-input.vf-module-request-input.' />

 

-</set><set>

+</set><call module='GENERIC-RESOURCE-API' rpc='gw-vfmodule-update' mode='sync' >

+</call><set>

 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'

   value='PendingCreate' />

 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'

@@ -570,4 +571,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
 <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>