Fix SDWAN lan-port-config ip-subnets creation

SDWAN lan-port ip-subnets creation called after
attaching site to VPN to resolve invalid-vpn
error from controller

Change-Id: Iec9d8a1945e3ddd992aa33e5f96b1ab9ce1dfd88
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
index a7cc60b..ca09d52 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json
@@ -388,8 +388,8 @@
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 581.0040321350098,\r
-        "y": 2299.501180291176,\r
+        "x": 580.0040740966797,\r
+        "y": 2308.5012640953064,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -662,8 +662,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 643.0351715087891,\r
-        "y": 1419.0782576799393,\r
+        "x": 669.0351696014404,\r
+        "y": 1681.0783828496933,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -679,8 +679,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 892.0352306365967,\r
-        "y": 1433.0784636735916,\r
+        "x": 915.035228729248,\r
+        "y": 1695.0785164833069,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -695,8 +695,8 @@
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 892.0352306365967,\r
-        "y": 1395.078299164772,\r
+        "x": 915.035228729248,\r
+        "y": 1657.0783519744873,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -710,8 +710,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1036.0355644226074,\r
-        "y": 1394.0782986879349,\r
+        "x": 1059.0355625152588,\r
+        "y": 1656.0783514976501,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -723,8 +723,8 @@
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1039.0352420806885,\r
-        "y": 1434.0783025026321,\r
+        "x": 1062.0352401733398,\r
+        "y": 1696.0783553123474,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
@@ -736,8 +736,8 @@
         "name": "set prop.lan.devicePortId",\r
         "xml": "<set>\n<parameter name='prop.lan.devicePortId' value='`$portResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 585.6924324035645,\r
-        "y": 1472.1794625520706,\r
+        "x": 608.6924304962158,\r
+        "y": 1734.179515361786,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -747,8 +747,8 @@
         "name": "Create port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 544.7011108398438,\r
-        "y": 1385.5222817659378,\r
+        "x": 567.7011089324951,\r
+        "y": 1647.522334575653,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -759,8 +759,8 @@
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591.7011108398438,\r
-        "y": 1334.1887179613113,\r
+        "x": 606.7011108398438,\r
+        "y": 1418.1887378692627,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
@@ -773,8 +773,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"bridgeDomainResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1065.6854209899902,\r
-        "y": 1514.1888865232468,\r
+        "x": 1088.6854190826416,\r
+        "y": 1776.188939332962,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -790,8 +790,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1386.685447692871,\r
-        "y": 1531.189206957817,\r
+        "x": 1409.6854457855225,\r
+        "y": 1793.1892597675323,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -806,8 +806,8 @@
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1389.685474395752,\r
-        "y": 1496.1889885663986,\r
+        "x": 1412.6854724884033,\r
+        "y": 1758.189041376114,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -821,8 +821,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create bridge domain rest api\" />\n",\r
         "comments": "",\r
-        "x": 1592.685863494873,\r
-        "y": 1492.1890958547592,\r
+        "x": 1615.6858615875244,\r
+        "y": 1754.1891486644745,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -834,8 +834,8 @@
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1593.6854286193848,\r
-        "y": 1527.188962340355,\r
+        "x": 1616.6854267120361,\r
+        "y": 1789.1890151500702,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
@@ -847,8 +847,8 @@
         "name": "Create bridge domain",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1009.3513145446777,\r
-        "y": 1480.6331123113632,\r
+        "x": 1032.351312637329,\r
+        "y": 1742.6331651210785,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -859,8 +859,8 @@
         "xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 565.4628868103027,\r
-        "y": 1515.8555184602737,\r
+        "x": 588.4628849029541,\r
+        "y": 1777.855571269989,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -875,8 +875,8 @@
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 744.4629173278809,\r
-        "y": 1515.9668408632278,\r
+        "x": 767.4629154205322,\r
+        "y": 1777.9668936729431,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -891,8 +891,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.lan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 590.0078811645508,\r
-        "y": 1615.754068493843,\r
+        "x": 610.0079498291016,\r
+        "y": 1125.75403881073,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -908,8 +908,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 791.0079002380371,\r
-        "y": 1593.7540599107742,\r
+        "x": 811.0079689025879,\r
+        "y": 1103.7540302276611,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -924,8 +924,8 @@
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 791.0079040527344,\r
-        "y": 1634.7540637254715,\r
+        "x": 811.0079727172852,\r
+        "y": 1144.7540340423584,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -939,8 +939,8 @@
         "name": "set ipAddress prefixLength",\r
         "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",\r
         "comments": "",\r
