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

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 380dfd0..d15b6f4 100644 (file)
--- 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",\r
         "type": "switchNode",\r
         "name": "switch ActivateSiteInstance",\r
-        "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    ",\r
+        "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    ",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1658.5078411102295,\r
@@ -1878,7 +1878,7 @@
         "id": "e72e5636.3932b8",\r
         "type": "set",\r
         "name": "set IP params",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "x": 2257.29248046875,\r
         "y": 1043.8992919921875,\r
@@ -1889,7 +1889,7 @@
         "id": "413a8e72.8c216",\r
         "type": "set",\r
         "name": "set IP params",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "x": 2254.754150390625,\r
         "y": 1158,\r

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 40b1896..288dd5d 100644 (file)
--- 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>\r
                                 </outcome>\r
                             </switch>\r
-                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">\r
+                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                                 <outcome value='true'>\r
                                     <set>\r
                                         <parameter name='tmp.siteVidx' value='`$idx`' />\r
@@ -346,11 +346,9 @@
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='prop.wan.ip-address' value="prop.wan.ipAddress" />\r
-                                                <parameter name='prop.wan.providerIpAddress' value="prop.wan.provideripAddress" />\r
                                                 <parameter name='prop.wan.IpMode' value="static" />\r
+                                                <parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\r
                                                 <parameter name='prop.route.nextHopType' value="ip-address" />\r
-                                                <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />\r
                                             </set>\r
                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />\r
@@ -383,7 +381,7 @@
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='prop.wan.ip-address' value="" />\r
+                                                <parameter name='prop.wan.ipAddress' value="" />\r
                                                 <parameter name='prop.wan.prefixLength' value="" />\r
                                                 <parameter name='prop.wan.providerIpAddress' value="" />\r
                                                 <parameter name='prop.wan.IpMode' value="DHCP" />\r