Dev Tested with SO

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml

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 2855d9e..f561acb 100755 (executable)
--- 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>\r
 <set>\r
 <parameter name='vnf-index' value='`$idx`' />\r
-</set><break/></block></outcome></switch></for></outcome></switch><switch test='`$vnf-index`'>\r
+</set><break></break></block></outcome></switch></for></outcome></switch><switch test='`$vnf-index`'>\r
 <outcome value='-1'>\r
 <return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
@@ -103,7 +103,7 @@
 </execute><set>\r
 <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'\r
    value='`$aai-uid-split[$aai-uid-split_length - 1]`' />\r
-</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`'>\r
+</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`'>\r
 <outcome value=''><return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
@@ -231,7 +231,7 @@
 <block>\r
 <set>\r
 <parameter name='network-index' value='`$idx`' />\r
-</set><break/></block></outcome></switch></for><switch test='`$network-index`'>\r
+</set><break></break></block></outcome></switch></for><switch test='`$network-index`'>\r
 <outcome value='-1'>\r
 <return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
@@ -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`"/>\r
 <parameter name="field4" value="Failed to insert VIPR_CONFIGURATION record"/>\r
 </record></outcome></save></block></for></for><set>\r
-<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.' />\r
+<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.' />\r
 </set><set>\r
 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'\r
    value='$vf-module-topology-operation-input.sdnc-request-header.' />\r
@@ -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.'\r
    value='$vf-module-topology-operation-input.vf-module-request-input.' />\r
 \r
-</set><set>\r
+</set><call module='GENERIC-RESOURCE-API' rpc='gw-vfmodule-update' mode='sync' >\r
+</call><set>\r
 <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'\r
   value='PendingCreate' />\r
 <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'\r
@@ -570,4 +571,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
 <parameter name="ack-final-indicator" value="Y" />\r
 <parameter name="error-code" value="200" />\r
 <parameter name="error-message" value="`$error-message`" />\r
-</return></block></method></service-logic>
+</return></block></method></service-logic>\r