-        "x": 988.0079193115234,\r
-        "y": 1591.7540599107742,\r
+        "x": 1008.0079879760742,\r
+        "y": 1101.7540302276611,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -950,8 +950,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 946.0079116821289,\r
-        "y": 1631.7540627717972,\r
+        "x": 966.0079803466797,\r
+        "y": 1141.754033088684,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -961,8 +961,8 @@
         "name": "Create wan port",\r
         "info": "",\r
         "comments": "",\r
-        "x": 563.0177574157715,\r
-        "y": 1568.7641183137894,\r
+        "x": 586.0177555084229,\r
+        "y": 1830.7641711235046,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -972,8 +972,8 @@
         "name": "TODO: split ip/mask",\r
         "info": "",\r
         "comments": "",\r
-        "x": 987.0175514221191,\r
-        "y": 1553.9343320131302,\r
+        "x": 1010.0175495147705,\r
+        "y": 1815.9343848228455,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -984,8 +984,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"lanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 648.7792510986328,\r
-        "y": 1691.8749581575394,\r
+        "x": 676.7792358398438,\r
+        "y": 1898.8749904632568,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1001,8 +1001,8 @@
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 917.7792816162109,\r
-        "y": 1678.8749305009842,\r
+        "x": 945.7792663574219,\r
+        "y": 1885.8749628067017,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1017,8 +1017,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 914.7792549133301,\r
-        "y": 1713.8751488924026,\r
+        "x": 942.779239654541,\r
+        "y": 1920.8751811981201,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1032,8 +1032,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create device port rest api\" />\n",\r
         "comments": "",\r
-        "x": 1070.7796630859375,\r
-        "y": 1674.8751565217972,\r
+        "x": 1098.7796478271484,\r
+        "y": 1881.8751888275146,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1045,8 +1045,8 @@
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1061.7792358398438,\r
-        "y": 1714.8749047517776,\r
+        "x": 1089.7792205810547,\r
+        "y": 1921.8749370574951,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1060,8 +1060,8 @@
         "name": "set prop.lan.lanPortId",\r
         "xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",\r
         "comments": "",\r
-        "x": 1268.6683387756348,\r
-        "y": 1717.2083712816238,\r
+        "x": 1296.6683235168457,\r
+        "y": 1924.2084035873413,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1069,11 +1069,11 @@
         "id": "bb7f5a63.9f3828",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode create vpn topology",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpnId + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 665.2897033691406,\r
-        "y": 1871.333845257759,\r
+        "x": 674.2896537780762,\r
+        "y": 1587.5840225219727,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1089,8 +1089,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 913.289587020874,\r
-        "y": 1897.3332226276398,\r
+        "x": 922.2895374298096,\r
+        "y": 1613.5833998918533,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1106,8 +1106,8 @@
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1083.2895259857178,\r
-        "y": 1900.3332226276398,\r
+        "x": 1092.2894763946533,\r
+        "y": 1616.5833998918533,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
@@ -1119,8 +1119,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn topology failed\" />\n",\r
         "comments": "",\r
-        "x": 1083.2896480560303,\r
-        "y": 1856.3332226276398,\r
+        "x": 1092.2895984649658,\r
+        "y": 1572.5833998918533,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1131,8 +1131,8 @@
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 916.2895259857178,\r
-        "y": 1856.3332226276398,\r
+        "x": 925.2894763946533,\r
+        "y": 1572.5833998918533,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1147,8 +1147,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 636.288028717041,\r
-        "y": 1781.8329049348831,\r
+        "x": 645.2879791259766,\r
+        "y": 1498.0830821990967,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1164,8 +1164,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 857.2879314422607,\r
-        "y": 1803.832870721817,\r
+        "x": 866.2878818511963,\r
+        "y": 1520.0830479860306,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1181,8 +1181,8 @@
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1027.2878704071045,\r
-        "y": 1806.832870721817,\r
+        "x": 1036.28782081604,\r
+        "y": 1523.0830479860306,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
@@ -1194,8 +1194,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn failed\" />\n",\r
         "comments": "",\r
