From ab3c36a57bb6a1f887c9750a5299197622527213 Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Fri, 26 Apr 2019 11:45:10 +0530
Subject: fixed WAN port create issue

Invalid parameter is used to set context memory
for ip address

Change-Id: I71e33d7d27526fd95a12afc08a669dbeb8768f32
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 7fb0b011a2ebba3757e41f219fdd1b4efc1a6c8a
---
 .../GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json | 6 +++---
 .../GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml  | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
index 380dfd00..d15b6f4c 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
@@ -579,7 +579,7 @@
         "id": "384abebf.660182",
         "type": "switchNode",
         "name": "switch ActivateSiteInstance",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    ",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n    ",
         "comments": "",
         "outputs": 1,
         "x": 1658.5078411102295,
@@ -1878,7 +1878,7 @@
         "id": "e72e5636.3932b8",
         "type": "set",
         "name": "set IP params",
-        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"prop.wan.ipAddress\" />\n<parameter name='prop.wan.providerIpAddress' value=\"prop.wan.provideripAddress\" />\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n<parameter name='prop.route.ipAddress' value=\"`$prop.wan.ipAddress`\" />\n\n",
+        "xml": "<set>\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n\n\n",
         "comments": "",
         "x": 2257.29248046875,
         "y": 1043.8992919921875,
@@ -1889,7 +1889,7 @@
         "id": "413a8e72.8c216",
         "type": "set",
         "name": "set IP params",
-        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",
+        "xml": "<set>\n<parameter name='prop.wan.ipAddress' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",
         "comments": "",
         "x": 2254.754150390625,
         "y": 1158,
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" />
-- 
cgit 1.2.3-korg