diff options
| author |   prakash.e <prakash.e@huawei.com> | 2019-04-22 19:30:15 +0530 |
|---|---|---|
| committer | prakash eswaramoorthy <prakash.e@huawei.com> | 2019-04-22 14:04:16 +0000 |
| commit | 6dc5ce9c89335ae0d1ad0760fa3e9183289bd26a (patch) | |
| tree | 0fde891cf9338e5a140dd1e868610c18378a3599 /platform-logic/generic-resource-api/src/main | |
| parent | 06abcca9f01e4508efd5839612190f4df2713752 (diff) | |
SDWAN vpn-create DG reoptimized
Removed duplicate nodes to fetch vnf-id from
service-data where it is present in both validate
input parameter DG and vpn-create DG
Change-Id: I2188f040b199f9f986a80855f7164a015eff835d
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: 92753192dce9d0f526c0ddf79b3c5de6f05721e4
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
2 files changed, 187 insertions, 309 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json index 475c093d..58dcb220 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json @@ -1,37 +1,35 @@ [
{
- "id": "2464f2e7.0e2fce",
+ "id": "86705660.0abdc8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 450.00390625,
- "y": 347.0000014305115,
- "z": "4e5f9446.b42e3c",
+ "x": 476.00390625,
+ "y": 401.9999997615814,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "32c4b65c.2d59aa",
- "5509b148.13914",
- "aad7e68e.3b6ca8",
- "94574a55.b19c88",
- "7de1d3e.65c652c",
- "7b54ca79.4bc724",
- "e23c49d7.715338",
- "a50b2df2.ad39e",
- "e9af352a.620918",
- "bbeb53a3.c2576",
- "37a48c20.31bdf4",
- "c012bd48.a280b",
- "3e34e572.c1fb4a",
- "83fb72db.90602",
- "370a2393.20ff3c"
+ "33a55b62.a48504",
+ "c9956259.20d27",
+ "92e109fc.d487c8",
+ "fa6a2af9.45d408",
+ "96b8a138.b9de9",
+ "1072d79c.c97df8",
+ "7fb4c42e.fff1cc",
+ "8252c529.c8dc08",
+ "d1676675.1b3088",
+ "80911d80.565f6",
+ "f1c0f2fa.5d8e8",
+ "69439d08.c30934",
+ "a6352f7.5aa86d"
]
]
},
{
- "id": "4af2ac42.490d34",
+ "id": "4414eba1.be7024",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -39,614 +37,512 @@ "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": 292.00392150878906,
- "y": 130.99999284744263,
- "z": "4e5f9446.b42e3c",
+ "x": 318.00392150878906,
+ "y": 185.99999117851257,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "5b6c766c.98d2a8"
+ "665e6349.0f20bc"
]
]
},
{
- "id": "5b6c766c.98d2a8",
+ "id": "665e6349.0f20bc",
"type": "method",
"name": "sdwan-vf-operation-vpn-create",
"xml": "<method rpc='sdwan-vf-operation-vpn-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 291.00392150878906,
- "y": 230.99999284744263,
- "z": "4e5f9446.b42e3c",
+ "x": 317.00392150878906,
+ "y": 285.9999911785126,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "2464f2e7.0e2fce"
+ "86705660.0abdc8"
]
]
},
{
- "id": "4418c0ab.c80bf",
+ "id": "c5e65dcf.93a1d",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 121.50392150878906,
- "y": 42.00000047683716,
- "z": "4e5f9446.b42e3c",
+ "x": 147.50392150878906,
+ "y": 96.9999988079071,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "4af2ac42.490d34"
+ "4414eba1.be7024"
]
]
},
{
- "id": "32c4b65c.2d59aa",
- "type": "for",
- "name": "for each vnf",
- "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
- "comments": "",
- "outputs": 1,
- "x": 750.3333282470703,
- "y": 238.4961256980896,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "3161e290.49fc4e"
- ]
- ]
- },
- {
- "id": "3161e290.49fc4e",
- "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": 1002.3334197998047,
- "y": 237.16278886795044,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "5b45671f.cd82a8"
- ]
- ]
- },
- {
- "id": "e5b08bcc.460cf8",
- "type": "set",
- "name": "set vnf-index",
- "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n\n",
- "comments": "",
- "x": 1373.9999084472656,
- "y": 239.1627917289734,
- "z": "4e5f9446.b42e3c",
- "wires": []
- },
- {
- "id": "5b45671f.cd82a8",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1220.6667366027832,
- "y": 239.16277074813843,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "e5b08bcc.460cf8"
- ]
- ]
- },
- {
- "id": "94574a55.b19c88",
+ "id": "c9956259.20d27",
"type": "for",
"name": "for loop idx - VF input parameters",
"xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 824.2541122436523,
- "y": 460.6666588783264,
- "z": "4e5f9446.b42e3c",
+ "x": 851.2541379928589,
+ "y": 410.66667890548706,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "213647dd.26e428"
+ "5f7e52d8.71003c"
]
]
},
{
- "id": "213647dd.26e428",
+ "id": "5f7e52d8.71003c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1039.032455444336,
- "y": 458.22224283218384,
- "z": "4e5f9446.b42e3c",
+ "x": 1066.0324811935425,
+ "y": 408.2222628593445,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "501e761.bc5eb88",
- "76a61aa5.aca9e4"
+ "b5888647.1272c8",
+ "f88a8224.ffbd4"
]
]
},
{
- "id": "501e761.bc5eb88",
+ "id": "b5888647.1272c8",
"type": "execute",
"name": "execute split parameterName",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1235.2886581420898,
- "y": 435.9703812599182,
- "z": "4e5f9446.b42e3c",
+ "x": 1262.2886838912964,
+ "y": 385.97040128707886,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
},
{
- "id": "76a61aa5.aca9e4",
+ "id": "f88a8224.ffbd4",
"type": "set",
"name": "set parameterName",
"xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
"comments": "",
- "x": 1204.7330856323242,
- "y": 472.9704976081848,
- "z": "4e5f9446.b42e3c",
+ "x": 1231.7331113815308,
+ "y": 422.97051763534546,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "801b9de7.f8983",
+ "id": "84649b93.490df8",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 1208.2543144226074,
- "y": 395.333327293396,
- "z": "4e5f9446.b42e3c",
- "wires": []
- },
- {
- "id": "5509b148.13914",
- "type": "switchNode",
- "name": "switch vnf_length",
- "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
- "comments": "",
- "outputs": 1,
- "x": 764.7539215087891,
- "y": 193.99999475479126,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "1afa6ba0.b560d4"
- ]
- ]
- },
- {
- "id": "1afa6ba0.b560d4",
- "type": "other",
- "name": "NULL",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 951.4206008911133,
- "y": 193.33329248428345,
- "z": "4e5f9446.b42e3c",
- "wires": [
- [
- "f6ded972.6369c8"
- ]
- ]
- },
- {
- "id": "f6ded972.6369c8",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",
- "comments": "",
- "x": 1133.0872268676758,
- "y": 193.33329248428345,
- "z": "4e5f9446.b42e3c",
+ "x": 1235.254340171814,
+ "y": 345.33334732055664,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "aad7e68e.3b6ca8",
+ "id": "33a55b62.a48504",
"type": "switchNode",
"name": "switch 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": 806.0039110183716,
- "y": 313.9999957084656,
- "z": "4e5f9446.b42e3c",
+ "x": 833.0039367675781,
+ "y": 264.0000157356262,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "e139df7a.80637",
- "caf10502.734168"
+ "5e528a3d.403a94",
+ "e1430919.889a48"
]
]
},
{
- "id": "e139df7a.80637",
+ "id": "5e528a3d.403a94",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1037.003921508789,
- "y": 289.9999928474426,
- "z": "4e5f9446.b42e3c",
+ "x": 1064.0039472579956,
+ "y": 240.00001287460327,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "b4a2933f.20169"
+ "d1fe70de.0d5a2"
]
]
},
{
- "id": "caf10502.734168",
+ "id": "e1430919.889a48",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1037.003921508789,
- "y": 329.9999928474426,
- "z": "4e5f9446.b42e3c",
+ "x": 1064.0039472579956,
+ "y": 280.00001287460327,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "63770f1.c37c1f"
+ "550ac6cc.1a43f8"
]
]
},
{
- "id": "b4a2933f.20169",
+ "id": "d1fe70de.0d5a2",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='0' />\n",
"comments": "",
- "x": 1179.503921508789,
- "y": 289.9999928474426,
- "z": "4e5f9446.b42e3c",
+ "x": 1206.5039472579956,
+ "y": 240.00001287460327,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "63770f1.c37c1f",
+ "id": "550ac6cc.1a43f8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1181.3609657287598,
- "y": 329.93650484085083,
- "z": "4e5f9446.b42e3c",
+ "x": 1208.3609914779663,
+ "y": 279.9365248680115,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "82e73ea.9f6d1c",
- "facab090.c3497"
+ "2b30e41b.b2df2c",
+ "735539ef.d045e8"
]
]
},
{
- "id": "facab090.c3497",
+ "id": "735539ef.d045e8",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
"comments": "",
- "x": 1334.059440612793,
- "y": 299.55560353351757,
- "z": "4e5f9446.b42e3c",
+ "x": 1361.0594663619995,
+ "y": 249.5556235606782,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "82e73ea.9f6d1c",
+ "id": "2b30e41b.b2df2c",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
"comments": "",
"outputs": 1,
- "x": 1390.4879455566406,
- "y": 352.77773332595825,
- "z": "4e5f9446.b42e3c",
+ "x": 1417.4879713058472,
+ "y": 302.7777533531189,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "df7833b0.b66c4"
+ "e7001097.30f29"
]
]
},
{
- "id": "f1cb1fc.e0fb2e",
+ "id": "87bb5bc0.359988",
"type": "comment",
"name": "make sure this network doesn't exist already",
"info": "",
"comments": "",
- "x": 1614.1386756896973,
- "y": 311.0317907333374,
- "z": "4e5f9446.b42e3c",
+ "x": 1641.1387014389038,
+ "y": 261.03181076049805,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "df7833b0.b66c4",
+ "id": "e7001097.30f29",
"type": "switchNode",
"name": "switch vf-module-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1665.773666381836,
- "y": 352.3492360115051,
- "z": "4e5f9446.b42e3c",
+ "x": 1692.7736921310425,
+ "y": 302.34925603866577,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "f0bc8641.c01b88"
+ "c77c794f.c68788"
]
]
},
{
- "id": "f0bc8641.c01b88",
+ "id": "c77c794f.c68788",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1566.50386428833,
- "y": 410.92066717147827,
- "z": "4e5f9446.b42e3c",
+ "x": 1593.5038900375366,
+ "y": 360.9206871986389,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "ac9ea707.076ba8"
+ "1ae23876.21a108"
]
]
},
{
- "id": "ac9ea707.076ba8",
+ "id": "1ae23876.21a108",
"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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
"comments": "",
- "x": 1714.2539672851562,
- "y": 410.7778592403047,
- "z": "4e5f9446.b42e3c",
+ "x": 1741.2539930343628,
+ "y": 360.7778792674653,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "a50b2df2.ad39e",
+ "id": "1072d79c.c97df8",
"type": "set",
"name": "copy input data to service data",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n\n",
"comments": "",
- "x": 819.8571014404297,
- "y": 763.4962468147278,
- "z": "4e5f9446.b42e3c",
+ "x": 846.8571271896362,
+ "y": 713.4962668418884,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "e23c49d7.715338",
+ "id": "96b8a138.b9de9",
"type": "execute",
"name": "execute generate-vf-module-index",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",
"comments": "",
"outputs": 1,
- "x": 831.190673828125,
- "y": 716.1629490852356,
- "z": "4e5f9446.b42e3c",
+ "x": 858.1906995773315,
+ "y": 666.1629691123962,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
},
{
- "id": "7b54ca79.4bc724",
+ "id": "fa6a2af9.45d408",
"type": "set",
"name": "set new vf-module_length",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
"comments": "",
- "x": 803.1907348632812,
- "y": 667.1629490852356,
- "z": "4e5f9446.b42e3c",
+ "x": 830.1907606124878,
+ "y": 617.1629691123962,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "7de1d3e.65c652c",
+ "id": "92e109fc.d487c8",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
"comments": "",
- "x": 803.1902618408203,
- "y": 613.1542372703552,
- "z": "4e5f9446.b42e3c",
+ "x": 830.1902875900269,
+ "y": 563.1542572975159,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "e9af352a.620918",
+ "id": "7fb4c42e.fff1cc",
"type": "set",
"name": "set vf-module-level-oper-status",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action' value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
"comments": "",
- "x": 813.5040893554688,
- "y": 861.0000678896904,
- "z": "4e5f9446.b42e3c",
+ "x": 840.5041151046753,
+ "y": 811.000087916851,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "83fb72db.90602",
+ "id": "69439d08.c30934",
"type": "save",
"name": "save sdwan vpn resource in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n key='sdwan-vpn.sdwan-vpn-id = $prop.vpn-vf-index' >\n<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />\n<parameter name='sdwan-vpn-name' value='`$prop.name`' />\n<parameter name='topology' value='`$prop.topology`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` \" />\n",
"comments": "",
"outputs": 1,
- "x": 820.0039501190186,
- "y": 906.5000157356262,
- "z": "4e5f9446.b42e3c",
+ "x": 847.0039758682251,
+ "y": 856.5000357627869,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
},
{
- "id": "bbeb53a3.c2576",
+ "id": "8252c529.c8dc08",
"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": 767.7264232635498,
- "y": 999.673906326294,
- "z": "4e5f9446.b42e3c",
+ "x": 794.7264490127563,
+ "y": 949.6739263534546,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "37a48c20.31bdf4",
+ "id": "d1676675.1b3088",
"type": "for",
"name": "for loop i - Network input parameters",
"xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
"comments": "",
"outputs": 1,
- "x": 831.2578277587891,
- "y": 549.5039067268372,
- "z": "4e5f9446.b42e3c",
+ "x": 858.2578535079956,
+ "y": 499.5039267539978,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "4c79fd81.204e24"
+ "63318660.a4e798"
]
]
},
{
- "id": "4c79fd81.204e24",
+ "id": "63318660.a4e798",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1118.4807052612305,
- "y": 549.7262206077576,
- "z": "4e5f9446.b42e3c",
+ "x": 1145.480731010437,
+ "y": 499.7262406349182,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "6ee57e2b.017f1",
- "6d15949f.a4f72c"
+ "1e3ec759.b2be29",
+ "bfacfb85.875b78"
]
]
},
{
- "id": "6ee57e2b.017f1",
+ "id": "1e3ec759.b2be29",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1306.702548980713,
- "y": 532.0595247745514,
- "z": "4e5f9446.b42e3c",
+ "x": 1333.7025747299194,
+ "y": 482.05954480171204,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "3f65f879.eac058"
+ "4c3c07dc.109bb8"
]
]
},
{
- "id": "6d15949f.a4f72c",
+ "id": "bfacfb85.875b78",
"type": "switchNode",
"name": "switch topology",
"xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",
"comments": "",
"outputs": 1,
- "x": 1317.5422096252441,
- "y": 572.0595228672028,
- "z": "4e5f9446.b42e3c",
+ "x": 1344.5422353744507,
+ "y": 522.0595428943634,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "a2b79be1.ed04c8"
+ "8910bf6.fa8bd4"
]
]
},
{
- "id": "3f65f879.eac058",
+ "id": "4c3c07dc.109bb8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1493.702548980713,
- "y": 528.0595247745514,
- "z": "4e5f9446.b42e3c",
+ "x": 1520.7025747299194,
+ "y": 478.05954480171204,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "2305c57e.8cca7a"
+ "330c74f0.0fa8ac"
]
]
},
{
- "id": "a2b79be1.ed04c8",
+ "id": "8910bf6.fa8bd4",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1487.5422096252441,
- "y": 568.0595228672028,
- "z": "4e5f9446.b42e3c",
+ "x": 1514.5422353744507,
+ "y": 518.0595428943634,
+ "z": "12e5b519.7c42cb",
"wires": [
[
- "4726038d.e1157c"
+ "c760e70.ca63518"
]
]
},
{
- "id": "2305c57e.8cca7a",
+ "id": "330c74f0.0fa8ac",
"type": "set",
"name": "set name",
"xml": "<set>\n<parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n\n",
"comments": "",
- "x": 1643.70267868042,
- "y": 526.6595313549042,
- "z": "4e5f9446.b42e3c",
+ "x": 1670.7027044296265,
+ "y": 476.6595513820648,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "4726038d.e1157c",
+ "id": "c760e70.ca63518",
"type": "set",
"name": "set topology",
"xml": "<set>\n<parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1674.8756504058838,
- "y": 566.5206797122955,
- "z": "4e5f9446.b42e3c",
+ "x": 1701.8756761550903,
+ "y": 516.5206997394562,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "c012bd48.a280b",
+ "id": "80911d80.565f6",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 932.5078277587891,
- "y": 139.00390672683716,
- "z": "4e5f9446.b42e3c",
+ "x": 954.5077972412109,
+ "y": 190.0039086341858,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
},
{
- "id": "3e34e572.c1fb4a",
+ "id": "f1c0f2fa.5d8e8",
"type": "set",
"name": "set vf-module-object-path",
"xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vpn-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
"comments": "",
- "x": 805.5039672851562,
- "y": 812.0312873721123,
- "z": "4e5f9446.b42e3c",
+ "x": 832.5039930343628,
+ "y": 762.0313073992729,
+ "z": "12e5b519.7c42cb",
"wires": []
},
{
- "id": "370a2393.20ff3c",
+ "id": "a6352f7.5aa86d",
"type": "save",
"name": "save service relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 820.0040283203125,
- "y": 954.000156879425,
- "z": "4e5f9446.b42e3c",
+ "x": 847.004054069519,
+ "y": 904.0001769065857,
+ "z": "12e5b519.7c42cb",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml index 02a816bd..360cb476 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml @@ -4,24 +4,6 @@ <method rpc='sdwan-vf-operation-vpn-create' mode='sync'>
<block atomic="true">
<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' ></call>
- <switch test='`$service-data.vnfs.vnf_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="404" />
- <parameter name="error-message" value="There are no VNFs in MD-SAL" />
- </return>
- </outcome>
- </switch>
- <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
- <switch test="`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`">
- <outcome value='true'>
- <set>
- <parameter name='vnf-index' value='`$idx`' />
- </set>
- </outcome>
- </switch>
- </for>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
<outcome value=''>
<set>
|