-        "x": 1027.287992477417,\r
-        "y": 1762.832870721817,\r
+        "x": 1036.2879428863525,\r
+        "y": 1479.0830479860306,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1206,8 +1206,8 @@
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 860.2878704071045,\r
-        "y": 1762.832870721817,\r
+        "x": 869.28782081604,\r
+        "y": 1479.0830479860306,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1316,8 +1316,8 @@
     {\r
         "id": "3180f641.87c8ba",\r
         "type": "set",\r
-        "name": "set prop.vpn1Id",\r
-        "xml": "<set>\n<parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
+        "name": "set prop.vpnId",\r
+        "xml": "<set>\n<parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
         "comments": "",\r
         "x": 2266.9571075439453,\r
         "y": 995.3333512544632,\r
@@ -1500,8 +1500,8 @@
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n      key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 636.3209037780762,\r
-        "y": 2218.0313087701797,\r
+        "x": 635.3209457397461,\r
+        "y": 2227.0313925743103,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             []\r
@@ -1513,8 +1513,8 @@
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status'  value='Active' />\n<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-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<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
         "comments": "",\r
-        "x": 630.955924987793,\r
-        "y": 2163.1262341737747,\r
+        "x": 629.9559669494629,\r
+        "y": 2172.1263179779053,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1524,8 +1524,8 @@
         "name": "set vf-module-id and vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 666.955924987793,\r
-        "y": 2116.6261731386185,\r
+        "x": 665.9559669494629,\r
+        "y": 2125.626256942749,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1535,8 +1535,8 @@
         "name": "copy input data in service-data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",\r
         "comments": "",\r
-        "x": 630.9558753967285,\r
-        "y": 2064.876093029976,\r
+        "x": 629.9559173583984,\r
+        "y": 2073.8761768341064,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1546,8 +1546,8 @@
         "name": "set device PortId to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.devicePortId`' />\n",\r
         "comments": "",\r
-        "x": 637.3209419250488,\r
-        "y": 1958.0314923524857,\r
+        "x": 636.3209838867188,\r
+        "y": 1967.0315761566162,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1557,8 +1557,8 @@
         "name": "set lan PortId to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='lanPortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.lanPortId`' />\n",\r
         "comments": "",\r
-        "x": 623.3208656311035,\r
-        "y": 2012.0313054323196,\r
+        "x": 622.3209075927734,\r
+        "y": 2021.0313892364502,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1649,8 +1649,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 874.2539329528809,\r
-        "y": 1116.7539992034435,\r
+        "x": 889.2539329528809,\r
+        "y": 1200.7540191113949,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1665,8 +1665,8 @@
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 877.7448997497559,\r
-        "y": 1164.3280348479748,\r
+        "x": 892.7448997497559,\r
+        "y": 1248.3280547559261,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1681,8 +1681,8 @@
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 873.0779075622559,\r
-        "y": 1205.661347836256,\r
+        "x": 888.0779075622559,\r
+        "y": 1289.6613677442074,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1696,8 +1696,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1054.3163108825684,\r
-        "y": 1152.6137709319592,\r
+        "x": 1069.3163108825684,\r
+        "y": 1236.6137908399105,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1707,8 +1707,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1060.8504638671875,\r
-        "y": 1201.1005406081676,\r
+        "x": 1075.8504638671875,\r
+        "y": 1285.100560516119,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1719,8 +1719,8 @@
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.2540054321289,\r
-        "y": 1259.754029393196,\r
+        "x": 891.2540054321289,\r
+        "y": 1343.7540493011475,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1735,8 +1735,8 @@
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 868.5040054321289,\r
-        "y": 1313.3969126939774,\r
+        "x": 883.5040054321289,\r
+        "y": 1397.3969326019287,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1750,8 +1750,8 @@
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1026.2539329528809,\r
-        "y": 1260.7539979219437,\r
+        "x": 1041.2539329528809,\r
+        "y": 1344.754017829895,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1761,8 +1761,8 @@
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 1021.2540054321289,\r
-        "y": 1313.1469737291336,\r
+        "x": 1036.254005432129,\r
+        "y": 1397.146993637085,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1772,8 +1772,8 @@
         "name": "set controller data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
         "comments": "",\r
-        "x": 1069.7540130615234,\r
-        "y": 1111.7540036439896,\r
+        "x": 1084.7540130615234,\r
+        "y": 1195.754023551941,\r
         "z": "54b5b8b7.025628",\r
         "wires": []\r
     },\r
