X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fsdwan%2FGENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml;h=288dd5d911a50c4b102aec39e792a3cad3b81971;hb=7fb0b011a2ebba3757e41f219fdd1b4efc1a6c8a;hp=40b1896d0a3534df35803db01f9adafb60b334ce;hpb=570153b334e64246b2eff459d18d6eac6df70e22;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
index 40b1896d..288dd5d9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
@@ -129,7 +129,7 @@
                                     </block>
                                 </outcome>
                             </switch>
-                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">
+                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
                                 <outcome value='true'>
                                     <set>
                                         <parameter name='tmp.siteVidx' value='`$idx`' />
@@ -346,11 +346,9 @@
                                     <outcome value='true'>
                                         <block atomic="true">
                                             <set>
-                                                <parameter name='prop.wan.ip-address' value="prop.wan.ipAddress" />
-                                                <parameter name='prop.wan.providerIpAddress' value="prop.wan.provideripAddress" />
                                                 <parameter name='prop.wan.IpMode' value="static" />
+                                                <parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />
                                                 <parameter name='prop.route.nextHopType' value="ip-address" />
-                                                <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />
                                             </set>
                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />
@@ -383,7 +381,7 @@
                                     <outcome value='true'>
                                         <block atomic="true">
                                             <set>
-                                                <parameter name='prop.wan.ip-address' value="" />
+                                                <parameter name='prop.wan.ipAddress' value="" />
                                                 <parameter name='prop.wan.prefixLength' value="" />
                                                 <parameter name='prop.wan.providerIpAddress' value="" />
                                                 <parameter name='prop.wan.IpMode' value="DHCP" />