From 7447a47bb9e911e344260c7edbc09bb3791bd9dd Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Wed, 24 Apr 2019 11:25:34 +0530
Subject: Fixed SDWAN lan-port-activate DG with correct AAI resource

SDWAN lan-port-activate DG is updated with correct AAI
resource name lan-port-config. Earlier resource name
sdwan-vpn is used

Change-Id: I2ed2d4da0415a57b4cbb02f13a557f5da93ba80b
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: 5a05205ebb2299f235e76a2288f7347d29e6cebb
---
 ...ERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/sdwan')

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" />
-- 
cgit 1.2.3-korg