@@ -1784,8 +1784,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 627.2539825439453,\r
-        "y": 1282.7541066408157,\r
+        "x": 642.2539825439453,\r
+        "y": 1366.754126548767,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -1801,8 +1801,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 612.2540512084961,\r
-        "y": 1163.7540189027786,\r
+        "x": 627.2540512084961,\r
+        "y": 1247.75403881073,\r
         "z": "54b5b8b7.025628",\r
         "wires": [\r
             [\r
@@ -2025,7 +2025,8 @@
         "wires": [\r
             [\r
                 "2b39b5dd.e8366a",\r
-                "15adf9ee.e16a86"\r
+                "15adf9ee.e16a86",\r
+                "2697c7b2.0ecdf8"\r
             ]\r
         ]\r
     },\r
@@ -2136,5 +2137,48 @@
                 "6306e7ef.6a3048"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "2697c7b2.0ecdf8",\r
+        "type": "switchNode",\r
+        "name": "switch topology",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`\">\n    \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1941.50390625,\r
+        "y": 882.75390625,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "55a98d99.b2ebc4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "55a98d99.b2ebc4",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2092.253860473633,\r
+        "y": 884.253821849823,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": [\r
+            [\r
+                "115c12c5.b366ad"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "115c12c5.b366ad",\r
+        "type": "set",\r
+        "name": "set prop.topology",\r
+        "xml": "<set>\n<parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",\r
+        "comments": "",\r
+        "x": 2266.254608154297,\r
+        "y": 884.2538802623749,\r
+        "z": "54b5b8b7.025628",\r
+        "wires": []\r
     }\r
-]
\ No newline at end of file
+]\r

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 14941e5..45a9bce 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
@@ -159,6 +159,13 @@
                             <outcome value='true'>\r
                                 <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
                                     <block atomic="true">\r
+                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'topology'`">\r
+                                            <outcome value='true'>\r
+                                                <set>\r
+                                                    <parameter name='prop.topology' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">\r
                                             <outcome value='true'>\r
                                                 <set>\r
@@ -169,7 +176,7 @@
                                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">\r
                                             <outcome value='true'>\r
                                                 <set>\r
-                                                    <parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                    <parameter name='prop.vpnId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
                                                 </set>\r
                                             </outcome>\r
                                         </switch>\r
@@ -201,6 +208,23 @@
                     </switch>\r
                 </block>\r
             </for>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                <parameter name="original_string" value='`$prop.lan.ipAddress`'/>\r
+                <parameter name="regex" value="/"/>\r
+                <parameter name="ctx_memory_result_key" value="ipandMask"/>\r
+                <outcome value='success'>\r
+                    <set>\r
+                        <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
+                        <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='failure'>\r
+                    <return status='failure'>\r
+                        <parameter name='error-code' value='' />\r
+                        <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
+                    </return>\r
+                </outcome>\r
+            </execute>\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
@@ -252,6 +276,54 @@
                 </outcome>\r
             </execute>\r
             <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />\r
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />\r
+                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                <parameter name="format" value="json"/>\r
+                <parameter name="httpMethod" value="put"/>\r
+                <parameter name="responsePrefix" value="vpn-result"/>\r
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                <outcome value='failure'>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="Error executing Create vpn failed" />\r
+                    </return>\r
+                </outcome>\r
+                <outcome value='success'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+            </execute>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />\r
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpnId + '/topology'`" />\r
+                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                <parameter name="format" value="json"/>\r
+                <parameter name="httpMethod" value="put"/>\r
+                <parameter name="responsePrefix" value="vpn-result"/>\r
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                <outcome value='failure'>\r
+                    <return status='failure'>\r
+                        <parameter name='ack-final' value='Y'/>\r
+                        <parameter name="error-code" value="500" />\r
+                        <parameter name="error-message" value="Error executing Create vpn topology failed" />\r
+                    </return>\r
+                </outcome>\r
+                <outcome value='success'>\r
+                    <block atomic="true"></block>\r
+                </outcome>\r
+            </execute>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-port.json'`" />\r
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`" />\r
@@ -307,23 +379,6 @@
                     </execute>\r
                 </outcome>\r
             </switch>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                <parameter name="original_string" value='`$prop.lan.ipAddress`'/>\r
-                <parameter name="regex" value="/"/>\r
-                <parameter name="ctx_memory_result_key" value="ipandMask"/>\r
-                <outcome value='success'>\r
-                    <set>\r
-                        <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
-                        <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
-                    </set>\r
-                </outcome>\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='error-code' value='' />\r
-                        <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
-                    </return>\r
-                </outcome>\r
-            </execute>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdlan-ip-subnets.json'`" />\r
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`" />\r
@@ -352,54 +407,6 @@
                     </block>\r
                 </outcome>\r
             </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />\r
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="put"/>\r
-                <parameter name="responsePrefix" value="vpn-result"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error executing Create vpn failed" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-            </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`" />\r
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="put"/>\r
-                <parameter name="responsePrefix" value="vpn-result"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error executing Create vpn topology failed" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-            </execute>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.devicePortId`' />\r
@@ -451,4 +458,4 @@
             </return>\r
         </block>\r
     </method>\r
-</service-logic>
\ No newline at end of file
+</service-logic>\r