From 85c0c3178ad539f30f197f5861476ca04cd2496d Mon Sep 17 00:00:00 2001 From: "prakash.e" Date: Fri, 26 Apr 2019 14:49:56 +0530 Subject: [PATCH] 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 Former-commit-id: 83413b8058da81bd163b1c4270f4851cbbde0161 --- ...CE-API_sdwan-vf-operation-lanport-activate.json | 286 ++++++++++++--------- ...RCE-API_sdwan-vf-operation-lanport-activate.xml | 141 +++++----- 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": "\n\n\n\n", "comments": "", - "x": 581.0040321350098, - "y": 2299.501180291176, + "x": 580.0040740966797, + "y": 2308.5012640953064, "z": "54b5b8b7.025628", "wires": [] }, @@ -662,8 +662,8 @@ "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 643.0351715087891, - "y": 1419.0782576799393, + "x": 669.0351696014404, + "y": 1681.0783828496933, "z": "54b5b8b7.025628", "wires": [ [ @@ -679,8 +679,8 @@ "xml": "\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": "\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": "\n\t\n\t\n \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": "\n\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": "\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": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1065.6854209899902, - "y": 1514.1888865232468, + "x": 1088.6854190826416, + "y": 1776.188939332962, "z": "54b5b8b7.025628", "wires": [ [ @@ -790,8 +790,8 @@ "xml": "\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": "\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": "\n\t\n\t\n \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": "\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": "\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": "\n\n\n\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": "\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": "\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": "\n\n", "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": "\n\n\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": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 648.7792510986328, - "y": 1691.8749581575394, + "x": 676.7792358398438, + "y": 1898.8749904632568, "z": "54b5b8b7.025628", "wires": [ [ @@ -1001,8 +1001,8 @@ "xml": "\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": "\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": "\n\t\n\t\n \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": "\n\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": "\n\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 665.2897033691406, - "y": 1871.333845257759, + "x": 674.2896537780762, + "y": 1587.5840225219727, "z": "54b5b8b7.025628", "wires": [ [ @@ -1089,8 +1089,8 @@ "xml": "\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": "\n\t\n\t\n \n", "comments": "", - "x": 1083.2896480560303, - "y": 1856.3332226276398, + "x": 1092.2895984649658, + "y": 1572.5833998918533, "z": "54b5b8b7.025628", "wires": [] }, @@ -1131,8 +1131,8 @@ "xml": "\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": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 636.288028717041, - "y": 1781.8329049348831, + "x": 645.2879791259766, + "y": 1498.0830821990967, "z": "54b5b8b7.025628", "wires": [ [ @@ -1164,8 +1164,8 @@ "xml": "\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": "\n\t\n\t\n \n", "comments": "", - "x": 1027.287992477417, - "y": 1762.832870721817, + "x": 1036.2879428863525, + "y": 1479.0830479860306, "z": "54b5b8b7.025628", "wires": [] }, @@ -1206,8 +1206,8 @@ "xml": "\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": "\n\n", + "name": "set prop.vpnId", + "xml": "\n\n", "comments": "", "x": 2266.9571075439453, "y": 995.3333512544632, @@ -1500,8 +1500,8 @@ "xml": "\n\n\n\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": "\n\n\n", "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": "\n\n\n\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": "\n\n\n\n\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": "\n\n\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": "\n\n\n", "comments": "", - "x": 623.3208656311035, - "y": 2012.0313054323196, + "x": 622.3209075927734, + "y": 2021.0313892364502, "z": "54b5b8b7.025628", "wires": [] }, @@ -1649,8 +1649,8 @@ "xml": "\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": "\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": "\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": "\n\t\n\t\n \n\t\n\t\n \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": "\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": "\n\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": "\n\t\n\t\n \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": "\n\n\n\n", "comments": "", - "x": 1069.7540130615234, - "y": 1111.7540036439896, + "x": 1084.7540130615234, + "y": 1195.754023551941, "z": "54b5b8b7.025628", "wires": [] }, @@ -1784,8 +1784,8 @@ "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 627.2539825439453, - "y": 1282.7541066408157, + "x": 642.2539825439453, + "y": 1366.754126548767, "z": "54b5b8b7.025628", "wires": [ [ @@ -1801,8 +1801,8 @@ "xml": "\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": "\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": "\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": "\n\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 @@ + + + + + + + @@ -169,7 +176,7 @@ - + @@ -201,6 +208,23 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -307,23 +379,6 @@ - - - - - - - - - - - - - - - - - @@ -352,54 +407,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -451,4 +458,4 @@ - \ No newline at end of file + -- 2.16.6