diff options
| author |   prakash.e <prakash.e@huawei.com> | 2019-04-15 19:33:39 +0530 |
|---|---|---|
| committer | prakash.e <prakash.e@huawei.com> | 2019-04-15 19:33:55 +0530 |
| commit | ec2376cfd5d3730a2efd84050c1c13d1faf8156a (patch) | |
| tree | 8c606852ca75a435391ba48bed83051a4b47e88c | |
| parent | 2aeaca1d86cc6a837b186345d69c7858fb79a8af (diff) | |
context-parameter returned to caller DG is not correct
parameter tmp.vidx is used in vpn-activate DG,
updated validate-vpn DG by returning tmp.vidx
inplace of tmp.nidx
Change-Id: I42ddac5eb6384dd01992c2bbb387a3cc14aade54
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: 58a3b6851697cd28042583d6f60a6845694a2f74
2 files changed, 452 insertions, 452 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json index 8a5d8f9e..b0816734 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json @@ -1,20 +1,20 @@ [
{
- "id": "3eca748a.ef817c",
+ "id": "d157ce03.c3288",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 123,
- "y": 75,
- "z": "619b2b0c.b0ac74",
+ "x": 129,
+ "y": 64,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "350fb0d5.88723"
+ "5ddc2216.ec964c"
]
]
},
{
- "id": "350fb0d5.88723",
+ "id": "5ddc2216.ec964c",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1284 +22,1284 @@ "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": 368.2857131958008,
- "y": 74.23807907104492,
- "z": "619b2b0c.b0ac74",
+ "x": 374.2857131958008,
+ "y": 63.23807907104492,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "7fecfee8.d291b"
+ "e97f46cc.0059c8"
]
]
},
{
- "id": "7fecfee8.d291b",
+ "id": "e97f46cc.0059c8",
"type": "method",
"name": "validate-sdwan-vf-vpn-input-parameters",
"xml": "<method rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 451.9166946411133,
- "y": 209.25301837921143,
- "z": "619b2b0c.b0ac74",
+ "x": 457.9166946411133,
+ "y": 198.25301837921143,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "8f6f1f8b.897a9"
+ "94a6ae40.767b3"
]
]
},
{
- "id": "8f6f1f8b.897a9",
+ "id": "94a6ae40.767b3",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 735.9167022705078,
- "y": 197.25304317474365,
- "z": "619b2b0c.b0ac74",
+ "x": 741.9167022705078,
+ "y": 186.25304317474365,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "634b7128.2e84d",
- "adb8eda0.ca986",
- "bc20a4d8.66ea78",
- "376a189c.5eea28"
+ "c1b9af78.ff38c",
+ "5ab8336c.d30a1c",
+ "26ecbd16.18b922",
+ "f0d7fed2.a7f6e"
]
]
},
{
- "id": "634b7128.2e84d",
+ "id": "c1b9af78.ff38c",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 995.916633605957,
- "y": 45.25303936004639,
- "z": "619b2b0c.b0ac74",
+ "x": 1001.916633605957,
+ "y": 34.25303936004639,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "183ac3e9.257bcc"
+ "61401669.5d3bb8"
]
]
},
{
- "id": "183ac3e9.257bcc",
+ "id": "61401669.5d3bb8",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 1186.6309356689453,
- "y": 46.2530403137207,
- "z": "619b2b0c.b0ac74",
+ "x": 1192.6309356689453,
+ "y": 35.2530403137207,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "65be383e.39b058"
+ "8deeb25a.a0c7a"
]
]
},
{
- "id": "65be383e.39b058",
+ "id": "8deeb25a.a0c7a",
"type": "returnFailure",
"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=\"sdnc-request-header.svc-request-id is a required input\" />\n",
"comments": "",
- "x": 1361.0594863891602,
- "y": 45.25303268432617,
- "z": "619b2b0c.b0ac74",
+ "x": 1367.0594863891602,
+ "y": 34.25303268432617,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "adb8eda0.ca986",
+ "id": "5ab8336c.d30a1c",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 332.9166564941406,
- "y": 468.2530336380005,
- "z": "619b2b0c.b0ac74",
+ "x": 338.9166564941406,
+ "y": 457.2530336380005,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "83c4de98.01196",
- "ce7e74f7.3c86c8",
- "147fd5d9.68de3a",
- "1561519f.abda0e",
- "d7c5bf00.510dc"
+ "dd523414.2c6af8",
+ "3ab9ebd9.cb15a4",
+ "748e648b.48faec",
+ "364e12f1.bd272e",
+ "907aa46b.591888"
]
]
},
{
- "id": "83c4de98.01196",
+ "id": "dd523414.2c6af8",
"type": "outcome",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 526.5000228881836,
- "y": 297.66667079925537,
- "z": "619b2b0c.b0ac74",
+ "x": 532.5000228881836,
+ "y": 286.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "363f7231.506cbe"
+ "b695319.fac5ed"
]
]
},
{
- "id": "363f7231.506cbe",
+ "id": "b695319.fac5ed",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 687.5000228881836,
- "y": 297.66667079925537,
- "z": "619b2b0c.b0ac74",
+ "x": 693.5000228881836,
+ "y": 286.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "46be34f.5b2c7cc"
+ "1c93366e.75aada"
]
]
},
{
- "id": "ce7e74f7.3c86c8",
+ "id": "3ab9ebd9.cb15a4",
"type": "outcome",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 499.4920120239258,
- "y": 906.428539276123,
- "z": "619b2b0c.b0ac74",
+ "x": 505.4920120239258,
+ "y": 895.428539276123,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "aec7db3f.798358"
+ "c38c9ea7.d32c"
]
]
},
{
- "id": "147fd5d9.68de3a",
+ "id": "748e648b.48faec",
"type": "outcome",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 503.20639419555664,
- "y": 1077.1430969238281,
- "z": "619b2b0c.b0ac74",
+ "x": 509.20639419555664,
+ "y": 1066.1430969238281,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "c7708172.24701"
+ "cfdfa9d2.e72008"
]
]
},
{
- "id": "1561519f.abda0e",
+ "id": "364e12f1.bd272e",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 502.9682846069336,
- "y": 1250.571382522583,
- "z": "619b2b0c.b0ac74",
+ "x": 508.9682846069336,
+ "y": 1239.571382522583,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "b6252f6e.c1321"
+ "1c142ebe.8cdf21"
]
]
},
{
- "id": "b6252f6e.c1321",
+ "id": "1c142ebe.8cdf21",
"type": "returnFailure",
"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=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
"comments": "",
- "x": 686.5398178100586,
- "y": 1251.190523147583,
- "z": "619b2b0c.b0ac74",
+ "x": 692.5398178100586,
+ "y": 1240.190523147583,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "46be34f.5b2c7cc",
+ "id": "1c93366e.75aada",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 888,
- "y": 295.6666797399521,
- "z": "619b2b0c.b0ac74",
+ "x": 894,
+ "y": 284.6666797399521,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "3528f63.34e230a",
- "82048a2c.348118"
+ "ee1d7ddd.46ad1",
+ "3d1afbf1.1b7e64"
]
]
},
{
- "id": "3528f63.34e230a",
+ "id": "ee1d7ddd.46ad1",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1073.4999923706055,
- "y": 323.66667652130127,
- "z": "619b2b0c.b0ac74",
+ "x": 1079.4999923706055,
+ "y": 312.66667652130127,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "3198409.3ebdec"
+ "efe7d43a.e3e608"
]
]
},
{
- "id": "3198409.3ebdec",
+ "id": "efe7d43a.e3e608",
"type": "returnFailure",
"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=\"request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create\" />\n",
"comments": "",
- "x": 1224.0000228881836,
- "y": 317.66667079925537,
- "z": "619b2b0c.b0ac74",
+ "x": 1230.0000228881836,
+ "y": 306.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "ee1459dc.d090c8",
+ "id": "2418184c.a14ab8",
"type": "other",
"name": "DeleteSDWANVpnInstance",
"xml": "<outcome value='DeleteSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 945.0634384155273,
- "y": 1073.698395729065,
- "z": "619b2b0c.b0ac74",
+ "x": 945.0634078979492,
+ "y": 1062.6983680725098,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "773b0668.3dfda8"
+ "8c2f423e.95a5"
]
]
},
{
- "id": "640b4312.a9c5ac",
+ "id": "ba1e9ce4.084c2",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 860.6189804077148,
- "y": 1149.920636177063,
- "z": "619b2b0c.b0ac74",
+ "x": 866.6189804077148,
+ "y": 1138.920636177063,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "20eafb56.ca5e14"
+ "29217d6f.264c52"
]
]
},
{
- "id": "20eafb56.ca5e14",
+ "id": "29217d6f.264c52",
"type": "returnFailure",
"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=\"request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete\" />\n",
"comments": "",
- "x": 1020.9524002075195,
- "y": 1152.0317735671997,
- "z": "619b2b0c.b0ac74",
+ "x": 1026.9524002075195,
+ "y": 1141.0317735671997,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "773b0668.3dfda8",
+ "id": "8c2f423e.95a5",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1168.9523086547852,
- "y": 1079.9206190109253,
- "z": "619b2b0c.b0ac74",
+ "x": 1174.9523086547852,
+ "y": 1068.9206190109253,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "30507c3b.465aa4",
- "b4bebf6c.2b4fa",
- "b3df3a7b.216bd8",
- "eb92e3d.8a6ff2"
+ "5a51c09f.0dc8a",
+ "dac4a6bf.88b598",
+ "607c6dc9.f58224",
+ "5f5b8df.a6d8d74"
]
]
},
{
- "id": "d7c5bf00.510dc",
+ "id": "907aa46b.591888",
"type": "outcome",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 520.4285774230957,
- "y": 560.7143135070801,
- "z": "619b2b0c.b0ac74",
+ "x": 526.4285774230957,
+ "y": 549.7143135070801,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "aa89a015.4408d"
+ "eff709e7.55cc68"
]
]
},
{
- "id": "aa89a015.4408d",
+ "id": "eff709e7.55cc68",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 703.2857437133789,
- "y": 557.8571634292603,
- "z": "619b2b0c.b0ac74",
+ "x": 709.2857437133789,
+ "y": 546.8571634292603,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "c1f6d379.b3eef",
- "89075fc5.672ae"
+ "db4e4749.ac5c28",
+ "f7339987.1e66e8"
]
]
},
{
- "id": "c1f6d379.b3eef",
+ "id": "db4e4749.ac5c28",
"type": "other",
"name": "ActivateSDWANVpnInstance",
"xml": "<outcome value='ActivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 956.5000228881836,
- "y": 537.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 962.5000228881836,
+ "y": 526.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "ce665d03.3901d"
+ "90c3027e.ce76e"
]
]
},
{
- "id": "89075fc5.672ae",
+ "id": "f7339987.1e66e8",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 886.5000228881836,
- "y": 577.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 892.5000228881836,
+ "y": 566.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "c6e2911c.5f916"
+ "58df50e9.ec50f"
]
]
},
{
- "id": "c6e2911c.5f916",
+ "id": "58df50e9.ec50f",
"type": "returnFailure",
"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=\"request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate\" />\n",
"comments": "",
- "x": 1044.0000228881836,
- "y": 577.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 1050.0000228881836,
+ "y": 566.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "ce665d03.3901d",
+ "id": "90c3027e.ce76e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1187.5000228881836,
- "y": 537.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 1193.5000228881836,
+ "y": 526.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "b3df3a7b.216bd8",
- "30507c3b.465aa4",
- "b4bebf6c.2b4fa",
- "57bd5824.2497c8"
+ "607c6dc9.f58224",
+ "5a51c09f.0dc8a",
+ "dac4a6bf.88b598",
+ "befd23a0.20fa9"
]
]
},
{
- "id": "c598159a.7423c8",
+ "id": "7d17bd6a.99ffe4",
"type": "other",
"name": "DeactivateSDWANVpnInstance",
"xml": "<outcome value='DeactivateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 942.9206390380859,
- "y": 908.1429328918457,
- "z": "619b2b0c.b0ac74",
+ "x": 948.9206390380859,
+ "y": 897.1429328918457,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "50af0272.e02a9c"
+ "ae97c0e.69b144"
]
]
},
{
- "id": "e01173d7.fe6b9",
+ "id": "754fd131.c0e1d",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 857.9206314086914,
- "y": 977.1429405212402,
- "z": "619b2b0c.b0ac74",
+ "x": 863.9206314086914,
+ "y": 966.1429405212402,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "d14295e9.c68018"
+ "e5085bda.bb5f08"
]
]
},
{
- "id": "d14295e9.c68018",
+ "id": "e5085bda.bb5f08",
"type": "returnFailure",
"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=\"request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate\" />\n",
"comments": "",
- "x": 1038.9206466674805,
- "y": 978.1429405212402,
- "z": "619b2b0c.b0ac74",
+ "x": 1044.9206466674805,
+ "y": 967.1429405212402,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "aec7db3f.798358",
+ "id": "c38c9ea7.d32c",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 679.7776947021484,
- "y": 910.6188039779663,
- "z": "619b2b0c.b0ac74",
+ "x": 685.7776947021484,
+ "y": 899.6188039779663,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "c598159a.7423c8",
- "e01173d7.fe6b9"
+ "7d17bd6a.99ffe4",
+ "754fd131.c0e1d"
]
]
},
{
- "id": "c7708172.24701",
+ "id": "cfdfa9d2.e72008",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
"comments": "",
"outputs": 1,
- "x": 683.5554962158203,
- "y": 1076.9523208141327,
- "z": "619b2b0c.b0ac74",
+ "x": 689.5554962158203,
+ "y": 1065.9523208141327,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "ee1459dc.d090c8",
- "640b4312.a9c5ac"
+ "2418184c.a14ab8",
+ "ba1e9ce4.084c2"
]
]
},
{
- "id": "50af0272.e02a9c",
+ "id": "ae97c0e.69b144",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1202.888786315918,
- "y": 910.9523277282715,
- "z": "619b2b0c.b0ac74",
+ "x": 1208.888786315918,
+ "y": 899.9523277282715,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "30507c3b.465aa4",
- "b4bebf6c.2b4fa",
- "b3df3a7b.216bd8",
- "c2db488a.b105a8"
+ "5a51c09f.0dc8a",
+ "dac4a6bf.88b598",
+ "607c6dc9.f58224",
+ "2fee238f.bd0b7c"
]
]
},
{
- "id": "82048a2c.348118",
+ "id": "3d1afbf1.1b7e64",
"type": "other",
"name": "CreateSDWANVpnInstance",
"xml": "<outcome value='CreateSDWANVpnInstance'>",
"comments": "",
"outputs": 1,
- "x": 1172.499984741211,
- "y": 276.6666679382324,
- "z": "619b2b0c.b0ac74",
+ "x": 1178.499984741211,
+ "y": 265.6666679382324,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "7a0b5551.c75d9c"
+ "13930049.ada58"
]
]
},
{
- "id": "7a0b5551.c75d9c",
+ "id": "13930049.ada58",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1407.49995803833,
- "y": 275.6666679382324,
- "z": "619b2b0c.b0ac74",
+ "x": 1413.49995803833,
+ "y": 264.6666679382324,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "3f52a78f.7ab728"
+ "3daca227.0cf10e"
]
]
},
{
- "id": "3f52a78f.7ab728",
+ "id": "3daca227.0cf10e",
"type": "for",
"name": "for loop i - vpn vf input parameters",
"xml": "<for index=\"i\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
"comments": "",
"outputs": 1,
- "x": 1638.000015258789,
- "y": 276.6666679382324,
- "z": "619b2b0c.b0ac74",
+ "x": 1644.000015258789,
+ "y": 265.6666679382324,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "d37b6b2c.71fb38"
+ "3ad26c2a.a0e034"
]
]
},
{
- "id": "d37b6b2c.71fb38",
+ "id": "3ad26c2a.a0e034",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1846.5000228881836,
- "y": 277.66667079925537,
- "z": "619b2b0c.b0ac74",
+ "x": 1852.5000228881836,
+ "y": 266.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "9ec108e6.32a3b8",
- "a16aa1da.005f3",
- "3a20c40b.dcc4cc"
+ "163fb823.6cab78",
+ "f1bf47ba.b34c38",
+ "c40dcf.883f423"
]
]
},
{
- "id": "9ec108e6.32a3b8",
+ "id": "163fb823.6cab78",
"type": "set",
"name": "clear tmp-data",
"xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
"comments": "",
- "x": 2029.5000228881836,
- "y": 237.66667079925537,
- "z": "619b2b0c.b0ac74",
+ "x": 2035.5000228881836,
+ "y": 226.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "a16aa1da.005f3",
+ "id": "f1bf47ba.b34c38",
"type": "set",
"name": "set tmp-data",
"xml": "<set>\n<parameter name='tmp.name' value=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`\"/>\n",
"comments": "",
- "x": 2024.0000228881836,
- "y": 277.66667079925537,
- "z": "619b2b0c.b0ac74",
+ "x": 2030.0000228881836,
+ "y": 266.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "3a20c40b.dcc4cc",
+ "id": "c40dcf.883f423",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$tmp.name`\">\n",
"comments": "",
"outputs": 1,
- "x": 2024.0000228881836,
- "y": 317.66667079925537,
- "z": "619b2b0c.b0ac74",
+ "x": 2030.0000228881836,
+ "y": 306.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "3280408b.66ab3",
- "63ad3611.30c718",
- "2eab978e.1492a8"
+ "1fcdbe0d.6c0992",
+ "9406085a.835ae8",
+ "bf4803e4.f6139"
]
]
},
{
- "id": "d22ab892.eef718",
+ "id": "4dd6857a.0d98dc",
"type": "switchNode",
"name": "switch value",
"xml": "<switch test=\"`$tmp.value`\">\n",
"comments": "",
"outputs": 1,
- "x": 2484.0001907348633,
- "y": 269.66669142246246,
- "z": "619b2b0c.b0ac74",
+ "x": 2490.0001907348633,
+ "y": 258.66669142246246,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "b07f67fa.6ab208"
+ "e0ccccd6.2db1b"
]
]
},
{
- "id": "2eab978e.1492a8",
+ "id": "bf4803e4.f6139",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2243.500358581543,
- "y": 335.66667902469635,
- "z": "619b2b0c.b0ac74",
+ "x": 2249.500358581543,
+ "y": 324.66667902469635,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "5967794c.72e8b8"
+ "a6c05aa9.168a48"
]
]
},
{
- "id": "5967794c.72e8b8",
+ "id": "a6c05aa9.168a48",
"type": "returnFailure",
"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=\"`'vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
"comments": "",
- "x": 2418.5003623962402,
- "y": 334.66667902469635,
- "z": "619b2b0c.b0ac74",
+ "x": 2424.5003623962402,
+ "y": 323.66667902469635,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "3280408b.66ab3",
+ "id": "1fcdbe0d.6c0992",
"type": "other",
"name": "name",
"xml": "<outcome value='name'>",
"comments": "",
"outputs": 1,
- "x": 2243.500358581543,
- "y": 219.66667330265045,
- "z": "619b2b0c.b0ac74",
+ "x": 2249.500358581543,
+ "y": 208.66667330265045,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "d22ab892.eef718"
+ "4dd6857a.0d98dc"
]
]
},
{
- "id": "63ad3611.30c718",
+ "id": "9406085a.835ae8",
"type": "other",
"name": "topology",
"xml": "<outcome value='topology'>",
"comments": "",
"outputs": 1,
- "x": 2255.500114440918,
- "y": 273.333335518837,
- "z": "619b2b0c.b0ac74",
+ "x": 2261.500114440918,
+ "y": 262.333335518837,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "d22ab892.eef718"
+ "4dd6857a.0d98dc"
]
]
},
{
- "id": "b07f67fa.6ab208",
+ "id": "e0ccccd6.2db1b",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 2627.5001907348633,
- "y": 269.66669142246246,
- "z": "619b2b0c.b0ac74",
+ "x": 2633.5001907348633,
+ "y": 258.66669142246246,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "3ecabf5c.8d652"
+ "641a1c22.3dabc4"
]
]
},
{
- "id": "3ecabf5c.8d652",
+ "id": "641a1c22.3dabc4",
"type": "returnFailure",
"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=\"`'vf-module-request-input.vf-module-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",
"comments": "",
- "x": 2785.5001907348633,
- "y": 269.66669142246246,
- "z": "619b2b0c.b0ac74",
+ "x": 2791.5001907348633,
+ "y": 258.66669142246246,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "b3df3a7b.216bd8",
+ "id": "607c6dc9.f58224",
"type": "switchNode",
"name": "switch service-data.vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1479.3889541625977,
- "y": 576.9999761581421,
- "z": "619b2b0c.b0ac74",
+ "x": 1485.3889541625977,
+ "y": 565.9999761581421,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "37913775.d258a8",
- "8c9e338f.0d83c"
+ "9d62d332.6bdf1",
+ "5cba95a3.c5c61c"
]
]
},
{
- "id": "37913775.d258a8",
+ "id": "9d62d332.6bdf1",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1748.0000228881836,
- "y": 556.666711807251,
- "z": "619b2b0c.b0ac74",
+ "x": 1754.0000228881836,
+ "y": 545.666711807251,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "7c4231f0.9cbb7"
+ "55bf1151.ede2f"
]
]
},
{
- "id": "7c4231f0.9cbb7",
+ "id": "55bf1151.ede2f",
"type": "returnFailure",
"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=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",
"comments": "",
- "x": 1924.0000228881836,
- "y": 557.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 1930.0000228881836,
+ "y": 546.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "8c9e338f.0d83c",
+ "id": "5cba95a3.c5c61c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1726.5000228881836,
- "y": 597.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 1732.5000228881836,
+ "y": 586.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "b6f61e8c.9dd35"
+ "b3715a78.6bb228"
]
]
},
{
- "id": "b6f61e8c.9dd35",
+ "id": "b3715a78.6bb228",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1887.5000228881836,
- "y": 597.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 1893.5000228881836,
+ "y": 586.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "9317c153.6ccad",
- "bdedbaa4.65e588"
+ "c872064f.ab0aa8",
+ "16b4cc33.475d44"
]
]
},
{
- "id": "9317c153.6ccad",
+ "id": "c872064f.ab0aa8",
"type": "for",
"name": "for nidx..service-data.vf-modules.vf-module[]",
"xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 2150.0000228881836,
- "y": 577.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 2156.0000228881836,
+ "y": 566.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "1fade275.78b10e"
+ "88526fe7.19ca5"
]
]
},
{
- "id": "1fade275.78b10e",
+ "id": "88526fe7.19ca5",
"type": "switchNode",
"name": "switch vf-module-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n \n\n",
"comments": "",
"outputs": 1,
- "x": 2436.0000228881836,
- "y": 577.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 2442.0000228881836,
+ "y": 566.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "99a1d82a.9dd8c8"
+ "100a52a1.442c1d"
]
]
},
{
- "id": "99a1d82a.9dd8c8",
+ "id": "100a52a1.442c1d",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2606.5000228881836,
- "y": 577.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 2612.5000228881836,
+ "y": 566.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "39ae6a67.1c8296"
+ "8d9c0c99.1bdcb"
]
]
},
{
- "id": "70e3cfee.6e895",
+ "id": "7051b5d0.a337bc",
"type": "set",
- "name": "set tmp.nidx and ctx.network-data",
- "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\n",
+ "name": "set tmp.vidx and ctx.network-data",
+ "xml": "<set>\n<parameter name='tmp.vidx' value='`$nidx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\n",
"comments": "",
- "x": 3007.50008392334,
- "y": 574.6667140722275,
- "z": "619b2b0c.b0ac74",
+ "x": 3013.50008392334,
+ "y": 563.6667140722275,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "1412cffb.8d463",
+ "id": "683dee11.6434b",
"type": "returnFailure",
"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=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",
"comments": "",
- "x": 2364.0000228881836,
- "y": 617.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 2370.0000228881836,
+ "y": 606.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "fbeeeb3e.43c3b8",
+ "id": "67a62d00.2d4ff4",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 2226.5000228881836,
- "y": 617.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 2232.5000228881836,
+ "y": 606.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "1412cffb.8d463"
+ "683dee11.6434b"
]
]
},
{
- "id": "bdedbaa4.65e588",
+ "id": "16b4cc33.475d44",
"type": "switchNode",
- "name": "switch tmp.nidx ",
- "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+ "name": "switch tmp.vidx ",
+ "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2072.5000228881836,
- "y": 617.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 2078.5000228881836,
+ "y": 606.6666707992554,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "fbeeeb3e.43c3b8"
+ "67a62d00.2d4ff4"
]
]
},
{
- "id": "57bd5824.2497c8",
+ "id": "befd23a0.20fa9",
"type": "switchNode",
"name": "switch network-level-oper-status",
- "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1451.6667098999023,
- "y": 656.5555486679077,
- "z": "619b2b0c.b0ac74",
+ "x": 1457.6667098999023,
+ "y": 645.5555486679077,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "719dd138.28ef4",
- "2dca8a18.a65586"
+ "f546c4ba.29b768",
+ "ad8d6fcc.bfcca"
]
]
},
{
- "id": "719dd138.28ef4",
+ "id": "f546c4ba.29b768",
"type": "outcome",
"name": "outcome Created",
"xml": "<outcome value='Created'>\n",
"comments": "",
"outputs": 1,
- "x": 1748.5001258850098,
- "y": 656.5555467605591,
- "z": "619b2b0c.b0ac74",
+ "x": 1754.5001258850098,
+ "y": 645.5555467605591,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "94e9cf1a.6c399"
+ "72634f47.0cc42"
]
]
},
{
- "id": "2dca8a18.a65586",
+ "id": "ad8d6fcc.bfcca",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1716.5001258850098,
- "y": 696.5555467605591,
- "z": "619b2b0c.b0ac74",
+ "x": 1722.5001258850098,
+ "y": 685.5555467605591,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "2c8432e2.7a0b8e"
+ "28f836e1.3e6b7a"
]
]
},
{
- "id": "2c8432e2.7a0b8e",
+ "id": "28f836e1.3e6b7a",
"type": "returnFailure",
"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=\"`'vf-module is not in appropriate state for activate. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",
"comments": "",
- "x": 1874.0001258850098,
- "y": 696.5555467605591,
- "z": "619b2b0c.b0ac74",
+ "x": 1880.0001258850098,
+ "y": 685.5555467605591,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "b4bebf6c.2b4fa",
+ "id": "dac4a6bf.88b598",
"type": "switchNode",
"name": "switch vf-module-id",
"xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1398.5000228881836,
- "y": 517.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 1404.5000228881836,
+ "y": 506.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "9ad9b806.2c19b8"
+ "a7ac2cab.79df8"
]
]
},
{
- "id": "9ad9b806.2c19b8",
+ "id": "a7ac2cab.79df8",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 1626.5000228881836,
- "y": 517.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 1632.5000228881836,
+ "y": 506.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "b7b28733.f37c08"
+ "b2c9eb9f.8ff438"
]
]
},
{
- "id": "b7b28733.f37c08",
+ "id": "b2c9eb9f.8ff438",
"type": "returnFailure",
"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=\"network-request-input.network-input-parameters.name is a required input\" />\n",
"comments": "",
- "x": 1764.0000228881836,
- "y": 517.6666707992554,
- "z": "619b2b0c.b0ac74",
+ "x": 1770.0000228881836,
+ "y": 506.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "30507c3b.465aa4",
+ "id": "5a51c09f.0dc8a",
"type": "execute",
"name": "execute requiredParameters",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vf-module-topology-operation-input.vf-module-information.vf-module-id\" value=\"$vf-module-topology-operation-input.vf-module-information.vf-module-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1433.0000228881836,
- "y": 477.66667079925537,
- "z": "619b2b0c.b0ac74",
+ "x": 1439.0000228881836,
+ "y": 466.66667079925537,
+ "z": "87aefe66.c6e82",
"wires": [
[]
]
},
{
- "id": "c2db488a.b105a8",
+ "id": "2fee238f.bd0b7c",
"type": "switchNode",
"name": "switch network-level-oper-status",
- "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1479.8332748413086,
- "y": 906.5555257797241,
- "z": "619b2b0c.b0ac74",
+ "x": 1481.8332214355469,
+ "y": 895.555570602417,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "cf4b307b.b1b04",
- "acc49742.fd0df8"
+ "cdf8dd70.c0108",
+ "2de75da0.b5bd52"
]
]
},
{
- "id": "cf4b307b.b1b04",
+ "id": "cdf8dd70.c0108",
"type": "outcome",
"name": "outcome Active",
"xml": "<outcome value='Active'>\n",
"comments": "",
"outputs": 1,
- "x": 1753.166648864746,
- "y": 880.9999837875366,
- "z": "619b2b0c.b0ac74",
+ "x": 1759.166648864746,
+ "y": 869.9999837875366,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "e31a54a2.3ff1f8"
+ "e027e573.24bd48"
]
]
},
{
- "id": "acc49742.fd0df8",
+ "id": "2de75da0.b5bd52",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1723.166648864746,
- "y": 920.9999837875366,
- "z": "619b2b0c.b0ac74",
+ "x": 1729.166648864746,
+ "y": 909.9999837875366,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "bc3125bf.c135a8"
+ "4744b74f.6f4a88"
]
]
},
{
- "id": "bc3125bf.c135a8",
+ "id": "4744b74f.6f4a88",
"type": "returnFailure",
"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=\"`'vf-module is not in appropriate state for deactivate. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n ",
"comments": "",
- "x": 1889.166648864746,
- "y": 922.9999837875366,
- "z": "619b2b0c.b0ac74",
+ "x": 1895.166648864746,
+ "y": 911.9999837875366,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "eb92e3d.8a6ff2",
+ "id": "5f5b8df.a6d8d74",
"type": "switchNode",
"name": "switch network-level-oper-status",
- "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1468.7221908569336,
- "y": 1077.6666097640991,
- "z": "619b2b0c.b0ac74",
+ "x": 1474.7221908569336,
+ "y": 1066.6666097640991,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "4005e1e5.db606",
- "3f0b16e4.30f1ca"
+ "e0e44b44.c9e6c8",
+ "fa9a403f.1ce7e"
]
]
},
{
- "id": "4005e1e5.db606",
+ "id": "e0e44b44.c9e6c8",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 1768.7222518920898,
- "y": 1045.444405555725,
- "z": "619b2b0c.b0ac74",
+ "x": 1774.7222518920898,
+ "y": 1034.444405555725,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "e99f233c.ef676"
+ "21ef3568.35bd5a"
]
]
},
{
- "id": "3f0b16e4.30f1ca",
+ "id": "fa9a403f.1ce7e",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1712.055564880371,
- "y": 1092.1110677719116,
- "z": "619b2b0c.b0ac74",
+ "x": 1718.055564880371,
+ "y": 1081.1110677719116,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "26e244b4.b2362c"
+ "2bc6f464.461d3c"
]
]
},
{
- "id": "26e244b4.b2362c",
+ "id": "2bc6f464.461d3c",
"type": "returnFailure",
"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=\"`'vf-module is not in appropriate state for delete. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",
"comments": "",
- "x": 1878.055564880371,
- "y": 1094.1110677719116,
- "z": "619b2b0c.b0ac74",
+ "x": 1884.055564880371,
+ "y": 1083.1110677719116,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "94e9cf1a.6c399",
+ "id": "72634f47.0cc42",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1940.5001029968262,
- "y": 657.6666488647461,
- "z": "619b2b0c.b0ac74",
+ "x": 1946.5001029968262,
+ "y": 646.6666488647461,
+ "z": "87aefe66.c6e82",
"wires": [
[]
]
},
{
- "id": "e31a54a2.3ff1f8",
+ "id": "e027e573.24bd48",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1953.1665267944336,
- "y": 879.1481161117554,
- "z": "619b2b0c.b0ac74",
+ "x": 1959.1665267944336,
+ "y": 868.1481161117554,
+ "z": "87aefe66.c6e82",
"wires": [
[]
]
},
{
- "id": "e99f233c.ef676",
+ "id": "21ef3568.35bd5a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1984.277732849121,
- "y": 1045.8147420883179,
- "z": "619b2b0c.b0ac74",
+ "x": 1990.277732849121,
+ "y": 1034.8147420883179,
+ "z": "87aefe66.c6e82",
"wires": [
[]
]
},
{
- "id": "39ae6a67.1c8296",
+ "id": "8d9c0c99.1bdcb",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2756.666534423828,
- "y": 574.0000190734863,
- "z": "619b2b0c.b0ac74",
+ "x": 2762.666534423828,
+ "y": 563.0000190734863,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "70e3cfee.6e895"
+ "7051b5d0.a337bc"
]
]
},
{
- "id": "bc20a4d8.66ea78",
+ "id": "26ecbd16.18b922",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 971.0065307617188,
- "y": 121.24849605560303,
- "z": "619b2b0c.b0ac74",
+ "x": 977.0065307617188,
+ "y": 110.24849605560303,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "ae64d058.26533"
+ "a795521a.23d6f"
]
]
},
{
- "id": "ae64d058.26533",
+ "id": "a795521a.23d6f",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1151.0065116882324,
- "y": 120.24848556518555,
- "z": "619b2b0c.b0ac74",
+ "x": 1157.0065116882324,
+ "y": 109.24848556518555,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "d4c5df8d.2e7e3"
+ "3e0e877f.b04338"
]
]
},
{
- "id": "d4c5df8d.2e7e3",
+ "id": "3e0e877f.b04338",
"type": "returnFailure",
"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=\"vnf entry not found in service-data\" />\n",
"comments": "",
- "x": 1300.4352378845215,
- "y": 121.39140319824219,
- "z": "619b2b0c.b0ac74",
+ "x": 1306.4352378845215,
+ "y": 110.39140319824219,
+ "z": "87aefe66.c6e82",
"wires": []
},
{
- "id": "376a189c.5eea28",
+ "id": "f0d7fed2.a7f6e",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 951.0379104614258,
- "y": 183.51763439178467,
- "z": "619b2b0c.b0ac74",
+ "x": 957.0379104614258,
+ "y": 172.51763439178467,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "891fced5.d7d06"
+ "c781186.35a6de8"
]
]
},
{
- "id": "891fced5.d7d06",
+ "id": "c781186.35a6de8",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 1189.0065269470215,
- "y": 183.2484917640686,
- "z": "619b2b0c.b0ac74",
+ "x": 1195.0065269470215,
+ "y": 172.2484917640686,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "2828372d.9354b8"
+ "3c97bff.ca0c74"
]
]
},
{
- "id": "2828372d.9354b8",
+ "id": "3c97bff.ca0c74",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1404.0065116882324,
- "y": 181.24848556518555,
- "z": "619b2b0c.b0ac74",
+ "x": 1410.0065116882324,
+ "y": 170.24848556518555,
+ "z": "87aefe66.c6e82",
"wires": [
[
- "56c573f0.8eef8c"
+ "daf74faa.b14cc"
]
]
},
{
- "id": "56c573f0.8eef8c",
+ "id": "daf74faa.b14cc",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1568.0065116882324,
- "y": 176.24848556518555,
- "z": "619b2b0c.b0ac74",
+ "x": 1574.0065116882324,
+ "y": 165.24848556518555,
+ "z": "87aefe66.c6e82",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml index de558b80..29b26cd9 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml @@ -122,14 +122,14 @@ <outcome value='true'>
<block atomic="true">
<set>
- <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='tmp.vidx' value='`$nidx`' />
<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
</set>
</block>
</outcome>
</switch>
</for>
- <switch test="`$tmp.nidx`">
+ <switch test="`$tmp.vidx`">
<outcome value=''>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -141,7 +141,7 @@ </block>
</outcome>
</switch>
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
<outcome value='Created'>
<block atomic="true"></block>
</outcome>
@@ -195,14 +195,14 @@ <outcome value='true'>
<block atomic="true">
<set>
- <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='tmp.vidx' value='`$nidx`' />
<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
</set>
</block>
</outcome>
</switch>
</for>
- <switch test="`$tmp.nidx`">
+ <switch test="`$tmp.vidx`">
<outcome value=''>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -214,7 +214,7 @@ </block>
</outcome>
</switch>
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
<outcome value='Active'>
<block atomic="true"></block>
</outcome>
@@ -268,14 +268,14 @@ <outcome value='true'>
<block atomic="true">
<set>
- <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='tmp.vidx' value='`$nidx`' />
<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />
</set>
</block>
</outcome>
</switch>
</for>
- <switch test="`$tmp.nidx`">
+ <switch test="`$tmp.vidx`">
<outcome value=''>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -287,7 +287,7 @@ </block>
</outcome>
</switch>
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>
+ <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>
<outcome value='PendingDelete'>
<block atomic="true"></block>
</outcome>
|