diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-04-19 13:46:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-19 13:46:04 +0000 |
| commit | d7dc8f2552565790223112996c9bfc719a55c0d8 (patch) | |
| tree | ff7c331799d9194d013cbc62d1d17fb5c276e938 /platform-logic/generic-resource-api/src/main | |
| parent | 3b54aeb4e242b4095caa2ffc2a6c5eb22efb2da1 (diff) | |
| parent | 248b05411470078f37c8364be295a0679509e704 (diff) | |
Merge "Fixed get-vf-module-lanport-param DG with proper input param"
Former-commit-id: 7abc384133b055fa56b8c9f33ff52255b18afbf7
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
2 files changed, 171 insertions, 171 deletions
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 4bb31386..ff8ea5d6 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": "3208e6b7.8cb61a",
+ "id": "2c4f0af0.2c9bc6",
"type": "for",
"name": "for each sdwan-get-request-input-param",
- "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
+ "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
"comments": "",
"outputs": 1,
- "x": 327,
- "y": 415.6666383743286,
- "z": "f5fe05ac.3dbcd8",
+ "x": 316.00390625,
+ "y": 404.66663709282875,
+ "z": "265ff638.5c829a",
"wires": [
[
- "5e79a667.e36978"
+ "56b3eefc.4b589"
]
]
},
{
- "id": "bb96599.94117a8",
+ "id": "2c996a4d.e68db6",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 159.3332290649414,
- "y": 78,
- "z": "f5fe05ac.3dbcd8",
+ "x": 148.3371353149414,
+ "y": 66.99999871850014,
+ "z": "265ff638.5c829a",
"wires": [
[
- "619534b0.e7c14c"
+ "f25d5be5.2418e8"
]
]
},
{
- "id": "619534b0.e7c14c",
+ "id": "f25d5be5.2418e8",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -38,470 +38,470 @@ "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": 304.3332328796387,
- "y": 159.0000171661377,
- "z": "f5fe05ac.3dbcd8",
+ "x": 293.3371391296387,
+ "y": 148.00001588463783,
+ "z": "265ff638.5c829a",
"wires": [
[
- "fa9cc521.66a538"
+ "9492e095.18e9e"
]
]
},
{
- "id": "fa9cc521.66a538",
+ "id": "9492e095.18e9e",
"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": 292.3333511352539,
- "y": 247,
- "z": "f5fe05ac.3dbcd8",
+ "x": 281.3372573852539,
+ "y": 235.99999871850014,
+ "z": "265ff638.5c829a",
"wires": [
[
- "9745a419.00eab8"
+ "bff01db2.bf3ae"
]
]
},
{
- "id": "9745a419.00eab8",
+ "id": "bff01db2.bf3ae",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 299.33324432373047,
- "y": 333.0000581741333,
- "z": "f5fe05ac.3dbcd8",
+ "x": 288.33715057373047,
+ "y": 322.00005689263344,
+ "z": "265ff638.5c829a",
"wires": [
[
- "3208e6b7.8cb61a"
+ "2c4f0af0.2c9bc6"
]
]
},
{
- "id": "5e79a667.e36978",
+ "id": "56b3eefc.4b589",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 583.2326469421387,
- "y": 418.0103905200958,
- "z": "f5fe05ac.3dbcd8",
+ "x": 572.2365531921387,
+ "y": 407.01038923859596,
+ "z": "265ff638.5c829a",
"wires": [
[
- "c8ef8603.ded258",
- "de743e37.2d6ef",
- "74590dc6.2a74a4",
- "24b13d58.52ec12",
- "c43795e3.062a98",
- "575ca25e.3b0f5c",
- "e5fd35dc.3490a8",
- "6a33fd1e.0f98c4",
- "f22f3b86.1d2998",
- "c6929deb.bb79b"
+ "af0a968c.e31848",
+ "b43654ab.9bf6b8",
+ "463d217f.c20ed",
+ "1981a60f.f9705a",
+ "1dceb60d.fa250a",
+ "24fadd39.8f7f62",
+ "32e900b0.3dd2e",
+ "96f3e589.8d0b78",
+ "e97e7430.6a0bf8",
+ "c64e5121.85df6"
]
]
},
{
- "id": "c8ef8603.ded258",
+ "id": "af0a968c.e31848",
"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": 777.7332534790039,
- "y": 708.0107636451721,
- "z": "f5fe05ac.3dbcd8",
+ "x": 766.7371597290039,
+ "y": 697.0107623636723,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "74590dc6.2a74a4",
+ "id": "463d217f.c20ed",
"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": 805.7326431274414,
- "y": 345.01042914390564,
- "z": "f5fe05ac.3dbcd8",
+ "x": 794.7365493774414,
+ "y": 334.0104278624058,
+ "z": "265ff638.5c829a",
"wires": [
[
- "beaed204.71603"
+ "3b82cda6.2e9ae2"
]
]
},
{
- "id": "beaed204.71603",
+ "id": "3b82cda6.2e9ae2",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 980.7330360412598,
- "y": 343.01051592826843,
- "z": "f5fe05ac.3dbcd8",
+ "x": 969.7369422912598,
+ "y": 332.01051464676857,
+ "z": "265ff638.5c829a",
"wires": [
[
- "b55ea4ff.9cde28"
+ "5ed3a247.7a0cec"
]
]
},
{
- "id": "b55ea4ff.9cde28",
+ "id": "5ed3a247.7a0cec",
"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": 1155.7331199645996,
- "y": 344.61056327819824,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1144.7370262145996,
+ "y": 333.6105619966984,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "e5fd35dc.3490a8",
+ "id": "32e900b0.3dd2e",
"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": 783.5727691650391,
- "y": 552.0104854106903,
- "z": "f5fe05ac.3dbcd8",
+ "x": 772.5766754150391,
+ "y": 541.0104841291904,
+ "z": "265ff638.5c829a",
"wires": [
[
- "99b2d592.8926d8"
+ "ced8e745.f60e88"
]
]
},
{
- "id": "99b2d592.8926d8",
+ "id": "ced8e745.f60e88",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 976.5727577209473,
- "y": 554.0105578899384,
- "z": "f5fe05ac.3dbcd8",
+ "x": 965.5766639709473,
+ "y": 543.0105566084385,
+ "z": "265ff638.5c829a",
"wires": [
[
- "e0277d38.f11f6"
+ "76785b15.1d0d44"
]
]
},
{
- "id": "e0277d38.f11f6",
+ "id": "76785b15.1d0d44",
"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": 1122.9065856933594,
- "y": 555.4718005657196,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1111.9104919433594,
+ "y": 544.4717992842197,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "575ca25e.3b0f5c",
+ "id": "24fadd39.8f7f62",
"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": 792.6279563903809,
- "y": 510.3871638774872,
- "z": "f5fe05ac.3dbcd8",
+ "x": 781.6318626403809,
+ "y": 499.3871625959873,
+ "z": "265ff638.5c829a",
"wires": [
[
- "e7a176a1.ce4358"
+ "4259d222.74a0ac"
]
]
},
{
- "id": "e7a176a1.ce4358",
+ "id": "4259d222.74a0ac",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 977.6280975341797,
- "y": 510.38712096214294,
- "z": "f5fe05ac.3dbcd8",
+ "x": 966.6320037841797,
+ "y": 499.3871196806431,
+ "z": "265ff638.5c829a",
"wires": [
[
- "d2f3c8c4.499528"
+ "591c9080.263bb"
]
]
},
{
- "id": "d2f3c8c4.499528",
+ "id": "591c9080.263bb",
"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": 1141.9619789123535,
- "y": 511.8483989238739,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1130.9658851623535,
+ "y": 500.84839764237404,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "c43795e3.062a98",
+ "id": "1dceb60d.fa250a",
"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": 798.9610862731934,
- "y": 469.00466132164,
- "z": "f5fe05ac.3dbcd8",
+ "x": 787.9649925231934,
+ "y": 458.00466004014015,
+ "z": "265ff638.5c829a",
"wires": [
[
- "7eda0cd0.bddb34"
+ "490b401c.697cc"
]
]
},
{
- "id": "7eda0cd0.bddb34",
+ "id": "490b401c.697cc",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 980.9611854553223,
- "y": 471.00467467308044,
- "z": "f5fe05ac.3dbcd8",
+ "x": 969.9650917053223,
+ "y": 460.0046733915806,
+ "z": "265ff638.5c829a",
"wires": [
[
- "f1d0b896.8928d8"
+ "57039008.35953"
]
]
},
{
- "id": "f1d0b896.8928d8",
+ "id": "57039008.35953",
"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": 1150.961597442627,
- "y": 469.60469126701355,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1139.965503692627,
+ "y": 458.6046899855137,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "24b13d58.52ec12",
+ "id": "1981a60f.f9705a",
"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": 788.8561058044434,
- "y": 426.9779860973358,
- "z": "f5fe05ac.3dbcd8",
+ "x": 777.8600120544434,
+ "y": 415.97798481583595,
+ "z": "265ff638.5c829a",
"wires": [
[
- "945d6482.e4ba88"
+ "c6df8310.f4453"
]
]
},
{
- "id": "945d6482.e4ba88",
+ "id": "c6df8310.f4453",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 983.8561782836914,
- "y": 427.9780204296112,
- "z": "f5fe05ac.3dbcd8",
+ "x": 972.8600845336914,
+ "y": 416.97801914811134,
+ "z": "265ff638.5c829a",
"wires": [
[
- "51acc9c3.2fe3b8"
+ "2741b1f1.18b52e"
]
]
},
{
- "id": "51acc9c3.2fe3b8",
+ "id": "2741b1f1.18b52e",
"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": 1141.8565788269043,
- "y": 425.57802534103394,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1130.8604850769043,
+ "y": 414.5780240595341,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "de743e37.2d6ef",
+ "id": "b43654ab.9bf6b8",
"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": 789.7319984436035,
- "y": 296.3970763683319,
- "z": "f5fe05ac.3dbcd8",
+ "x": 778.7359046936035,
+ "y": 285.39707508683205,
+ "z": "265ff638.5c829a",
"wires": [
[
- "5d9145a5.3659cc"
+ "f78d38c9.fd9ac8"
]
]
},
{
- "id": "5d9145a5.3659cc",
+ "id": "f78d38c9.fd9ac8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 981.7319221496582,
- "y": 296.3970830440521,
- "z": "f5fe05ac.3dbcd8",
+ "x": 970.7358283996582,
+ "y": 285.39708176255226,
+ "z": "265ff638.5c829a",
"wires": [
[
- "e87eb6bc.61a328"
+ "a7c9579.652f8a8"
]
]
},
{
- "id": "e87eb6bc.61a328",
+ "id": "a7c9579.652f8a8",
"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": 1125.7321891784668,
- "y": 295.99721121788025,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1114.7360954284668,
+ "y": 284.9972099363804,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "6a33fd1e.0f98c4",
+ "id": "96f3e589.8d0b78",
"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": 795.7324638366699,
- "y": 388.0207631587982,
- "z": "f5fe05ac.3dbcd8",
+ "x": 784.7363700866699,
+ "y": 377.02076187729836,
+ "z": "265ff638.5c829a",
"wires": [
[
- "f0a564e5.e03788"
+ "334d8f60.5216"
]
]
},
{
- "id": "f0a564e5.e03788",
+ "id": "334d8f60.5216",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 980.7323989868164,
- "y": 386.02081274986267,
- "z": "f5fe05ac.3dbcd8",
+ "x": 969.7363052368164,
+ "y": 375.0208114683628,
+ "z": "265ff638.5c829a",
"wires": [
[
- "607e93f6.70105c"
+ "c21a46cf.86e348"
]
]
},
{
- "id": "607e93f6.70105c",
+ "id": "c21a46cf.86e348",
"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": 1152.7327842712402,
- "y": 386.6208064556122,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1141.7366905212402,
+ "y": 375.6208051741123,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "f22f3b86.1d2998",
+ "id": "e97e7430.6a0bf8",
"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": 799.0000152587891,
- "y": 596.0000171661377,
- "z": "f5fe05ac.3dbcd8",
+ "x": 788.0039215087891,
+ "y": 585.0000158846378,
+ "z": "265ff638.5c829a",
"wires": [
[
- "e1bc8bda.eb9038"
+ "c1d00fd5.a6813"
]
]
},
{
- "id": "e1bc8bda.eb9038",
+ "id": "c1d00fd5.a6813",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 968.0000286102295,
- "y": 596.0000991821289,
- "z": "f5fe05ac.3dbcd8",
+ "x": 957.0039348602295,
+ "y": 585.000097900629,
+ "z": "265ff638.5c829a",
"wires": [
[
- "d2ef0983.267148"
+ "9738637f.94e19"
]
]
},
{
- "id": "d2ef0983.267148",
+ "id": "9738637f.94e19",
"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": 1126.3338165283203,
- "y": 599.4613151550293,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1115.3377227783203,
+ "y": 588.4613138735294,
+ "z": "265ff638.5c829a",
"wires": []
},
{
- "id": "c6929deb.bb79b",
+ "id": "c64e5121.85df6",
"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": 781,
- "y": 652,
- "z": "f5fe05ac.3dbcd8",
+ "x": 770.00390625,
+ "y": 640.9999987185001,
+ "z": "265ff638.5c829a",
"wires": [
[
- "3b76a25e.db01ce"
+ "a51c3fe9.2f2e3"
]
]
},
{
- "id": "3b76a25e.db01ce",
+ "id": "a51c3fe9.2f2e3",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 973.9999885559082,
- "y": 654.000072479248,
- "z": "f5fe05ac.3dbcd8",
+ "x": 963.0038948059082,
+ "y": 643.0000711977482,
+ "z": "265ff638.5c829a",
"wires": [
[
- "5afdfd4e.d87a04"
+ "f459792e.21f348"
]
]
},
{
- "id": "5afdfd4e.d87a04",
+ "id": "f459792e.21f348",
"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": 1120.3338165283203,
- "y": 655.4613151550293,
- "z": "f5fe05ac.3dbcd8",
+ "x": 1109.3377227783203,
+ "y": 644.4613138735294,
+ "z": "265ff638.5c829a",
"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 21f05ed5..72241740 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 @@ -3,7 +3,7 @@ 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-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">
+ <for index="idx" start="0" end="`$vf-module-request-input.vf-module-input-parameters.param_length`">
<block>
<switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'id'`">
<outcome value='true'>
|