Fixed SDWAN lan-port-activate DG with correct AAI resource

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sdwan / GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml

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 808070f..9211d48 100644 (file)
--- 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>\r
                 </switch>\r
             </for>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                <parameter name='contextPrefix' value='prop' />\r
+            </execute>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value='0'>\r
                     <return status='failure'>\r
@@ -179,7 +183,7 @@
             </for>\r
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \r
+               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \r
                     depth = '1'"\r
         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
                 <outcome value='success'>\r
@@ -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`' />\r
             </set>\r
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
-                <parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
+      key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
+                <parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
                 <parameter name='operational-status' value='Active' />\r
-                <parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />\r
+                <!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->\r
             </update>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r