From: Dan Timoney <dtimoney@att.com>
Date: Sat, 27 Apr 2019 01:30:50 +0000 (+0000)
Subject: Merge "fixed WAN port create issue"
X-Git-Tag: 1.5.1~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=796cd924f57d4f2a373867350efafcd06750c1a4;hp=85c0c3178ad539f30f197f5861476ca04cd2496d;p=sdnc%2Foam.git

Merge "fixed WAN port create issue"

Former-commit-id: 5377ee40ada510053ed0beeba9410de6600a6ae2
---

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" />