diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-04-24 20:11:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-24 20:11:41 +0000 |
| commit | 0395fded3d7c04fff3f9fa54503df8fe318742ca (patch) | |
| tree | 9316aba3e04989b98b63b776e58fe67feaad337f /platform-logic/generic-resource-api/src/main/xml/sdwan | |
| parent | 1c3e7b87cb1c109d5eff779845bf953e96d424ad (diff) | |
| parent | 7447a47bb9e911e344260c7edbc09bb3791bd9dd (diff) | |
Merge "Fixed SDWAN lan-port-activate DG with correct AAI resource"
Former-commit-id: 797f2333a91eb3de6fdbc8260e02f39e6b99e802
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/sdwan')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml index 808070fc..9211d48b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml @@ -21,6 +21,10 @@ </outcome>
</switch>
</for>
+ <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='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
<outcome value='0'>
<return status='failure'>
@@ -179,7 +183,7 @@ </for>
<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="esr-thirdparty-sdnc"
- key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND
+ key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND
depth = '1'"
pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
<outcome value='success'>
@@ -415,10 +419,10 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
</set>
<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
- key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
- <parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
+ key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
+ <parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
<parameter name='operational-status' value='Active' />
- <parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />
+ <!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->
</update>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
|