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