diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-21 10:17:28 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-23 08:30:32 -0400 |
| commit | c0070fd86f6db286bc77afc3de50a6a70a5f11f5 (patch) | |
| tree | eba067bab00b4a7a1e6d55236e22bc26b5d819be /platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml | |
| parent | 245d6f05d6e74ea3ea5c2bc4a6fa73cc64dba4c5 (diff) | |
Fix async logic
Fix bug in vnf-topology and vf-module-topology DGs to call
correct async DG (right now, not calling async DG).
Change-Id: I2a32e9e0755c274cbe235e9f3aabb5547a7d17d3
Issue-ID: SDNC-949
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: bf19b18511c382add95d33526e0706b7858f276f
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml index dae4b9b9..dc7dc371 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml @@ -6,13 +6,34 @@ <call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' ></call>
<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
<outcome value='assign'>
- <block atomic="true">
- <set>
- <parameter name='skip-mdsal-update' value='Y' />
- </set>
- <set>
- <parameter name='ack-final' value='N' />
- </set>
+ <block>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
+ <switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>
+ <outcome value='true'>
+ <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>
+ </outcome>
+ <outcome value='false'>
+ <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>
+ <outcome value='true'>
+ <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>
+ </outcome>
+ <outcome value='false'>
+ <block atomic="true">
+ <set>
+ <parameter name='skip-mdsal-update' value='Y' />
+ </set>
+ <set>
+ <parameter name='ack-final' value='N' />
+ </set>
+ <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' ></call>
+ </block>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
</block>
</outcome>
<outcome value='unassign'>
|