From 5a9ce60c616970d510d7d21fd3a69186c3f79731 Mon Sep 17 00:00:00 2001 From: "prakash.e" <prakash.e@huawei.com> Date: Mon, 6 May 2019 11:11:51 +0530 Subject: Fixed lan-port-deactivate by passing bridgeDomainId Added bridgeDomainId parameter in lan-port-param DG to pass it in bridgeDomain delete request to controller Change-Id: Ifef40161756256ec57cde1ee1fbf8779edec81fe Issue-ID: SDNC-659 Signed-off-by: Prakash.E <prakash.e@huawei.com> Former-commit-id: 813277f3100e05ae7580b0cd8712ee97eec7e99c --- ...URCE-API_sdwan-get-vf-module-lanport-param.json | 382 ++++++++++++--------- ...OURCE-API_sdwan-get-vf-module-lanport-param.xml | 11 +- 2 files changed, 222 insertions(+), 171 deletions(-) (limited to 'platform-logic/generic-resource-api/src') diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-lanport-param.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-lanport-param.json index ff8ea5d6..508febcf 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-lanport-param.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-lanport-param.json @@ -1,36 +1,36 @@ [ { - "id": "2c4f0af0.2c9bc6", + "id": "9db92b19.dbe808", "type": "for", "name": "for each sdwan-get-request-input-param", "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-request-input.vf-module-input-parameters.param_length`\">\n", "comments": "", "outputs": 1, - "x": 316.00390625, - "y": 404.66663709282875, - "z": "265ff638.5c829a", + "x": 325, + "y": 398.6666383743286, + "z": "5f38b520.a4a09c", "wires": [ [ - "56b3eefc.4b589" + "c735b4a8.18a688" ] ] }, { - "id": "2c996a4d.e68db6", + "id": "188771b4.f4965e", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 148.3371353149414, - "y": 66.99999871850014, - "z": "265ff638.5c829a", + "x": 157.3332290649414, + "y": 61, + "z": "5f38b520.a4a09c", "wires": [ [ - "f25d5be5.2418e8" + "36a2e568.0357ba" ] ] }, { - "id": "f25d5be5.2418e8", + "id": "36a2e568.0357ba", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -38,470 +38,514 @@ "comments": "", "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>", "outputs": 1, - "x": 293.3371391296387, - "y": 148.00001588463783, - "z": "265ff638.5c829a", + "x": 302.3332328796387, + "y": 142.0000171661377, + "z": "5f38b520.a4a09c", "wires": [ [ - "9492e095.18e9e" + "c90cdfce.89ab2" ] ] }, { - "id": "9492e095.18e9e", + "id": "c90cdfce.89ab2", "type": "method", "name": "sdwan-get-vf-module-lanport-param", "xml": "<method rpc='sdwan-get-vf-module-lanport-param' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 281.3372573852539, - "y": 235.99999871850014, - "z": "265ff638.5c829a", + "x": 290.3333511352539, + "y": 230, + "z": "5f38b520.a4a09c", "wires": [ [ - "bff01db2.bf3ae" + "6e63b9aa.639678" ] ] }, { - "id": "bff01db2.bf3ae", + "id": "6e63b9aa.639678", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 288.33715057373047, - "y": 322.00005689263344, - "z": "265ff638.5c829a", + "x": 297.33324432373047, + "y": 316.0000581741333, + "z": "5f38b520.a4a09c", "wires": [ [ - "2c4f0af0.2c9bc6" + "9db92b19.dbe808" ] ] }, { - "id": "56b3eefc.4b589", + "id": "c735b4a8.18a688", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 572.2365531921387, - "y": 407.01038923859596, - "z": "265ff638.5c829a", + "x": 581.2326469421387, + "y": 401.0103905200958, + "z": "5f38b520.a4a09c", "wires": [ [ - "af0a968c.e31848", - "b43654ab.9bf6b8", - "463d217f.c20ed", - "1981a60f.f9705a", - "1dceb60d.fa250a", - "24fadd39.8f7f62", - "32e900b0.3dd2e", - "96f3e589.8d0b78", - "e97e7430.6a0bf8", - "c64e5121.85df6" + "2b991906.72e806", + "dd091818.b8d3d8", + "25129de.f993162", + "8e9a4bdb.28b1e8", + "f37b1ca2.6a934", + "fb94d6b4.86b308", + "2e9e6276.adaf7e", + "aed1f583.2c5408", + "83549cb1.b88e3", + "d33cf9af.f5b998", + "aa03a2b9.57125" ] ] }, { - "id": "af0a968c.e31848", + "id": "2b991906.72e806", "type": "returnSuccess", "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": 766.7371597290039, - "y": 697.0107623636723, - "z": "265ff638.5c829a", + "x": 777.7332763671875, + "y": 777.0107421875, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "463d217f.c20ed", + "id": "25129de.f993162", "type": "switchNode", "name": "switch deviceName", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'deviceName'`\">\n", "comments": "", "outputs": 1, - "x": 794.7365493774414, - "y": 334.0104278624058, - "z": "265ff638.5c829a", + "x": 803.7326431274414, + "y": 328.01042914390564, + "z": "5f38b520.a4a09c", "wires": [ [ - "3b82cda6.2e9ae2" + "6f203c8e.611124" ] ] }, { - "id": "3b82cda6.2e9ae2", + "id": "6f203c8e.611124", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 969.7369422912598, - "y": 332.01051464676857, - "z": "265ff638.5c829a", + "x": 978.7330360412598, + "y": 326.01051592826843, + "z": "5f38b520.a4a09c", "wires": [ [ - "5ed3a247.7a0cec" + "7b50722c.c7533c" ] ] }, { - "id": "5ed3a247.7a0cec", + "id": "7b50722c.c7533c", "type": "set", "name": "set deviceName", "xml": "<set>\n<parameter name='prop.lan.deviceName' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1144.7370262145996, - "y": 333.6105619966984, - "z": "265ff638.5c829a", + "x": 1153.7331199645996, + "y": 327.61056327819824, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "32e900b0.3dd2e", + "id": "2e9e6276.adaf7e", "type": "switchNode", "name": "switch vlanId", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vlanId'`\">\n", "comments": "", "outputs": 1, - "x": 772.5766754150391, - "y": 541.0104841291904, - "z": "265ff638.5c829a", + "x": 781.5727691650391, + "y": 535.0104854106903, + "z": "5f38b520.a4a09c", "wires": [ [ - "ced8e745.f60e88" + "1a406ca0.026be3" ] ] }, { - "id": "ced8e745.f60e88", + "id": "1a406ca0.026be3", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 965.5766639709473, - "y": 543.0105566084385, - "z": "265ff638.5c829a", + "x": 974.5727577209473, + "y": 537.0105578899384, + "z": "5f38b520.a4a09c", "wires": [ [ - "76785b15.1d0d44" + "bb95c91e.dc2568" ] ] }, { - "id": "76785b15.1d0d44", + "id": "bb95c91e.dc2568", "type": "set", "name": "set vlanId", "xml": "<set>\n<parameter name='prop.lan.vlanId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1111.9104919433594, - "y": 544.4717992842197, - "z": "265ff638.5c829a", + "x": 1120.9065856933594, + "y": 538.4718005657196, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "24fadd39.8f7f62", + "id": "fb94d6b4.86b308", "type": "switchNode", "name": "switch ipAddress", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'ipAddress'`\">\n", "comments": "", "outputs": 1, - "x": 781.6318626403809, - "y": 499.3871625959873, - "z": "265ff638.5c829a", + "x": 790.6279563903809, + "y": 493.3871638774872, + "z": "5f38b520.a4a09c", "wires": [ [ - "4259d222.74a0ac" + "5af33e36.891" ] ] }, { - "id": "4259d222.74a0ac", + "id": "5af33e36.891", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 966.6320037841797, - "y": 499.3871196806431, - "z": "265ff638.5c829a", + "x": 975.6280975341797, + "y": 493.38712096214294, + "z": "5f38b520.a4a09c", "wires": [ [ - "591c9080.263bb" + "f8a774b3.88f1a8" ] ] }, { - "id": "591c9080.263bb", + "id": "f8a774b3.88f1a8", "type": "set", "name": "set ipAddress", "xml": "<set>\n<parameter name='prop.lan.ipAddress' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1130.9658851623535, - "y": 500.84839764237404, - "z": "265ff638.5c829a", + "x": 1139.9619789123535, + "y": 494.8483989238739, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "1dceb60d.fa250a", + "id": "f37b1ca2.6a934", "type": "switchNode", "name": "switch portNumber", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portNumber'`\">\n", "comments": "", "outputs": 1, - "x": 787.9649925231934, - "y": 458.00466004014015, - "z": "265ff638.5c829a", + "x": 796.9610862731934, + "y": 452.00466132164, + "z": "5f38b520.a4a09c", "wires": [ [ - "490b401c.697cc" + "9558353d.7359b8" ] ] }, { - "id": "490b401c.697cc", + "id": "9558353d.7359b8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 969.9650917053223, - "y": 460.0046733915806, - "z": "265ff638.5c829a", + "x": 978.9611854553223, + "y": 454.00467467308044, + "z": "5f38b520.a4a09c", "wires": [ [ - "57039008.35953" + "f699e921.7f4d28" ] ] }, { - "id": "57039008.35953", + "id": "f699e921.7f4d28", "type": "set", "name": "set portNumber", "xml": "<set>\n<parameter name='prop.lan.portNumber' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1139.965503692627, - "y": 458.6046899855137, - "z": "265ff638.5c829a", + "x": 1148.961597442627, + "y": 452.60469126701355, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "1981a60f.f9705a", + "id": "8e9a4bdb.28b1e8", "type": "switchNode", "name": "switch portType", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portType'`\">\n", "comments": "", "outputs": 1, - "x": 777.8600120544434, - "y": 415.97798481583595, - "z": "265ff638.5c829a", + "x": 786.8561058044434, + "y": 409.9779860973358, + "z": "5f38b520.a4a09c", "wires": [ [ - "c6df8310.f4453" + "54a6b459.f5ae4c" ] ] }, { - "id": "c6df8310.f4453", + "id": "54a6b459.f5ae4c", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 972.8600845336914, - "y": 416.97801914811134, - "z": "265ff638.5c829a", + "x": 981.8561782836914, + "y": 410.9780204296112, + "z": "5f38b520.a4a09c", "wires": [ [ - "2741b1f1.18b52e" + "85e52ac0.2d8b38" ] ] }, { - "id": "2741b1f1.18b52e", + "id": "85e52ac0.2d8b38", "type": "set", "name": "set portType", "xml": "<set>\n<parameter name='prop.lan.portType' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1130.8604850769043, - "y": 414.5780240595341, - "z": "265ff638.5c829a", + "x": 1139.8565788269043, + "y": 408.57802534103394, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "b43654ab.9bf6b8", + "id": "dd091818.b8d3d8", "type": "switchNode", "name": "switch id", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'id'`\">\n", "comments": "", "outputs": 1, - "x": 778.7359046936035, - "y": 285.39707508683205, - "z": "265ff638.5c829a", + "x": 787.7319984436035, + "y": 279.3970763683319, + "z": "5f38b520.a4a09c", "wires": [ [ - "f78d38c9.fd9ac8" + "43c39237.1b560c" ] ] }, { - "id": "f78d38c9.fd9ac8", + "id": "43c39237.1b560c", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 970.7358283996582, - "y": 285.39708176255226, - "z": "265ff638.5c829a", + "x": 979.7319221496582, + "y": 279.3970830440521, + "z": "5f38b520.a4a09c", "wires": [ [ - "a7c9579.652f8a8" + "2c7fc366.3d8cac" ] ] }, { - "id": "a7c9579.652f8a8", + "id": "2c7fc366.3d8cac", "type": "set", "name": "set id", "xml": "<set>\n<parameter name='prop.lan.id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1114.7360954284668, - "y": 284.9972099363804, - "z": "265ff638.5c829a", + "x": 1123.7321891784668, + "y": 278.99721121788025, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "96f3e589.8d0b78", + "id": "aed1f583.2c5408", "type": "switchNode", "name": "switch portSwitch", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portSwitch'`\">\n", "comments": "", "outputs": 1, - "x": 784.7363700866699, - "y": 377.02076187729836, - "z": "265ff638.5c829a", + "x": 793.7324638366699, + "y": 371.0207631587982, + "z": "5f38b520.a4a09c", "wires": [ [ - "334d8f60.5216" + "edb7fade.456288" ] ] }, { - "id": "334d8f60.5216", + "id": "edb7fade.456288", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 969.7363052368164, - "y": 375.0208114683628, - "z": "265ff638.5c829a", + "x": 978.7323989868164, + "y": 369.02081274986267, + "z": "5f38b520.a4a09c", "wires": [ [ - "c21a46cf.86e348" + "367efaea.fb2976" ] ] }, { - "id": "c21a46cf.86e348", + "id": "367efaea.fb2976", "type": "set", "name": "set portSwitch", "xml": "<set>\n<parameter name='prop.lan.portSwitch' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1141.7366905212402, - "y": 375.6208051741123, - "z": "265ff638.5c829a", + "x": 1150.7327842712402, + "y": 369.6208064556122, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "e97e7430.6a0bf8", + "id": "83549cb1.b88e3", "type": "switchNode", "name": "switch devicePortId", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'devicePortId'`\">\n", "comments": "", "outputs": 1, - "x": 788.0039215087891, - "y": 585.0000158846378, - "z": "265ff638.5c829a", + "x": 797.0000152587891, + "y": 579.0000171661377, + "z": "5f38b520.a4a09c", "wires": [ [ - "c1d00fd5.a6813" + "7823f19a.9b76f" ] ] }, { - "id": "c1d00fd5.a6813", + "id": "7823f19a.9b76f", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 957.0039348602295, - "y": 585.000097900629, - "z": "265ff638.5c829a", + "x": 966.0000286102295, + "y": 579.0000991821289, + "z": "5f38b520.a4a09c", "wires": [ [ - "9738637f.94e19" + "7cfb710f.9bc79" ] ] }, { - "id": "9738637f.94e19", + "id": "7cfb710f.9bc79", "type": "set", "name": "set devicePortId", "xml": "<set>\n<parameter name='prop.lan.devicePortId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1115.3377227783203, - "y": 588.4613138735294, - "z": "265ff638.5c829a", + "x": 1124.3338165283203, + "y": 582.4613151550293, + "z": "5f38b520.a4a09c", "wires": [] }, { - "id": "c64e5121.85df6", + "id": "d33cf9af.f5b998", "type": "switchNode", "name": "switch lanPortId", "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'lanPortId'`\">\n", "comments": "", "outputs": 1, - "x": 770.00390625, - "y": 640.9999987185001, - "z": "265ff638.5c829a", + "x": 779, + "y": 635, + "z": "5f38b520.a4a09c", "wires": [ [ - "a51c3fe9.2f2e3" + "14d30777.14dcf9" ] ] }, { - "id": "a51c3fe9.2f2e3", + "id": "14d30777.14dcf9", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 963.0038948059082, - "y": 643.0000711977482, - "z": "265ff638.5c829a", + "x": 971.9999885559082, + "y": 637.000072479248, + "z": "5f38b520.a4a09c", "wires": [ [ - "f459792e.21f348" + "e250544b.9d4268" ] ] }, { - "id": "f459792e.21f348", + "id": "e250544b.9d4268", "type": "set", "name": "set lanPortId", "xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", "comments": "", - "x": 1109.3377227783203, - "y": 644.4613138735294, - "z": "265ff638.5c829a", + "x": 1118.3338165283203, + "y": 638.4613151550293, + "z": "5f38b520.a4a09c", + "wires": [] + }, + { + "id": "aa03a2b9.57125", + "type": "switchNode", + "name": "switch bridgeDomainId", + "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'bridgeDomainId'`\">\n", + "comments": "", + "outputs": 1, + "x": 801, + "y": 693, + "z": "5f38b520.a4a09c", + "wires": [ + [ + "f733597e.c9e3b8" + ] + ] + }, + { + "id": "f733597e.c9e3b8", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 995, + "y": 695.0000610351562, + "z": "5f38b520.a4a09c", + "wires": [ + [ + "8e63e7a7.180198" + ] + ] + }, + { + "id": "8e63e7a7.180198", + "type": "set", + "name": "set bridgeDomainId", + "xml": "<set>\n<parameter name='prop.lan.bridgeDomainId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n", + "comments": "", + "x": 1165.3338623046875, + "y": 693.4613037109375, + "z": "5f38b520.a4a09c", "wires": [] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-lanport-param.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-lanport-param.xml index 72241740..70d408d1 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-lanport-param.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-vf-module-lanport-param.xml @@ -1,6 +1,6 @@ <service-logic - xmlns='http://www.onap.org/sdnc/svclogic' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> + xmlns='http://www.onap.org/sdnc/svclogic' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> <method rpc='sdwan-get-vf-module-lanport-param' mode='sync'> <block atomic="true"> <for index="idx" start="0" end="`$vf-module-request-input.vf-module-input-parameters.param_length`"> @@ -68,6 +68,13 @@ </set> </outcome> </switch> + <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'bridgeDomainId'`"> + <outcome value='true'> + <set> + <parameter name='prop.lan.bridgeDomainId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' /> + </set> + </outcome> + </switch> <return status='success'> <parameter name="ack-final-indicator" value="Y" /> <parameter name="error-code" value="200" /> -- cgit 1.2.3-korg