diff options
Diffstat (limited to 'platform-logic/generic-resource-api/src')
10 files changed, 1560 insertions, 1320 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json index 861a58ae..dfb0b20c 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json @@ -1,38 +1,38 @@ [
{
- "id": "d9c4f19e.fd2e7",
+ "id": "449f76b2.35ecd8",
"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": 672.25390625,
- "y": 347.99999046325684,
- "z": "d0c9a483.09f7c8",
+ "x": 651.00390625,
+ "y": 351.99999046325684,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "cef58dbf.65cb",
- "2919e925.39dec6",
- "e1d6ced2.e1fdf"
+ "398bb19.252604e",
+ "b6d1d1d8.bb9ed",
+ "62a6e293.8703bc"
]
]
},
{
- "id": "f7e66a22.01e028",
+ "id": "3ae00491.8f60fc",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 209.25390243530273,
- "y": 39,
- "z": "d0c9a483.09f7c8",
+ "x": 188.00390243530273,
+ "y": 43,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "c86c7fcc.d57a3"
+ "cd3d997.ba35068"
]
]
},
{
- "id": "c86c7fcc.d57a3",
+ "id": "cd3d997.ba35068",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -40,1879 +40,2064 @@ "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": 278.5396041870117,
- "y": 102.23810958862305,
- "z": "d0c9a483.09f7c8",
+ "x": 257.2896041870117,
+ "y": 106.23810958862305,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "8a66936c.4ecc5"
+ "42625ee9.60cf8"
]
]
},
{
- "id": "8a66936c.4ecc5",
+ "id": "42625ee9.60cf8",
"type": "method",
"name": "method sdwan-vf-operation-lanport-activate",
"xml": "<method rpc='sdwan-vf-operation-lanport-activate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 290.25389862060547,
- "y": 196.58634185791016,
- "z": "d0c9a483.09f7c8",
+ "x": 269.00389862060547,
+ "y": 200.58634185791016,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "b4cb95ed.cde538"
+ "3ec2bae1.a772e6"
]
]
},
{
- "id": "b4cb95ed.cde538",
+ "id": "3ec2bae1.a772e6",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 290.92057037353516,
- "y": 452.666708946228,
- "z": "d0c9a483.09f7c8",
- "wires": [
- [
- "f3bcc30.03c554",
- "ac79d525.fd1fd8",
- "d9c4f19e.fd2e7",
- "1bfdbcc3.c7cd93",
- "6e8941e2.a043c",
- "901afcf1.d22f3",
- "ef04791b.55e268",
- "8364ef5f.25f26",
- "6278217c.89959",
- "760751d.6fd76b",
- "cd4a9b23.d614c8",
- "44113153.ffa83",
- "b05dede5.e0278",
- "45f5fb20.78ea64",
- "b07fc696.74dd68",
- "8fa1111d.08c36",
- "a897b863.5cfc78",
- "9bf6789f.a0ec08",
- "537766b1.131458",
- "8ffe71d6.e37e5",
- "b5fcdf55.56396",
- "695214fd.2c4fdc",
- "188a2b9c.34d5e4"
- ]
- ]
- },
- {
- "id": "ac79d525.fd1fd8",
+ "x": 269.67057037353516,
+ "y": 456.666708946228,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ [
+ "788af4bb.4d81cc",
+ "1b2b5acf.fbd5d5",
+ "449f76b2.35ecd8",
+ "9c153d6a.4cf43",
+ "46f7cea6.503f1",
+ "fcbf2fc7.b018d",
+ "505ed63f.24baa8",
+ "94404e6f.e8fde",
+ "16a0b0ad.e2c3df",
+ "e352097b.fa56f8",
+ "ea89a3cd.96c6c",
+ "b4355150.f8381",
+ "23f60fe.f5fa6f",
+ "9f914b2c.f63948",
+ "3174dd24.ba8ab2",
+ "455e901d.d7497",
+ "41672a48.274fe4",
+ "58693560.f55b6c",
+ "69c506db.344ae8",
+ "3c1e06fc.eec57a",
+ "b87c5ca2.4198d",
+ "13f149d1.1db0a6",
+ "97edc5d7.68c598",
+ "deaed14.de5b43"
+ ]
+ ]
+ },
+ {
+ "id": "1b2b5acf.fbd5d5",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 622.2852630615234,
- "y": 276.2691411972046,
- "z": "d0c9a483.09f7c8",
+ "x": 616.0352668762207,
+ "y": 222.26914596557617,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "8d9e53be.f0301"
+ "7ea5c9a1.849a58"
]
]
},
{
- "id": "f3bcc30.03c554",
+ "id": "788af4bb.4d81cc",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 627.2539176940918,
- "y": 215.00001049041748,
- "z": "d0c9a483.09f7c8",
+ "x": 621.0039215087891,
+ "y": 161.00001525878906,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "193a9775.d88519"
+ "eddbe91d.071158"
]
]
},
{
- "id": "193a9775.d88519",
+ "id": "eddbe91d.071158",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 807.2538986206055,
- "y": 214,
- "z": "d0c9a483.09f7c8",
+ "x": 801.0039024353027,
+ "y": 160.00000476837158,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "4b9a0abb.eb1bb4"
+ "43ffd7ae.190158"
]
]
},
{
- "id": "4b9a0abb.eb1bb4",
+ "id": "43ffd7ae.190158",
"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-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 956.6826248168945,
- "y": 215.14291763305664,
- "z": "d0c9a483.09f7c8",
+ "x": 950.4326286315918,
+ "y": 161.14292240142822,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "8d9e53be.f0301",
+ "id": "7ea5c9a1.849a58",
"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": 845.2539138793945,
- "y": 277.00000619888306,
- "z": "d0c9a483.09f7c8",
+ "x": 839.0039176940918,
+ "y": 223.00001096725464,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "835ec48b.329e88"
+ "63b5b6be.7bb648"
]
]
},
{
- "id": "835ec48b.329e88",
+ "id": "63b5b6be.7bb648",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1060.2538986206055,
- "y": 275,
- "z": "d0c9a483.09f7c8",
+ "x": 1054.0039024353027,
+ "y": 221.00000476837158,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "38760c6e.34c224"
+ "395d7249.60aa0e"
]
]
},
{
- "id": "38760c6e.34c224",
+ "id": "395d7249.60aa0e",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1224.2538986206055,
- "y": 270,
- "z": "d0c9a483.09f7c8",
+ "x": 1218.0039024353027,
+ "y": 216.00000476837158,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "2919e925.39dec6",
+ "id": "b6d1d1d8.bb9ed",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 894.2538986206055,
- "y": 382,
- "z": "d0c9a483.09f7c8",
+ "x": 873.0038986206055,
+ "y": 386,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "4642ed44.17b144"
+ "284a993a.df0816"
]
]
},
{
- "id": "cef58dbf.65cb",
+ "id": "398bb19.252604e",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 899.2538948059082,
- "y": 328.9999990463257,
- "z": "d0c9a483.09f7c8",
+ "x": 878.0038948059082,
+ "y": 332.9999990463257,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "4642ed44.17b144"
+ "284a993a.df0816"
]
]
},
{
- "id": "4642ed44.17b144",
+ "id": "284a993a.df0816",
"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-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 1057.2538986206055,
- "y": 342,
- "z": "d0c9a483.09f7c8",
+ "x": 1036.0038986206055,
+ "y": 346,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "e1d6ced2.e1fdf",
+ "id": "62a6e293.8703bc",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 894.2538986206055,
- "y": 443,
- "z": "d0c9a483.09f7c8",
+ "x": 873.0038986206055,
+ "y": 447,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "1bffa38f.f0c50c"
+ "f366b8b5.961cc8"
]
]
},
{
- "id": "3daf6135.38733e",
+ "id": "cb04cf04.061eb",
"type": "set",
"name": "set vf-module_length",
"xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
"comments": "",
- "x": 1248.2539138793945,
- "y": 441.0000139474869,
- "z": "d0c9a483.09f7c8",
+ "x": 1227.0039138793945,
+ "y": 445.0000139474869,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "1bffa38f.f0c50c",
+ "id": "f366b8b5.961cc8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1055.2539443969727,
- "y": 439.99999141693115,
- "z": "d0c9a483.09f7c8",
+ "x": 1034.0039443969727,
+ "y": 443.99999141693115,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "3daf6135.38733e",
- "ef25b392.fb9e5"
+ "cb04cf04.061eb",
+ "19000243.abd3ee"
]
]
},
{
- "id": "ef25b392.fb9e5",
+ "id": "19000243.abd3ee",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1267.2538833618164,
- "y": 493.99999046325684,
- "z": "d0c9a483.09f7c8",
+ "x": 1246.0038833618164,
+ "y": 497.99999046325684,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "a5aa4ea3.3a9f8"
+ "7d37972f.257a38"
]
]
},
{
- "id": "a5aa4ea3.3a9f8",
+ "id": "7d37972f.257a38",
"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": 1510.2538986206055,
- "y": 489,
- "z": "d0c9a483.09f7c8",
+ "x": 1489.0038986206055,
+ "y": 493,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "291f40c7.f811f"
+ "377bfea7.613792"
]
]
},
{
- "id": "291f40c7.f811f",
+ "id": "377bfea7.613792",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1708.253927230835,
- "y": 476.0000066757202,
- "z": "d0c9a483.09f7c8",
+ "x": 1687.003927230835,
+ "y": 480.0000066757202,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "62bd116.37066f"
+ "18c55aa5.f966a5"
]
]
},
{
- "id": "62bd116.37066f",
+ "id": "18c55aa5.f966a5",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1860.2538986206055,
- "y": 478,
- "z": "d0c9a483.09f7c8",
+ "x": 1839.0038986206055,
+ "y": 482,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "fceeafa7.b7652",
- "767f5d19.fe3e84",
- "f1e44e3e.f0b3c"
+ "d08221fe.a8a22",
+ "f8638c60.50c2c",
+ "4e4f3655.251b48"
]
]
},
{
- "id": "fceeafa7.b7652",
+ "id": "d08221fe.a8a22",
"type": "set",
"name": "set tmp.vidx and ctx.vnf-data",
"xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
"comments": "",
- "x": 2088.2540130615234,
- "y": 420.00000381469727,
- "z": "d0c9a483.09f7c8",
+ "x": 2067.0040130615234,
+ "y": 424.00000381469727,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "767f5d19.fe3e84",
+ "id": "f8638c60.50c2c",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
"comments": "",
- "x": 2092.2540130615234,
- "y": 474.00000381469727,
- "z": "d0c9a483.09f7c8",
+ "x": 2071.0040130615234,
+ "y": 478.00000381469727,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "1bfdbcc3.c7cd93",
+ "id": "9c153d6a.4cf43",
"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": 606.2540168762207,
- "y": 2089.501151561737,
- "z": "d0c9a483.09f7c8",
+ "x": 585.0040168762207,
+ "y": 2093.501151561737,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "f1e44e3e.f0b3c",
+ "id": "4e4f3655.251b48",
"type": "call",
"name": "call sdwan-get-vf-module-lanport-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2122.7090377807617,
- "y": 525.0104961395264,
- "z": "d0c9a483.09f7c8",
+ "x": 2101.4590377807617,
+ "y": 529.0104961395264,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "aa0d1480.7f1978",
+ "id": "2dd1b5ff.e9de3a",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1379.5080871582031,
- "y": 553.0040807723999,
- "z": "d0c9a483.09f7c8",
+ "x": 1358.2580871582031,
+ "y": 557.0040807723999,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "9ed7ce57.d6ce"
+ "afb4aa7c.d42128"
]
]
},
{
- "id": "1f605289.f2eb7d",
+ "id": "bc24bdbf.b7fae",
"type": "switchNode",
"name": "switch this deviceName == vf-input",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`\">\n",
"comments": "",
"outputs": 1,
- "x": 1450.50830078125,
- "y": 626.0042104721069,
- "z": "d0c9a483.09f7c8",
+ "x": 1429.25830078125,
+ "y": 630.0042104721069,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "b123da61.76e8a8"
+ "3a56a654.531a3a"
]
]
},
{
- "id": "9ed7ce57.d6ce",
+ "id": "afb4aa7c.d42128",
"type": "for",
"name": "for vf-module-input-param length",
"xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1665.5079345703125,
- "y": 555.0041646957397,
- "z": "d0c9a483.09f7c8",
+ "x": 1644.2579345703125,
+ "y": 559.0041646957397,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "f599447.9ac3fb8"
+ "258487d9.bf18e8"
]
]
},
{
- "id": "b123da61.76e8a8",
+ "id": "3a56a654.531a3a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1670.5080242156982,
- "y": 627.0042181015015,
- "z": "d0c9a483.09f7c8",
+ "x": 1649.2580242156982,
+ "y": 631.0042181015015,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "2d7f5405.e9306c"
+ "c2e2f4ae.3e81f8"
]
]
},
{
- "id": "2d7f5405.e9306c",
+ "id": "c2e2f4ae.3e81f8",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1915.5081024169922,
- "y": 627.0041356086731,
- "z": "d0c9a483.09f7c8",
+ "x": 1894.2581024169922,
+ "y": 631.0041356086731,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "faceb28.d0a9d5"
+ "1b295fc8.1fb94"
]
]
},
{
- "id": "faceb28.d0a9d5",
+ "id": "1b295fc8.1fb94",
"type": "switchNode",
"name": "switch deviceId == input vf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`\">\n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 2223.5083770751953,
- "y": 610.0041036605835,
- "z": "d0c9a483.09f7c8",
+ "x": 2202.2583770751953,
+ "y": 614.0041036605835,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "ec659d9d.8002"
+ "35a3cdd9.9a70d2"
]
]
},
{
- "id": "ec659d9d.8002",
+ "id": "35a3cdd9.9a70d2",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2432.508415222168,
- "y": 612.004096031189,
- "z": "d0c9a483.09f7c8",
+ "x": 2411.258415222168,
+ "y": 616.004096031189,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "73ebf520.d1f88c"
+ "219f921f.088efe"
]
]
},
{
- "id": "73ebf520.d1f88c",
+ "id": "219f921f.088efe",
"type": "set",
"name": "set prop.lan.deviceId",
"xml": "<set>\n<parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
"comments": "",
- "x": 2609.5083808898926,
- "y": 608.0042867660522,
- "z": "d0c9a483.09f7c8",
+ "x": 2588.2583808898926,
+ "y": 612.0042867660522,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "6e8941e2.a043c",
+ "id": "46f7cea6.503f1",
"type": "for",
"name": "for service-data.vnfs.vnf_length",
"xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 633.5078125,
- "y": 420.00404262542725,
- "z": "d0c9a483.09f7c8",
+ "x": 612.2578125,
+ "y": 424.00404262542725,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "5c633f8a.ecb75"
+ "8fd527ce.0b2738"
]
]
},
{
- "id": "415f5cb9.3a6e44",
+ "id": "daa35d7b.bbc16",
"type": "switchNode",
"name": "switch ActivateSDWANSiteInstance",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1270.258186340332,
- "y": 737.0039882659912,
- "z": "d0c9a483.09f7c8",
+ "x": 1249.008186340332,
+ "y": 741.0039882659912,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "55fab2c0.18755c"
+ "d9309324.f3584"
]
]
},
{
- "id": "ba32492c.0e54c8",
+ "id": "7a222fcd.73c1e",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 916.2580261230469,
- "y": 704.0040283203125,
- "z": "d0c9a483.09f7c8",
+ "x": 895.0080261230469,
+ "y": 708.0040283203125,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "bd374d2.a7cdcb"
+ "7ba15821.578698"
]
]
},
{
- "id": "b07fc696.74dd68",
+ "id": "3174dd24.ba8ab2",
"type": "for",
"name": "for service-data.vnfs.vnf_length",
"xml": "<for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 667.2578811645508,
- "y": 635.0039081573486,
- "z": "d0c9a483.09f7c8",
+ "x": 646.0078811645508,
+ "y": 639.0039081573486,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "ba32492c.0e54c8"
+ "7a222fcd.73c1e"
]
]
},
{
- "id": "55fab2c0.18755c",
+ "id": "d9309324.f3584",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1492.2581024169922,
- "y": 737.0040698051453,
- "z": "d0c9a483.09f7c8",
+ "x": 1471.0081024169922,
+ "y": 741.0040698051453,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "2d0cb991.e67216"
+ "6e42570c.9e97d8"
]
]
},
{
- "id": "2d0cb991.e67216",
+ "id": "6e42570c.9e97d8",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1573.5081100463867,
- "y": 811.5040712356567,
- "z": "d0c9a483.09f7c8",
+ "x": 1552.2581100463867,
+ "y": 815.5040712356567,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "f98893a0.de7a4"
+ "8eb63937.68f308"
]
]
},
{
- "id": "39ba7083.5ed54",
+ "id": "f89ede9f.dfe34",
"type": "switchNode",
"name": "switch siteId",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`\">\n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 1956.5084686279297,
- "y": 818.5041785240173,
- "z": "d0c9a483.09f7c8",
+ "x": 1935.2584686279297,
+ "y": 822.5041785240173,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "36c8a445.c6055c"
+ "69e745ff.0d272c"
]
]
},
{
- "id": "36c8a445.c6055c",
+ "id": "69e745ff.0d272c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2133.508487701416,
- "y": 821.5040187835693,
- "z": "d0c9a483.09f7c8",
+ "x": 2112.258487701416,
+ "y": 825.5040187835693,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "cb17586e.80dbb8"
+ "f03a8e8e.83fe2"
]
]
},
{
- "id": "cafa7b8b.465778",
+ "id": "dee78c9f.5dd72",
"type": "set",
"name": "set prop.attach.siteId",
"xml": "<set>\n<parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
"comments": "",
- "x": 2517.5089950561523,
- "y": 795.5040702819824,
- "z": "d0c9a483.09f7c8",
+ "x": 2496.2589950561523,
+ "y": 799.5040702819824,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "cb17586e.80dbb8",
+ "id": "f03a8e8e.83fe2",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2292.7586784362793,
- "y": 817.0040588378906,
- "z": "d0c9a483.09f7c8",
+ "x": 2271.5086784362793,
+ "y": 821.0040588378906,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "cafa7b8b.465778",
- "9412ef29.cc029",
- "4b9ca75a.7fc698",
- "2f9763b5.4e87fc"
+ "dee78c9f.5dd72",
+ "43b17553.c7382c",
+ "36d57da.c3bd682",
+ "1a9cf10f.4a8b1f"
]
]
},
{
- "id": "8fa1111d.08c36",
+ "id": "9e2a9762.50d9a8",
"type": "get-resource",
"name": "get-resource esr-thirdparty-sdnc",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
"comments": "",
"outputs": 1,
- "x": 628.2578277587891,
- "y": 954.5039968490601,
- "z": "d0c9a483.09f7c8",
+ "x": 1930.0078430175781,
+ "y": 1338.5039596557617,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "4a5d401e.8bf8e",
- "1ff4f9b4.f19fb6",
- "8afdb3bf.1d43d"
+ "45a4d258.24544c",
+ "cb543421.e8e548",
+ "f2ddc8f8.67f5b8"
]
]
},
{
- "id": "4a5d401e.8bf8e",
+ "id": "45a4d258.24544c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 872.2578887939453,
- "y": 918.5039968490601,
- "z": "d0c9a483.09f7c8",
+ "x": 2174.0079040527344,
+ "y": 1302.5039596557617,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "ec14c17f.6e2c1"
+ "73860a6b.6e7a64"
]
]
},
{
- "id": "1ff4f9b4.f19fb6",
+ "id": "cb543421.e8e548",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 874.7487716674805,
- "y": 954.0780334472656,
- "z": "d0c9a483.09f7c8",
+ "x": 2176.4987869262695,
+ "y": 1338.0779962539673,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "7501ffb3.13588"
+ "57b80d68.fd6804"
]
]
},
{
- "id": "8afdb3bf.1d43d",
+ "id": "f2ddc8f8.67f5b8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 870.0817794799805,
- "y": 990.4113922119141,
- "z": "d0c9a483.09f7c8",
+ "x": 2171.8317947387695,
+ "y": 1374.4113550186157,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "26b83768.3bb758"
+ "114f2452.7c39bc"
]
]
},
{
- "id": "26b83768.3bb758",
+ "id": "114f2452.7c39bc",
"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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 1023.8542709350586,
- "y": 987.8504791259766,
- "z": "d0c9a483.09f7c8",
+ "x": 2325.6042861938477,
+ "y": 1371.8504419326782,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "7501ffb3.13588",
+ "id": "57b80d68.fd6804",
"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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 1020.3201675415039,
- "y": 952.3637208938599,
- "z": "d0c9a483.09f7c8",
+ "x": 2322.070182800293,
+ "y": 1336.3636837005615,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "ec14c17f.6e2c1",
+ "id": "73860a6b.6e7a64",
"type": "set",
"name": "set controller data",
"xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
"comments": "",
- "x": 1032.757999420166,
- "y": 916.5039367675781,
- "z": "d0c9a483.09f7c8",
+ "x": 2334.508014678955,
+ "y": 1300.5038995742798,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "a897b863.5cfc78",
+ "id": "315d042b.94c54c",
"type": "execute",
"name": "execute RestApiCallNode Get token",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
"comments": "",
"outputs": 1,
- "x": 642.1960601806641,
- "y": 1057.62509059906,
- "z": "d0c9a483.09f7c8",
+ "x": 1943.9460754394531,
+ "y": 1441.6250534057617,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "b99d5bfa.8263b8",
- "3b97c655.fec2fa"
+ "277e96cc.23f53a",
+ "d503dd86.6b851"
]
]
},
{
- "id": "b99d5bfa.8263b8",
+ "id": "277e96cc.23f53a",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 877.1961860656738,
- "y": 1043.6250791549683,
- "z": "d0c9a483.09f7c8",
+ "x": 2178.946201324463,
+ "y": 1427.62504196167,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "da99c661.cc9138"
+ "7b5e2570.2698cc"
]
]
},
{
- "id": "3b97c655.fec2fa",
+ "id": "d503dd86.6b851",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 876.4461860656738,
- "y": 1079.2679862976074,
- "z": "d0c9a483.09f7c8",
+ "x": 2178.196201324463,
+ "y": 1463.267949104309,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "d1dde0a7.dc9a2"
+ "198d65d8.c721ba"
]
]
},
{
- "id": "d1dde0a7.dc9a2",
+ "id": "198d65d8.c721ba",
"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=\"Error executing get token rest api\" />\n",
"comments": "",
- "x": 1025.1961936950684,
- "y": 1080.0180683135986,
- "z": "d0c9a483.09f7c8",
+ "x": 2326.9462089538574,
+ "y": 1464.0180311203003,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "da99c661.cc9138",
+ "id": "7b5e2570.2698cc",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
"comments": "",
- "x": 1019.1961936950684,
- "y": 1042.6250801086426,
- "z": "d0c9a483.09f7c8",
+ "x": 2320.9462089538574,
+ "y": 1426.6250429153442,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "537766b1.131458",
+ "id": "41672a48.274fe4",
"type": "execute",
"name": "execute RestApiCallNode device port create",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"portResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 668.28515625,
- "y": 1209.0782289505005,
- "z": "d0c9a483.09f7c8",
+ "x": 647.03515625,
+ "y": 1213.0782289505005,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "8649541f.c916f8",
- "490b0339.21ab4c"
+ "74d5de9e.64c39",
+ "95bf4540.859768"
]
]
},
{
- "id": "8649541f.c916f8",
+ "id": "74d5de9e.64c39",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 917.2852153778076,
- "y": 1223.0784349441528,
- "z": "d0c9a483.09f7c8",
+ "x": 896.0352153778076,
+ "y": 1227.0784349441528,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "53d53343.edd9cc"
+ "446d7b16.686f54"
]
]
},
{
- "id": "490b0339.21ab4c",
+ "id": "95bf4540.859768",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 917.2852153778076,
- "y": 1185.0782704353333,
- "z": "d0c9a483.09f7c8",
+ "x": 896.0352153778076,
+ "y": 1189.0782704353333,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "bb7e9ee8.bdde5"
+ "5b043775.82b438"
]
]
},
{
- "id": "bb7e9ee8.bdde5",
+ "id": "5b043775.82b438",
"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=\"Error executing Create device port rest api\" />\n",
"comments": "",
- "x": 1061.2855491638184,
- "y": 1184.078269958496,
- "z": "d0c9a483.09f7c8",
+ "x": 1040.0355491638184,
+ "y": 1188.078269958496,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "53d53343.edd9cc",
+ "id": "446d7b16.686f54",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1064.2852268218994,
- "y": 1224.0782737731934,
- "z": "d0c9a483.09f7c8",
+ "x": 1043.0352268218994,
+ "y": 1228.0782737731934,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "901afcf1.d22f3",
+ "id": "fcbf2fc7.b018d",
"type": "set",
"name": "set prop.lan.devicePortId",
"xml": "<set>\n<parameter name='prop.lan.devicePortId' value='`$portResp.success[0].id`' />\n",
"comments": "",
- "x": 610.9424171447754,
- "y": 1262.1794338226318,
- "z": "d0c9a483.09f7c8",
+ "x": 589.6924171447754,
+ "y": 1266.1794338226318,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "44729f10.35f05",
+ "id": "b76fce1f.c41d6",
"type": "comment",
"name": "Create port",
"info": "",
"comments": "",
- "x": 569.9510955810547,
- "y": 1175.522253036499,
- "z": "d0c9a483.09f7c8",
+ "x": 548.7010955810547,
+ "y": 1179.522253036499,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "9bf6789f.a0ec08",
+ "id": "455e901d.d7497",
"type": "call",
"name": "call sdwan-get-tenant-auth",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 616.9510955810547,
- "y": 1124.1886892318726,
- "z": "d0c9a483.09f7c8",
+ "x": 595.7010955810547,
+ "y": 1128.1886892318726,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "eeb61a62.766e08",
+ "id": "4fc0e57c.93c3fc",
"type": "execute",
"name": "execute RestApiCallNode bridge domain create",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-bridge-domain.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/bridge-domains'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"bridgeDomainResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 1090.9354057312012,
- "y": 1304.188857793808,
- "z": "d0c9a483.09f7c8",
+ "x": 1069.6854057312012,
+ "y": 1308.188857793808,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "925721ce.9c9c3",
- "4887b469.84db6c"
+ "fe4c3471.1ff888",
+ "5d7f5544.360c1c"
]
]
},
{
- "id": "925721ce.9c9c3",
+ "id": "fe4c3471.1ff888",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1411.935432434082,
- "y": 1321.1891782283783,
- "z": "d0c9a483.09f7c8",
+ "x": 1390.685432434082,
+ "y": 1325.1891782283783,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "ae68593e.8ba108"
+ "ab1e6271.60b9c"
]
]
},
{
- "id": "4887b469.84db6c",
+ "id": "5d7f5544.360c1c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1414.935459136963,
- "y": 1286.1889598369598,
- "z": "d0c9a483.09f7c8",
+ "x": 1393.685459136963,
+ "y": 1290.1889598369598,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "79f2f146.ca204"
+ "cee492db.e0603"
]
]
},
{
- "id": "79f2f146.ca204",
+ "id": "cee492db.e0603",
"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=\"Error executing Create bridge domain rest api\" />\n",
"comments": "",
- "x": 1617.935848236084,
- "y": 1282.1890671253204,
- "z": "d0c9a483.09f7c8",
+ "x": 1596.685848236084,
+ "y": 1286.1890671253204,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "ae68593e.8ba108",
+ "id": "ab1e6271.60b9c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1618.9354133605957,
- "y": 1317.1889336109161,
- "z": "d0c9a483.09f7c8",
+ "x": 1597.6854133605957,
+ "y": 1321.1889336109161,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "ccce6236.dc74f",
+ "id": "e47a1f03.1d40d",
"type": "comment",
"name": "Create bridge domain",
"info": "",
"comments": "",
- "x": 1034.6012992858887,
- "y": 1270.6330835819244,
- "z": "d0c9a483.09f7c8",
+ "x": 1013.3512992858887,
+ "y": 1274.6330835819244,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "ef04791b.55e268",
+ "id": "505ed63f.24baa8",
"type": "switchNode",
"name": "switch portSwitch",
"xml": "<switch test=\"`$prop.lan.portSwitch == 'layer2-port'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 590.7128715515137,
- "y": 1305.855489730835,
- "z": "d0c9a483.09f7c8",
+ "x": 569.4628715515137,
+ "y": 1309.855489730835,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "c3342bc2.390e38"
+ "f3a0568f.15eb08"
]
]
},
{
- "id": "c3342bc2.390e38",
+ "id": "f3a0568f.15eb08",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 769.7129020690918,
- "y": 1305.966812133789,
- "z": "d0c9a483.09f7c8",
+ "x": 748.4629020690918,
+ "y": 1309.966812133789,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "eeb61a62.766e08"
+ "4fc0e57c.93c3fc"
]
]
},
{
- "id": "8364ef5f.25f26",
+ "id": "94404e6f.e8fde",
"type": "execute",
"name": "execute split ip and mask",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.lan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",
"comments": "",
"outputs": 1,
- "x": 615.2578659057617,
- "y": 1405.7540397644043,
- "z": "d0c9a483.09f7c8",
+ "x": 594.0078659057617,
+ "y": 1409.7540397644043,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "760fe778.7861c8",
- "4e9c561e.4ac8b8"
+ "8f41cbf5.215278",
+ "e159f50d.926278"
]
]
},
{
- "id": "4e9c561e.4ac8b8",
+ "id": "e159f50d.926278",
"type": "failure",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 816.257884979248,
- "y": 1383.7540311813354,
- "z": "d0c9a483.09f7c8",
+ "x": 795.007884979248,
+ "y": 1387.7540311813354,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "3c0ad409.f6e78c"
+ "f5bbd137.51f5f"
]
]
},
{
- "id": "760fe778.7861c8",
+ "id": "8f41cbf5.215278",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 816.2578887939453,
- "y": 1424.7540349960327,
- "z": "d0c9a483.09f7c8",
+ "x": 795.0078887939453,
+ "y": 1428.7540349960327,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "af9e51cb.86f12"
+ "b8b52f84.e55ad"
]
]
},
{
- "id": "3c0ad409.f6e78c",
+ "id": "f5bbd137.51f5f",
"type": "set",
"name": "set ipAddress prefixLength",
"xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",
"comments": "",
- "x": 1013.2579040527344,
- "y": 1381.7540311813354,
- "z": "d0c9a483.09f7c8",
+ "x": 992.0079040527344,
+ "y": 1385.7540311813354,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "af9e51cb.86f12",
+ "id": "b8b52f84.e55ad",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
"comments": "",
- "x": 971.2578964233398,
- "y": 1421.7540340423584,
- "z": "d0c9a483.09f7c8",
+ "x": 950.0078964233398,
+ "y": 1425.7540340423584,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "a9e3f075.4494b",
+ "id": "9835abaa.deb1b8",
"type": "comment",
"name": "Create wan port",
"info": "",
"comments": "",
- "x": 588.2677421569824,
- "y": 1358.7640895843506,
- "z": "d0c9a483.09f7c8",
+ "x": 567.0177421569824,
+ "y": 1362.7640895843506,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "cd240d96.e63a6",
+ "id": "707a08a2.84bfc8",
"type": "comment",
"name": "TODO: split ip/mask",
"info": "",
"comments": "",
- "x": 1012.2675361633301,
- "y": 1343.9343032836914,
- "z": "d0c9a483.09f7c8",
+ "x": 991.0175361633301,
+ "y": 1347.9343032836914,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "8ffe71d6.e37e5",
+ "id": "58693560.f55b6c",
"type": "execute",
"name": "execute RestApiCallNode IPSubnets create",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdlan-ip-subnets.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/ip-subnets'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"lanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 674.0292358398438,
- "y": 1481.8749294281006,
- "z": "d0c9a483.09f7c8",
+ "x": 652.7792358398438,
+ "y": 1485.8749294281006,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "87d7037c.ae081",
- "b63381ea.1d864"
+ "e01d8566.26a208",
+ "b77c647.be67698"
]
]
},
{
- "id": "b63381ea.1d864",
+ "id": "b77c647.be67698",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 943.0292663574219,
- "y": 1468.8749017715454,
- "z": "d0c9a483.09f7c8",
+ "x": 921.7792663574219,
+ "y": 1472.8749017715454,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "594e98d1.fab688"
+ "7b6fdd20.906734"
]
]
},
{
- "id": "87d7037c.ae081",
+ "id": "e01d8566.26a208",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 940.029239654541,
- "y": 1503.8751201629639,
- "z": "d0c9a483.09f7c8",
+ "x": 918.779239654541,
+ "y": 1507.8751201629639,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "5e9af700.a76ce8"
+ "a2642272.8a0b"
]
]
},
{
- "id": "594e98d1.fab688",
+ "id": "7b6fdd20.906734",
"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=\"Error executing Create device port rest api\" />\n",
"comments": "",
- "x": 1096.0296478271484,
- "y": 1464.8751277923584,
- "z": "d0c9a483.09f7c8",
+ "x": 1074.7796478271484,
+ "y": 1468.8751277923584,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "5e9af700.a76ce8",
+ "id": "a2642272.8a0b",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1087.0292205810547,
- "y": 1504.8748760223389,
- "z": "d0c9a483.09f7c8",
+ "x": 1065.7792205810547,
+ "y": 1508.8748760223389,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "4982389d.632728"
+ "e06f7472.e95f98"
]
]
},
{
- "id": "4982389d.632728",
+ "id": "e06f7472.e95f98",
"type": "set",
"name": "set prop.lan.lanPortId",
"xml": "<set>\n<parameter name='prop.lan.lanPortId' value='`lanPortResp.success[0].id`' />\n",
"comments": "",
- "x": 1293.9183235168457,
- "y": 1507.208342552185,
- "z": "d0c9a483.09f7c8",
+ "x": 1272.6683235168457,
+ "y": 1511.208342552185,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "695214fd.2c4fdc",
+ "id": "3c1e06fc.eec57a",
"type": "execute",
"name": "execute RestApiCallNode create vpn topology",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn1Id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 699.5396575927734,
- "y": 1640.333706855774,
- "z": "d0c9a483.09f7c8",
+ "x": 669.2896881103516,
+ "y": 1665.3338165283203,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "d46aab2e.402878",
- "f79fe60.440a918"
+ "5e387a3e.4fd8a4",
+ "e4302470.9e4168"
]
]
},
{
- "id": "f79fe60.440a918",
+ "id": "e4302470.9e4168",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 938.539571762085,
- "y": 1687.333193898201,
- "z": "d0c9a483.09f7c8",
+ "x": 917.289571762085,
+ "y": 1691.333193898201,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "be3a59b0.64c5a8"
+ "1a5d2b85.cc6d14"
]
]
},
{
- "id": "be3a59b0.64c5a8",
+ "id": "1a5d2b85.cc6d14",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1108.5395107269287,
- "y": 1690.333193898201,
- "z": "d0c9a483.09f7c8",
+ "x": 1087.2895107269287,
+ "y": 1694.333193898201,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "cb1060d7.72a6a",
+ "id": "5ab2794a.636098",
"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=\"Error executing Create vpn topology failed\" />\n",
"comments": "",
- "x": 1108.5396327972412,
- "y": 1646.333193898201,
- "z": "d0c9a483.09f7c8",
+ "x": 1087.2896327972412,
+ "y": 1650.333193898201,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "d46aab2e.402878",
+ "id": "5e387a3e.4fd8a4",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 941.5395107269287,
- "y": 1646.333193898201,
- "z": "d0c9a483.09f7c8",
+ "x": 920.2895107269287,
+ "y": 1650.333193898201,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "cb1060d7.72a6a"
+ "5ab2794a.636098"
]
]
},
{
- "id": "b5fcdf55.56396",
+ "id": "69c506db.344ae8",
"type": "execute",
"name": "execute RestApiCallNode create vpn ",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 661.538013458252,
- "y": 1571.8328762054443,
- "z": "d0c9a483.09f7c8",
+ "x": 640.288013458252,
+ "y": 1575.8328762054443,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "1dcea603.d095ca",
- "286fea94.caec26"
+ "e0d8f775.adb548",
+ "1307c84a.e256c8"
]
]
},
{
- "id": "286fea94.caec26",
+ "id": "1307c84a.e256c8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 882.5379161834717,
- "y": 1593.8328419923782,
- "z": "d0c9a483.09f7c8",
+ "x": 861.2879161834717,
+ "y": 1597.8328419923782,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "8857322c.003b2"
+ "845c9ffd.b87b7"
]
]
},
{
- "id": "8857322c.003b2",
+ "id": "845c9ffd.b87b7",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1052.5378551483154,
- "y": 1596.8328419923782,
- "z": "d0c9a483.09f7c8",
+ "x": 1031.2878551483154,
+ "y": 1600.8328419923782,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "94eea86a.175328",
+ "id": "de430292.51fa5",
"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=\"Error executing Create vpn failed\" />\n",
"comments": "",
- "x": 1052.537977218628,
- "y": 1552.8328419923782,
- "z": "d0c9a483.09f7c8",
+ "x": 1031.287977218628,
+ "y": 1556.8328419923782,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "1dcea603.d095ca",
+ "id": "e0d8f775.adb548",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 885.5378551483154,
- "y": 1552.8328419923782,
- "z": "d0c9a483.09f7c8",
+ "x": 864.2878551483154,
+ "y": 1556.8328419923782,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "94eea86a.175328"
+ "de430292.51fa5"
]
]
},
{
- "id": "7ec433f0.4a2dec",
+ "id": "8b10096b.8cb7e8",
"type": "switchNode",
"name": "switch ActivateSDWANVpnInstance",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1248.5398406982422,
- "y": 858.3332567214966,
- "z": "d0c9a483.09f7c8",
+ "x": 1227.2898406982422,
+ "y": 862.3332567214966,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "df6b5755.18ea68"
+ "43a6f166.ec09e"
]
]
},
{
- "id": "bd374d2.a7cdcb",
+ "id": "7ba15821.578698",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1005.8729438781738,
- "y": 787.3333368301392,
- "z": "d0c9a483.09f7c8",
+ "x": 984.6229438781738,
+ "y": 791.3333368301392,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "415f5cb9.3a6e44",
- "7ec433f0.4a2dec"
+ "daa35d7b.bbc16",
+ "8b10096b.8cb7e8"
]
]
},
{
- "id": "df6b5755.18ea68",
+ "id": "43a6f166.ec09e",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1344.2063522338867,
- "y": 932.3333377838135,
- "z": "d0c9a483.09f7c8",
+ "x": 1322.9563522338867,
+ "y": 936.3333377838135,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "a2c862ed.3d8da"
+ "f4ccb599.a134d8"
]
]
},
{
- "id": "a2c862ed.3d8da",
+ "id": "f4ccb599.a134d8",
"type": "for",
"name": "for vf-modules.vf-module_length",
"xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1558.4562377929688,
- "y": 933.8333144187927,
- "z": "d0c9a483.09f7c8",
+ "x": 1537.2062377929688,
+ "y": 937.8333144187927,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "26c3d6b7.9af80a"
+ "f6720c82.39b5d"
]
]
},
{
- "id": "26c3d6b7.9af80a",
+ "id": "f6720c82.39b5d",
"type": "switchNode",
"name": "switch vpn-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`\">\n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 1805.4562759399414,
- "y": 928.8333973884583,
- "z": "d0c9a483.09f7c8",
+ "x": 1784.2062759399414,
+ "y": 932.8333973884583,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "73c96ff0.116a"
+ "460bb48a.240e2c"
]
]
},
{
- "id": "73c96ff0.116a",
+ "id": "460bb48a.240e2c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1956.2062301635742,
- "y": 930.3333129882812,
- "z": "d0c9a483.09f7c8",
+ "x": 1934.9562301635742,
+ "y": 934.3333129882812,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "736b8a4d.4ec784"
+ "ac3fc038.e0007"
]
]
},
{
- "id": "736b8a4d.4ec784",
+ "id": "ac3fc038.e0007",
"type": "set",
"name": "set prop.vpn1Id",
"xml": "<set>\n<parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\n",
"comments": "",
- "x": 2130.2069778442383,
- "y": 930.3333714008331,
- "z": "d0c9a483.09f7c8",
+ "x": 2108.9569778442383,
+ "y": 934.3333714008331,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "9412ef29.cc029",
+ "id": "43b17553.c7382c",
"type": "set",
"name": "Add sites to list and update length",
"xml": "<set>\n<parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
"comments": "",
- "x": 2560.540351867676,
- "y": 836.3333714008331,
- "z": "d0c9a483.09f7c8",
+ "x": 2539.290351867676,
+ "y": 840.3333714008331,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "4b9ca75a.7fc698",
+ "id": "36d57da.c3bd682",
"type": "set",
"name": "Add site attachement to list and update length",
"xml": "<set>\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\n<parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\n<parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",
"comments": "",
- "x": 2591.5402450561523,
- "y": 879.3333377838135,
- "z": "d0c9a483.09f7c8",
+ "x": 2570.2902450561523,
+ "y": 883.3333377838135,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "6278217c.89959",
+ "id": "16a0b0ad.e2c3df",
"type": "set",
"name": "set prop.siteAttachement_length=0",
"xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",
"comments": "",
- "x": 677.5396194458008,
- "y": 584.333330154419,
- "z": "d0c9a483.09f7c8",
+ "x": 656.2896194458008,
+ "y": 588.333330154419,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "f98893a0.de7a4",
+ "id": "8eb63937.68f308",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1790.873275756836,
- "y": 812.3333358764648,
- "z": "d0c9a483.09f7c8",
+ "x": 1769.623275756836,
+ "y": 816.3333358764648,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "39ba7083.5ed54",
- "5110ed96.6f1424",
- "c2809bfd.795218"
+ "f89ede9f.dfe34",
+ "fe16c8cc.020428",
+ "9d46cf63.0dcd9"
]
]
},
{
- "id": "5110ed96.6f1424",
+ "id": "fe16c8cc.020428",
"type": "switchNode",
"name": "switch role",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`\">\n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 1953.2062072753906,
- "y": 743.3333349227905,
- "z": "d0c9a483.09f7c8",
+ "x": 1931.9562072753906,
+ "y": 747.3333349227905,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "1e253f6e.5c04c1"
+ "7b19ac17.f7b154"
]
]
},
{
- "id": "1e253f6e.5c04c1",
+ "id": "7b19ac17.f7b154",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2116.206211090088,
- "y": 738.3333358764648,
- "z": "d0c9a483.09f7c8",
+ "x": 2094.956211090088,
+ "y": 742.3333358764648,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "76558c73.4a9c94"
+ "5fca6bb6.2ad174"
]
]
},
{
- "id": "76558c73.4a9c94",
+ "id": "5fca6bb6.2ad174",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2284.206253051758,
- "y": 732.3333339691162,
- "z": "d0c9a483.09f7c8",
+ "x": 2262.956253051758,
+ "y": 736.3333339691162,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "7fa808fb.9dfb68",
- "74735438.9332ac",
- "138a0f19.6e1331"
+ "fa5fdce5.2309f",
+ "d71b47e7.ba0928",
+ "368fa25d.21f04e"
]
]
},
{
- "id": "74735438.9332ac",
+ "id": "d71b47e7.ba0928",
"type": "switchNode",
"name": "switch sd-wan-edge",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2479.206382751465,
- "y": 693.3333253860474,
- "z": "d0c9a483.09f7c8",
+ "x": 2457.956382751465,
+ "y": 697.3333253860474,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "201641a0.5890ce"
+ "4c9e170f.05bda8"
]
]
},
{
- "id": "7fa808fb.9dfb68",
+ "id": "fa5fdce5.2309f",
"type": "switchNode",
"name": "switch dsvpn-hub",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`\">\n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 2476.2064895629883,
- "y": 748.333340883255,
- "z": "d0c9a483.09f7c8",
+ "x": 2454.9564895629883,
+ "y": 752.333340883255,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "f53ab0a6.6d677"
+ "a41f3558.9efd38"
]
]
},
{
- "id": "69b796c5.6fe848",
+ "id": "8f17f745.17ddb8",
"type": "set",
"name": "set spoke role",
"xml": "<set>\n<parameter name='prop.role' value=\"spoke\" />\n",
"comments": "",
- "x": 2809.2065048217773,
- "y": 687.3333711624146,
- "z": "d0c9a483.09f7c8",
+ "x": 2787.9565048217773,
+ "y": 691.3333711624146,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "861df320.7eae2",
+ "id": "44a0a864.8cd1d8",
"type": "set",
"name": "set hub role",
"xml": "<set>\n<parameter name='prop.role' value=\"hub\" />\n",
"comments": "",
- "x": 2808.2062644958496,
- "y": 742.3333549499512,
- "z": "d0c9a483.09f7c8",
+ "x": 2786.9562644958496,
+ "y": 746.3333549499512,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "201641a0.5890ce",
+ "id": "4c9e170f.05bda8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2649.2063522338867,
- "y": 689,
- "z": "d0c9a483.09f7c8",
+ "x": 2627.9563522338867,
+ "y": 693,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "69b796c5.6fe848"
+ "8f17f745.17ddb8"
]
]
},
{
- "id": "f53ab0a6.6d677",
+ "id": "a41f3558.9efd38",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2653.2063522338867,
- "y": 744,
- "z": "d0c9a483.09f7c8",
+ "x": 2631.9563522338867,
+ "y": 748,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "861df320.7eae2"
+ "44a0a864.8cd1d8"
]
]
},
{
- "id": "188a2b9c.34d5e4",
+ "id": "b87c5ca2.4198d",
"type": "update",
"name": "update SDWAN VPN status to AAI",
- "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />",
+ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \n key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->\n",
"comments": "",
"outputs": 1,
- "x": 661.5708885192871,
- "y": 2008.031280040741,
- "z": "d0c9a483.09f7c8",
+ "x": 640.3208885192871,
+ "y": 2012.031280040741,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "44113153.ffa83",
+ "id": "b4355150.f8381",
"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[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].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[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
"comments": "",
- "x": 658.2059059143066,
- "y": 1951.1261107651517,
- "z": "d0c9a483.09f7c8",
+ "x": 634.9559097290039,
+ "y": 1957.126205444336,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "cd4a9b23.d614c8",
+ "id": "ea89a3cd.96c6c",
"type": "set",
"name": "set vf-module-id and vf-module-object-path",
"xml": "<set>\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 + $vf-module-topology-operation-input.vf-module-information.vf-module-id\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": 692.2059059143066,
- "y": 1902.6261098114774,
- "z": "d0c9a483.09f7c8",
+ "x": 670.9559097290039,
+ "y": 1910.6261444091797,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "760751d.6fd76b",
+ "id": "e352097b.fa56f8",
"type": "set",
"name": "copy input data in service-data",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].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[$tmp.vidx].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[$tmp.vidx].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[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",
"comments": "",
- "x": 656.2058601379395,
- "y": 1854.876064300537,
- "z": "d0c9a483.09f7c8",
+ "x": 634.9558601379395,
+ "y": 1858.876064300537,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "45f5fb20.78ea64",
+ "id": "9f914b2c.f63948",
"type": "set",
"name": "set device PortId to service data",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='devicePortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.devicePortId`' />\n",
"comments": "",
- "x": 662.5709266662598,
- "y": 1748.0314636230469,
- "z": "d0c9a483.09f7c8",
+ "x": 641.3209266662598,
+ "y": 1752.0314636230469,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "b05dede5.e0278",
+ "id": "23f60fe.f5fa6f",
"type": "set",
"name": "set lan PortId to service data",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='lanPortId' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.lan.lanPortId`' />\n",
"comments": "",
- "x": 648.5708503723145,
- "y": 1802.0312767028809,
- "z": "d0c9a483.09f7c8",
+ "x": 627.3208503723145,
+ "y": 1806.0312767028809,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "2f9763b5.4e87fc",
+ "id": "1a9cf10f.4a8b1f",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic21.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"prop.attach.siteId\"/>\n<parameter name=\"field3\" value='`$prop.attach.siteId`'/>\n",
"comments": "",
"outputs": 1,
- "x": 2485.5709915161133,
- "y": 924.5312805175781,
- "z": "d0c9a483.09f7c8",
+ "x": 2464.3209915161133,
+ "y": 928.5312805175781,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "138a0f19.6e1331",
+ "id": "368fa25d.21f04e",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic22.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"set spoke role\"/>\n",
"comments": "",
"outputs": 1,
- "x": 2454.571002960205,
- "y": 655.531247138977,
- "z": "d0c9a483.09f7c8",
+ "x": 2433.321002960205,
+ "y": 659.531247138977,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "c2809bfd.795218",
+ "id": "9d46cf63.0dcd9",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic23.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"param-name\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>\n",
"comments": "",
"outputs": 1,
- "x": 1948.5708541870117,
- "y": 687.53125,
- "z": "d0c9a483.09f7c8",
+ "x": 1927.3208541870117,
+ "y": 691.53125,
+ "z": "a60b8cc5.55e8f",
"wires": [
[]
]
},
{
- "id": "a37e9bab.abd118",
+ "id": "62b5eb93.96f0e4",
"type": "comment",
"name": "**revert the changes",
"info": "",
"comments": "",
- "x": 1349.5708808898926,
- "y": 693.0312824249268,
- "z": "d0c9a483.09f7c8",
+ "x": 1328.3208808898926,
+ "y": 697.0312824249268,
+ "z": "a60b8cc5.55e8f",
"wires": []
},
{
- "id": "4a795886.274f28",
+ "id": "4995fb6d.83aaf4",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`\">\n\n<!--switch test=\"`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\"-->\n",
"comments": "",
"outputs": 1,
- "x": 892.7538909912109,
- "y": 507.25390625,
- "z": "d0c9a483.09f7c8",
+ "x": 871.5038909912109,
+ "y": 511.25390625,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "779d12ab.8187fc"
+ "208d9618.3a993a"
]
]
},
{
- "id": "779d12ab.8187fc",
+ "id": "208d9618.3a993a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 998.75390625,
- "y": 558.25390625,
- "z": "d0c9a483.09f7c8",
+ "x": 977.50390625,
+ "y": 562.25390625,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "e23c505c.41fa2"
+ "fd503aa4.1469a8"
]
]
},
{
- "id": "5c633f8a.ecb75",
+ "id": "8fd527ce.0b2738",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 693.0039138793945,
- "y": 468.0039048194885,
- "z": "d0c9a483.09f7c8",
+ "x": 671.7539138793945,
+ "y": 472.0039048194885,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "4a795886.274f28"
+ "4995fb6d.83aaf4"
]
]
},
{
- "id": "e23c505c.41fa2",
+ "id": "fd503aa4.1469a8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1151.003890991211,
- "y": 555.0039281845093,
- "z": "d0c9a483.09f7c8",
+ "x": 1129.753890991211,
+ "y": 559.0039281845093,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "aa0d1480.7f1978"
+ "2dd1b5ff.e9de3a"
]
]
},
{
- "id": "f599447.9ac3fb8",
+ "id": "258487d9.bf18e8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1894.7539710998535,
- "y": 553.0039119720459,
- "z": "d0c9a483.09f7c8",
+ "x": 1873.5039710998535,
+ "y": 557.0039119720459,
+ "z": "a60b8cc5.55e8f",
"wires": [
[
- "1f605289.f2eb7d"
+ "bc24bdbf.b7fae"
]
]
+ },
+ {
+ "id": "63f09f8.86bc26",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 878.2539176940918,
+ "y": 910.7539704740047,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ [
+ "6c04212d.63f27"
+ ]
+ ]
+ },
+ {
+ "id": "b3737121.de6a3",
+ "type": "not-found",
+ "name": "not-found",
+ "xml": "<outcome value='not-found'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 881.7448844909668,
+ "y": 958.328006118536,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ [
+ "b8053b7f.3dfe58"
+ ]
+ ]
+ },
+ {
+ "id": "b40d4802.cec768",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 877.0778923034668,
+ "y": 999.6613191068172,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ [
+ "11f26c3c.e24064"
+ ]
+ ]
+ },
+ {
+ "id": "b8053b7f.3dfe58",
+ "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+ "comments": "",
+ "x": 1058.3162956237793,
+ "y": 946.6137422025204,
+ "z": "a60b8cc5.55e8f",
+ "wires": []
+ },
+ {
+ "id": "11f26c3c.e24064",
+ "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+ "comments": "",
+ "x": 1064.8504486083984,
+ "y": 995.1005118787289,
+ "z": "a60b8cc5.55e8f",
+ "wires": []
+ },
+ {
+ "id": "b9f93820.627df8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 880.2539901733398,
+ "y": 1053.7540006637573,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ [
+ "ea0a2431.4fcee8"
+ ]
+ ]
+ },
+ {
+ "id": "4b6f89c7.7da458",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 872.5039901733398,
+ "y": 1107.3968839645386,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ [
+ "10698363.0892ad"
+ ]
+ ]
+ },
+ {
+ "id": "ea0a2431.4fcee8",
+ "type": "set",
+ "name": "set token-id",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+ "comments": "",
+ "x": 1030.2539176940918,
+ "y": 1054.7539691925049,
+ "z": "a60b8cc5.55e8f",
+ "wires": []
+ },
+ {
+ "id": "10698363.0892ad",
+ "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=\"Error executing get token rest api\" />\n",
+ "comments": "",
+ "x": 1025.2539901733398,
+ "y": 1107.1469449996948,
+ "z": "a60b8cc5.55e8f",
+ "wires": []
+ },
+ {
+ "id": "6c04212d.63f27",
+ "type": "set",
+ "name": "set controller data",
+ "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
+ "comments": "",
+ "x": 1073.7539978027344,
+ "y": 905.7539749145508,
+ "z": "a60b8cc5.55e8f",
+ "wires": []
+ },
+ {
+ "id": "97edc5d7.68c598",
+ "type": "execute",
+ "name": "execute RestApiCallNode Get token",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 631.2539672851562,
+ "y": 1076.754077911377,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ [
+ "b9f93820.627df8",
+ "4b6f89c7.7da458"
+ ]
+ ]
+ },
+ {
+ "id": "13f149d1.1db0a6",
+ "type": "get-resource",
+ "name": "get-resource esr-thirdparty-sdnc",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 616.254035949707,
+ "y": 957.7539901733398,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ [
+ "63f09f8.86bc26",
+ "b3737121.de6a3",
+ "b40d4802.cec768"
+ ]
+ ]
+ },
+ {
+ "id": "deaed14.de5b43",
+ "type": "execute",
+ "name": "execute Properties",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 631.00390625,
+ "y": 291.50390625,
+ "z": "a60b8cc5.55e8f",
+ "wires": [
+ []
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json index 833563e6..b70f8ce2 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.json @@ -1,6 +1,6 @@ [
{
- "id": "39688a3a.06a796",
+ "id": "f2c51e78.6ee01",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -8,524 +8,526 @@ "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": 265.00390625,
- "y": 145.999990940094,
- "z": "5099ec4c.e95b94",
+ "x": 233.5,
+ "y": 162.99999046325684,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "921891f8.416e5"
+ "e7f78c27.133fa"
]
]
},
{
- "id": "921891f8.416e5",
+ "id": "e7f78c27.133fa",
"type": "method",
"name": "sdwan-vf-operation-site-create",
"xml": "<method rpc='sdwan-vf-operation-site-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 264.00390625,
- "y": 245.999990940094,
- "z": "5099ec4c.e95b94",
+ "x": 232.5,
+ "y": 262.99999046325684,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "22a013b4.ab58dc"
+ "31fa463e.82923a"
]
]
},
{
- "id": "695e0384.f33d9c",
+ "id": "bac9bd77.fe0f",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 94.50390625,
- "y": 56.999998569488525,
- "z": "5099ec4c.e95b94",
+ "x": 85,
+ "y": 68.00000381469727,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "39688a3a.06a796"
+ "f2c51e78.6ee01"
]
]
},
{
- "id": "22a013b4.ab58dc",
+ "id": "31fa463e.82923a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 423.00389099121094,
- "y": 361.99999952316284,
- "z": "5099ec4c.e95b94",
+ "x": 391.49998474121094,
+ "y": 378.9999990463257,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "4325b612.73e1e8",
- "a6c02374.2dca",
- "40ba27b5.057bf8",
- "d6478b6b.a2b888",
- "59e1bfa3.d11e4",
- "1c5585c5.9cdc3a",
- "a7e8dd90.c6661",
- "2f9ca627.c38e7a",
- "40436b2a.16f614",
- "64771e44.2196d",
- "bb863987.8db5d8",
- "462de6d9.81f588"
+ "dda69c6e.0dcdc",
+ "73e90791.30e428",
+ "539f4691.77ee38",
+ "b886ea54.85e0f8",
+ "be0d3540.8ebb28",
+ "788efb60.76f4a4",
+ "154ced05.a101f3",
+ "76dbb250.b292cc",
+ "df7eb194.69b7e",
+ "6868f266.5fe7ec",
+ "e78bb1b3.a529d",
+ "2b07f61e.bf4a1a",
+ "fd37bb03.271ec8",
+ "395e35c1.a6a5fa"
]
]
},
{
- "id": "4325b612.73e1e8",
+ "id": "dda69c6e.0dcdc",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 723.3333129882812,
- "y": 253.49612379074097,
- "z": "5099ec4c.e95b94",
+ "x": 691.8294067382812,
+ "y": 270.4961233139038,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "63fc0005.8f2ee"
+ "e02bea98.6a2108"
]
]
},
{
- "id": "63fc0005.8f2ee",
+ "id": "e02bea98.6a2108",
"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": 975.3334045410156,
- "y": 252.1627869606018,
- "z": "5099ec4c.e95b94",
+ "x": 943.8294982910156,
+ "y": 269.16278648376465,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "c555201.0223fe"
+ "44afa032.ce578"
]
]
},
{
- "id": "6fae689f.7fef88",
+ "id": "c12c2186.d601b",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1346.9998931884766,
- "y": 254.16278982162476,
- "z": "5099ec4c.e95b94",
+ "x": 1315.4959869384766,
+ "y": 271.1627893447876,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "c555201.0223fe",
+ "id": "44afa032.ce578",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1193.6667213439941,
- "y": 254.1627688407898,
- "z": "5099ec4c.e95b94",
+ "x": 1162.1628150939941,
+ "y": 271.16276836395264,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "6fae689f.7fef88"
+ "c12c2186.d601b"
]
]
},
{
- "id": "d6478b6b.a2b888",
+ "id": "b886ea54.85e0f8",
"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": 797.2540969848633,
- "y": 475.6666569709778,
- "z": "5099ec4c.e95b94",
+ "x": 765.7501907348633,
+ "y": 492.6666564941406,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "e10e6c76.58a1d"
+ "d6ac010b.ad6e"
]
]
},
{
- "id": "e10e6c76.58a1d",
+ "id": "d6ac010b.ad6e",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1012.0324401855469,
- "y": 473.2222409248352,
- "z": "5099ec4c.e95b94",
+ "x": 980.5285339355469,
+ "y": 490.22224044799805,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "9a3f095b.53aca8",
- "454b0ff.c77c1f"
+ "265e23d4.36e02c",
+ "e3c83d1b.72db1"
]
]
},
{
- "id": "9a3f095b.53aca8",
+ "id": "265e23d4.36e02c",
"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": 1208.2886428833008,
- "y": 450.9703793525696,
- "z": "5099ec4c.e95b94",
+ "x": 1176.7847366333008,
+ "y": 467.9703788757324,
+ "z": "147f59c8.d7f266",
"wires": [
[]
]
},
{
- "id": "454b0ff.c77c1f",
+ "id": "e3c83d1b.72db1",
"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": 1177.7330703735352,
- "y": 487.9704957008362,
- "z": "5099ec4c.e95b94",
+ "x": 1146.2291641235352,
+ "y": 504.970495223999,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "1b7ed90b.0ee057",
+ "id": "6cbee016.f6042",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 1181.2542991638184,
- "y": 410.33332538604736,
- "z": "5099ec4c.e95b94",
+ "x": 1149.7503929138184,
+ "y": 427.3333249092102,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "a6c02374.2dca",
+ "id": "73e90791.30e428",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 737.75390625,
- "y": 208.99999284744263,
- "z": "5099ec4c.e95b94",
+ "x": 706.25,
+ "y": 225.99999237060547,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "698329a9.119718"
+ "d8c3ff3.9b067"
]
]
},
{
- "id": "698329a9.119718",
+ "id": "d8c3ff3.9b067",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 924.4205856323242,
- "y": 208.33329057693481,
- "z": "5099ec4c.e95b94",
+ "x": 892.9166793823242,
+ "y": 225.33329010009766,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "f31a5878.bf4fd8"
+ "94ec6856.a83cd8"
]
]
},
{
- "id": "f31a5878.bf4fd8",
+ "id": "94ec6856.a83cd8",
"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": 1106.0872116088867,
- "y": 208.33329057693481,
- "z": "5099ec4c.e95b94",
+ "x": 1074.5833053588867,
+ "y": 225.33329010009766,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "40ba27b5.057bf8",
+ "id": "539f4691.77ee38",
"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": 779.0038957595825,
- "y": 328.99999380111694,
- "z": "5099ec4c.e95b94",
+ "x": 747.4999895095825,
+ "y": 345.9999933242798,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "51b4cfc4.d81ec",
- "9cba331b.ccedc"
+ "83439569.31aa38",
+ "bcb4cae0.4f9908"
]
]
},
{
- "id": "51b4cfc4.d81ec",
+ "id": "83439569.31aa38",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1010.00390625,
- "y": 304.999990940094,
- "z": "5099ec4c.e95b94",
+ "x": 978.5,
+ "y": 321.99999046325684,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "3f2cb9e5.051a76"
+ "ba3dff03.8dc24"
]
]
},
{
- "id": "9cba331b.ccedc",
+ "id": "bcb4cae0.4f9908",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1010.00390625,
- "y": 344.999990940094,
- "z": "5099ec4c.e95b94",
+ "x": 978.5,
+ "y": 361.99999046325684,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "e0c33286.cb104"
+ "890fe4fa.c0f128"
]
]
},
{
- "id": "3f2cb9e5.051a76",
+ "id": "ba3dff03.8dc24",
"type": "set",
"name": "set vf-index",
"xml": "<set>\n<parameter name='vf-index' value='0' />\n",
"comments": "",
- "x": 1152.50390625,
- "y": 304.999990940094,
- "z": "5099ec4c.e95b94",
+ "x": 1121,
+ "y": 321.99999046325684,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "e0c33286.cb104",
+ "id": "890fe4fa.c0f128",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1154.3609504699707,
- "y": 344.9365029335022,
- "z": "5099ec4c.e95b94",
+ "x": 1122.8570442199707,
+ "y": 361.93650245666504,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "8b8b9efa.275ce",
- "1791a391.e4fccc"
+ "3895380d.b43d08",
+ "ba2eca23.0f6508"
]
]
},
{
- "id": "1791a391.e4fccc",
+ "id": "ba2eca23.0f6508",
"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": 1307.059425354004,
- "y": 314.55560162616894,
- "z": "5099ec4c.e95b94",
+ "x": 1275.555519104004,
+ "y": 331.5556011493318,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "8b8b9efa.275ce",
+ "id": "3895380d.b43d08",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
"comments": "",
"outputs": 1,
- "x": 1363.4879302978516,
- "y": 367.7777314186096,
- "z": "5099ec4c.e95b94",
+ "x": 1331.9840240478516,
+ "y": 384.77773094177246,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "aaa91538.94bcc8"
+ "8202a636.7f9518"
]
]
},
{
- "id": "bd3d2242.9164e",
+ "id": "51af10a6.1b1e3",
"type": "comment",
"name": "make sure this network doesn't exist already",
"info": "",
"comments": "",
- "x": 1587.1386604309082,
- "y": 326.03178882598877,
- "z": "5099ec4c.e95b94",
+ "x": 1555.6347541809082,
+ "y": 343.0317883491516,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "aaa91538.94bcc8",
+ "id": "8202a636.7f9518",
"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": 1638.7736511230469,
- "y": 367.3492341041565,
- "z": "5099ec4c.e95b94",
+ "x": 1607.2697448730469,
+ "y": 384.34923362731934,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "a84edb80.0d80e8"
+ "ce7e5cca.15004"
]
]
},
{
- "id": "a84edb80.0d80e8",
+ "id": "ce7e5cca.15004",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1539.503849029541,
- "y": 425.92066526412964,
- "z": "5099ec4c.e95b94",
+ "x": 1507.999942779541,
+ "y": 442.9206647872925,
+ "z": "147f59c8.d7f266",
"wires": [
[
- "7ca646fd.066d78"
+ "7c5cfe61.fdc3f"
]
]
},
{
- "id": "7ca646fd.066d78",
+ "id": "7c5cfe61.fdc3f",
"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": 1687.2539520263672,
- "y": 425.77785733295605,
- "z": "5099ec4c.e95b94",
+ "x": 1655.7500457763672,
+ "y": 442.7778568561189,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "40436b2a.16f614",
+ "id": "df7eb194.69b7e",
"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.site-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",
"comments": "",
- "x": 790.8571014404297,
- "y": 755.4962139129639,
- "z": "5099ec4c.e95b94",
+ "x": 759.3531951904297,
+ "y": 772.4962134361267,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "2f9ca627.c38e7a",
+ "id": "76dbb250.b292cc",
"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.site-vf-index\"/>\n",
"comments": "",
"outputs": 1,
- "x": 799.1905975341797,
- "y": 702.1629467010498,
- "z": "5099ec4c.e95b94",
+ "x": 767.6866912841797,
+ "y": 719.1629462242126,
+ "z": "147f59c8.d7f266",
"wires": [
[]
]
},
{
- "id": "a7e8dd90.c6661",
+ "id": "154ced05.a101f3",
"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": 773.1905746459961,
- "y": 648.1628403663635,
- "z": "5099ec4c.e95b94",
+ "x": 741.6866683959961,
+ "y": 665.1628398895264,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "59e1bfa3.d11e4",
+ "id": "be0d3540.8ebb28",
"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": 788.1902351379395,
- "y": 538.1542210578918,
- "z": "5099ec4c.e95b94",
+ "x": 756.6863288879395,
+ "y": 555.1542205810547,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "1c5585c5.9cdc3a",
+ "id": "788efb60.76f4a4",
"type": "call",
"name": "call sdwan-get-vf-module-site-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 804.190544128418,
- "y": 590.154402256012,
- "z": "5099ec4c.e95b94",
+ "x": 772.686637878418,
+ "y": 607.1544017791748,
+ "z": "147f59c8.d7f266",
"wires": [
[]
]
},
{
- "id": "64771e44.2196d",
+ "id": "6868f266.5fe7ec",
"type": "set",
"name": "set vf-module-object-path",
"xml": "<set>\n<parameter name='vf-module-id' value='`$prop.site-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.site-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": 786.0039939880371,
- "y": 806.0000591278076,
- "z": "5099ec4c.e95b94",
+ "x": 754.5000877380371,
+ "y": 823.0000586509705,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "bb863987.8db5d8",
+ "id": "e78bb1b3.a529d",
"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`' />\n",
"comments": "",
- "x": 795.5040130615234,
- "y": 854.9999685287476,
- "z": "5099ec4c.e95b94",
+ "x": 764.0001068115234,
+ "y": 871.9999680519104,
+ "z": "147f59c8.d7f266",
"wires": []
},
{
- "id": "670cd372.9429ec",
+ "id": "fd37bb03.271ec8",
"type": "save",
"name": "save sdwan vpn resource in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n key='site-resource.site-resource-id = $prop.site-vf-index' >\n<parameter name='site-resource-id' value='`$prop.site-vf-index`' />\n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='`$prop.site.type`' />\n<parameter name='role' value='`$prop.site.role`' />\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.site-vf-index + '/vf-module-data/'` \" />",
"comments": "",
"outputs": 1,
- "x": 798.0039482116699,
- "y": 900.4999747276306,
- "z": "5099ec4c.e95b94",
+ "x": 766.5000419616699,
+ "y": 917.4999742507935,
+ "z": "147f59c8.d7f266",
"wires": [
[]
]
},
{
- "id": "4d453124.5225e",
+ "id": "395e35c1.a6a5fa",
"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.site-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.site-vf-index`\" />\n\n\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource:relationship-list' \n key='site-resource.site-resource-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-site\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-sites/sdwan-site/' + $prop.site-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.site-vf-index`\" /-->\n",
+ "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=\"site-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/site-resources/site-resource/' + $prop.site-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"site-resource.site-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.site-vf-index`\" />\n",
"comments": "",
"outputs": 1,
- "x": 797.0038909912109,
- "y": 947.5000224113464,
- "z": "5099ec4c.e95b94",
+ "x": 765.4999847412109,
+ "y": 964.5000219345093,
+ "z": "147f59c8.d7f266",
"wires": [
[]
]
},
{
- "id": "462de6d9.81f588",
+ "id": "2b07f61e.bf4a1a",
"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": 745.7264213562012,
- "y": 993.6738653182983,
- "z": "5099ec4c.e95b94",
+ "x": 714.2225151062012,
+ "y": 1010.6738648414612,
+ "z": "147f59c8.d7f266",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.json index 244799a1..c85d68f8 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.json @@ -1,36 +1,36 @@ [
{
- "id": "294747fd.2c2d98",
+ "id": "951a58ad.b622b8",
"type": "method",
"name": "method vnf-topology-operation-vpn-site-resource-activate",
"xml": "<method rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 211.5,
- "y": 201.99997901916504,
- "z": "79a5b197.5d84",
+ "x": 274.00390625,
+ "y": 217.9999771118164,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "4068c2f3.520fdc"
+ "9f312de.ebe59d"
]
]
},
{
- "id": "cff9203f.6e7f7",
+ "id": "ce93efc.702d31",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 89.0713882446289,
- "y": 38,
- "z": "79a5b197.5d84",
+ "x": 151.5752944946289,
+ "y": 53.99999809265137,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "78d3821a.ddc91c"
+ "6be0f3e4.bbd19c"
]
]
},
{
- "id": "78d3821a.ddc91c",
+ "id": "6be0f3e4.bbd19c",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -38,261 +38,336 @@ "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": 188.35708618164062,
- "y": 112.23810789268464,
- "z": "79a5b197.5d84",
+ "x": 250.86099243164062,
+ "y": 128.238105985336,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "294747fd.2c2d98"
+ "951a58ad.b622b8"
]
]
},
{
- "id": "4068c2f3.520fdc",
+ "id": "9f312de.ebe59d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 189.73804473876953,
- "y": 373.66666814964265,
- "z": "79a5b197.5d84",
+ "x": 252.24195098876953,
+ "y": 389.666666242294,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "3a6b0423.a0a0ac",
- "d7b531c1.f5a86",
- "29c1d8e.17e3128",
- "206b62f4.ff1b8e",
- "ac1ddf15.75241",
- "fd35c3d4.a8e8a"
+ "94324bec.af0568",
+ "9e7bd407.d70c08",
+ "240a825d.6226de",
+ "c7c4dafb.a3de48",
+ "af4009d1.a698c8",
+ "db202f3e.dab93",
+ "5b908f22.f7f5a"
]
]
},
{
- "id": "3a6b0423.a0a0ac",
+ "id": "94324bec.af0568",
"type": "set",
"name": "set vnf-level-oper-status to Active",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",
"comments": "",
- "x": 598.8850250244141,
- "y": 446.67056941986084,
- "z": "79a5b197.5d84",
+ "x": 667.3889236450195,
+ "y": 576.6705493927002,
+ "z": "e44dd5e7.6a1128",
"wires": []
},
{
- "id": "d7b531c1.f5a86",
+ "id": "9e7bd407.d70c08",
"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": 519.0717163085938,
- "y": 572.5971069335938,
- "z": "79a5b197.5d84",
+ "x": 587.5756149291992,
+ "y": 702.5970869064331,
+ "z": "e44dd5e7.6a1128",
"wires": []
},
{
- "id": "29c1d8e.17e3128",
+ "id": "240a825d.6226de",
"type": "set",
"name": "set vnf-index and vnf-object-path",
"xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />",
"comments": "",
- "x": 605.0716705322266,
- "y": 394.5968236923218,
- "z": "79a5b197.5d84",
+ "x": 673.575569152832,
+ "y": 524.5968036651611,
+ "z": "e44dd5e7.6a1128",
"wires": []
},
{
- "id": "206b62f4.ff1b8e",
+ "id": "c7c4dafb.a3de48",
"type": "switchNode",
"name": "switch service-data.vnfs.vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 619.5000610351562,
- "y": 263.00000545661896,
- "z": "79a5b197.5d84",
+ "x": 682.0039672851562,
+ "y": 279.00000354927033,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "510e4a8b.ead204",
- "c779a013.c610f",
- "7ee910c1.660bf"
+ "f4d8522c.a4d9b",
+ "2bef8938.25fbd6",
+ "4701274a.571b48"
]
]
},
{
- "id": "7ee910c1.660bf",
+ "id": "4701274a.571b48",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 878.4689559936523,
- "y": 224.96876499336213,
- "z": "79a5b197.5d84",
+ "x": 940.9728622436523,
+ "y": 240.9687630860135,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "a7558172.b2121"
+ "fd0fb6fb.9706b8"
]
]
},
{
- "id": "a7558172.b2121",
+ "id": "fd0fb6fb.9706b8",
"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-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 1033.2778434753418,
- "y": 243.88903352897614,
- "z": "79a5b197.5d84",
+ "x": 1095.7817497253418,
+ "y": 259.8890316216275,
+ "z": "e44dd5e7.6a1128",
"wires": []
},
{
- "id": "510e4a8b.ead204",
+ "id": "f4d8522c.a4d9b",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 871.5000953674316,
- "y": 264.00008651893586,
- "z": "79a5b197.5d84",
+ "x": 934.0040016174316,
+ "y": 280.0000846115872,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "a7558172.b2121"
+ "fd0fb6fb.9706b8"
]
]
},
{
- "id": "c779a013.c610f",
+ "id": "2bef8938.25fbd6",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 864.5005035400391,
- "y": 297.0000903336331,
- "z": "79a5b197.5d84",
+ "x": 927.0044097900391,
+ "y": 313.0000884262845,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "6aaa180d.7575b8"
+ "f298ba1.2d54c48"
]
]
},
{
- "id": "6aaa180d.7575b8",
+ "id": "f298ba1.2d54c48",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1011.7700462341309,
- "y": 297.55473539512604,
- "z": "79a5b197.5d84",
+ "x": 1074.2739524841309,
+ "y": 313.5547334877774,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "46580136.d7c0b"
+ "5f9416f7.4477e8"
]
]
},
{
- "id": "46580136.d7c0b",
+ "id": "5f9416f7.4477e8",
"type": "for",
"name": "for vidx..service-data.vnfs.vnf_length[]",
"xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1257.7861633300781,
- "y": 304.4286558357999,
- "z": "79a5b197.5d84",
+ "x": 1320.2900695800781,
+ "y": 320.42865392845124,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "a66fcd87.a077a"
+ "d1140903.826428"
]
]
},
{
- "id": "a66fcd87.a077a",
+ "id": "d1140903.826428",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1477.1357955932617,
- "y": 303.9687359062955,
- "z": "79a5b197.5d84",
+ "x": 1539.6397018432617,
+ "y": 319.96873399894685,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "ba7c0ee7.d144d"
+ "634303dc.2373ac"
]
]
},
{
- "id": "ba7c0ee7.d144d",
+ "id": "634303dc.2373ac",
"type": "switchNode",
"name": "switch vnfid found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1631.2153930664062,
- "y": 303.67881796043366,
- "z": "79a5b197.5d84",
+ "x": 1693.7192993164062,
+ "y": 319.67881605308503,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "a9157f30.c0f4f"
+ "acd02e3d.622b7"
]
]
},
{
- "id": "a9157f30.c0f4f",
+ "id": "acd02e3d.622b7",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1807.1675148010254,
- "y": 303.57150003593415,
- "z": "79a5b197.5d84",
+ "x": 1869.6714210510254,
+ "y": 319.5714981285855,
+ "z": "e44dd5e7.6a1128",
"wires": [
[
- "e051341c.b94158"
+ "eb3ae849.6809a8"
]
]
},
{
- "id": "e051341c.b94158",
+ "id": "eb3ae849.6809a8",
"type": "set",
"name": "set tmp.vidx and ctx.vnf-data",
"xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
"comments": "",
- "x": 2016.6998901367188,
- "y": 305.3216001717374,
- "z": "79a5b197.5d84",
+ "x": 2079.2037963867188,
+ "y": 321.32159826438874,
+ "z": "e44dd5e7.6a1128",
"wires": []
},
{
- "id": "ac1ddf15.75241",
+ "id": "af4009d1.a698c8",
"type": "save",
"name": "update AnAI - vnf-instance.orchestration-status",
"xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"Active\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
"comments": "",
"outputs": 1,
- "x": 624.5000305175781,
- "y": 513.0103950500488,
- "z": "79a5b197.5d84",
+ "x": 693.0039291381836,
+ "y": 643.0103750228882,
+ "z": "e44dd5e7.6a1128",
"wires": [
[]
]
},
{
- "id": "fd35c3d4.a8e8a",
+ "id": "db202f3e.dab93",
"type": "set",
"name": "copy input data to service data",
- "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
"comments": "",
- "x": 603.5001449584961,
- "y": 344.010356426239,
- "z": "79a5b197.5d84",
+ "x": 672.0040435791016,
+ "y": 474.01033639907837,
+ "z": "e44dd5e7.6a1128",
"wires": []
+ },
+ {
+ "id": "5b908f22.f7f5a",
+ "type": "switchNode",
+ "name": "switch vnf-level-oper-status",
+ "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 658.75390625,
+ "y": 379.00390625,
+ "z": "e44dd5e7.6a1128",
+ "wires": [
+ [
+ "5ccb4fe0.99339",
+ "814ec70c.a8b9c8"
+ ]
+ ]
+ },
+ {
+ "id": "5ccb4fe0.99339",
+ "type": "outcome",
+ "name": "outcome Created",
+ "xml": "<outcome value='Created'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 904.5872001647949,
+ "y": 380.1150040626526,
+ "z": "e44dd5e7.6a1128",
+ "wires": [
+ [
+ "e3b020d0.17a88"
+ ]
+ ]
+ },
+ {
+ "id": "814ec70c.a8b9c8",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 882.5872192382812,
+ "y": 430.1150155067444,
+ "z": "e44dd5e7.6a1128",
+ "wires": [
+ [
+ "50309b2.08dbf64"
+ ]
+ ]
+ },
+ {
+ "id": "50309b2.08dbf64",
+ "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 is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
+ "comments": "",
+ "x": 1042.086986541748,
+ "y": 433.11501455307007,
+ "z": "e44dd5e7.6a1128",
+ "wires": []
+ },
+ {
+ "id": "e3b020d0.17a88",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">",
+ "atomic": "true",
+ "outputs": 1,
+ "x": 1114.8935737609863,
+ "y": 391.44017934799194,
+ "z": "e44dd5e7.6a1128",
+ "wires": [
+ []
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json index af262892..65c2f0ec 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json @@ -1,36 +1,36 @@ [
{
- "id": "668a4a6a.11fb74",
+ "id": "4d340fd2.1d47a",
"type": "method",
"name": "method vnf-topology-operation-vpn-site-resource-create",
"xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 260.0104064941406,
- "y": 185.0104217529297,
- "z": "872ff8dd.fe5e78",
+ "x": 251.00390625,
+ "y": 191.9999925820157,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "f0e43a5a.fb4558"
+ "dd995ca6.5527c"
]
]
},
{
- "id": "61b91100.d7ede",
+ "id": "83ce2cf0.a21b",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 136.581787109375,
- "y": 37.010429170913994,
- "z": "872ff8dd.fe5e78",
+ "x": 127.57528686523438,
+ "y": 44,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "bc2b5176.73e7e"
+ "d4e5788.5ad9988"
]
]
},
{
- "id": "bc2b5176.73e7e",
+ "id": "d4e5788.5ad9988",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -38,337 +38,337 @@ "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": 238.86749267578125,
- "y": 95.24853324890137,
- "z": "872ff8dd.fe5e78",
+ "x": 229.86099243164062,
+ "y": 102.23810407798737,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "668a4a6a.11fb74"
+ "4d340fd2.1d47a"
]
]
},
{
- "id": "f0e43a5a.fb4558",
+ "id": "dd995ca6.5527c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 240.24845123291016,
- "y": 356.6770935058594,
- "z": "872ff8dd.fe5e78",
+ "x": 231.24195098876953,
+ "y": 363.6666643349454,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "6dab251c.49205c",
- "10940ab9.a5fb85",
- "2aab9019.e3a45",
- "be0c443b.256188",
- "46389e76.c8e6",
- "89f88258.b891f",
- "dc405c48.cda4b",
- "1170677a.a70a49",
- "997721e4.3b61b",
- "71ec508c.bf2e1",
- "60143a97.af1404"
+ "9e4483c6.3ac77",
+ "a13164e4.2addc8",
+ "3a6751cb.2db1fe",
+ "deb0deb9.10aa8",
+ "8f8480.f469fb8",
+ "f27c92ed.2a351",
+ "4152c1db.9724f",
+ "34769e57.986742",
+ "27f27223.64947e",
+ "5e423ee5.be879",
+ "dfdcb682.501ff8"
]
]
},
{
- "id": "10940ab9.a5fb85",
+ "id": "a13164e4.2addc8",
"type": "set",
"name": "set vnf-level-oper-status to Created",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
"comments": "",
- "x": 674.3952026367188,
- "y": 610.6810224326327,
- "z": "872ff8dd.fe5e78",
+ "x": 665.3887023925781,
+ "y": 617.6705932617188,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "6dab251c.49205c",
+ "id": "9e4483c6.3ac77",
"type": "set",
"name": "copy input data to service data",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
"comments": "",
- "x": 666.2483901977539,
- "y": 505.67727449256927,
- "z": "872ff8dd.fe5e78",
+ "x": 657.2418899536133,
+ "y": 512.6668453216553,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "46389e76.c8e6",
+ "id": "8f8480.f469fb8",
"type": "execute",
"name": "execute generate-vnf-index",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-index\"/>\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 654.5818939208984,
- "y": 455.34385850746185,
- "z": "872ff8dd.fe5e78",
+ "x": 645.5753936767578,
+ "y": 462.33342933654785,
+ "z": "b6e8aa45.a03d48",
"wires": [
[]
]
},
{
- "id": "60143a97.af1404",
+ "id": "dfdcb682.501ff8",
"type": "set",
"name": "set vnf-index to service data",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\n",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",
"comments": "",
- "x": 665.5819702148438,
- "y": 562.3438623221591,
- "z": "872ff8dd.fe5e78",
+ "x": 656.5754699707031,
+ "y": 569.3334331512451,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "2aab9019.e3a45",
+ "id": "3a6751cb.2db1fe",
"type": "switchNode",
"name": "switch service-data.vnfs.vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 669.5817718505859,
- "y": 235.34378507453948,
- "z": "872ff8dd.fe5e78",
+ "x": 660.5752716064453,
+ "y": 242.3333559036255,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "214b38d8.c822d8",
- "308ac75b.244168"
+ "2c3f6b93.ddbca4",
+ "29bbdb18.cfe584"
]
]
},
{
- "id": "214b38d8.c822d8",
+ "id": "2c3f6b93.ddbca4",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 904.2961578369141,
- "y": 230.48660543281585,
- "z": "872ff8dd.fe5e78",
+ "x": 895.2896575927734,
+ "y": 237.47617626190186,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "bcebd76e.5a08d8"
+ "8e783130.b1886"
]
]
},
{
- "id": "bcebd76e.5a08d8",
+ "id": "8e783130.b1886",
"type": "set",
"name": "set vnf-index=0",
"xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
"comments": "",
- "x": 1064.5818634033203,
- "y": 230.48669698555022,
- "z": "872ff8dd.fe5e78",
+ "x": 1055.5753631591797,
+ "y": 237.47626781463623,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "308ac75b.244168",
+ "id": "29bbdb18.cfe584",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 900.7246971130371,
- "y": 263.77243688423187,
- "z": "872ff8dd.fe5e78",
+ "x": 891.7181968688965,
+ "y": 270.76200771331787,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "af41a2cb.7d1be"
+ "64bc2d84.970e54"
]
]
},
{
- "id": "c6ca1095.8fc32",
+ "id": "c816157.792fce8",
"type": "set",
"name": "set vnf-index = vnf_length",
"xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
"comments": "",
- "x": 1293.5819396972656,
- "y": 242.05816247779876,
- "z": "872ff8dd.fe5e78",
+ "x": 1284.575439453125,
+ "y": 249.04773330688477,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "c1df9f5.ae8c56",
+ "id": "a9c0fb1a.4ae688",
"type": "for",
"name": "for each existing VNF",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1282.0105590820312,
- "y": 277.0581343444064,
- "z": "872ff8dd.fe5e78",
+ "x": 1273.0040588378906,
+ "y": 284.04770517349243,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "6e99eb9c.1d2854"
+ "e4810c54.16f7c"
]
]
},
{
- "id": "af41a2cb.7d1be",
+ "id": "64bc2d84.970e54",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1035.438980102539,
- "y": 265.77240636665374,
- "z": "872ff8dd.fe5e78",
+ "x": 1026.4324798583984,
+ "y": 272.76197719573975,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "c6ca1095.8fc32",
- "c1df9f5.ae8c56"
+ "c816157.792fce8",
+ "a9c0fb1a.4ae688"
]
]
},
{
- "id": "6e99eb9c.1d2854",
+ "id": "e4810c54.16f7c",
"type": "switchNode",
"name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
"xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 1675.2962951660156,
- "y": 277.62961843330413,
- "z": "872ff8dd.fe5e78",
+ "x": 1666.289794921875,
+ "y": 284.61918926239014,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "b8a872f3.280e3"
+ "d88564b1.978518"
]
]
},
{
- "id": "b8a872f3.280e3",
+ "id": "d88564b1.978518",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1956.5819969177246,
- "y": 276.20102384407073,
- "z": "872ff8dd.fe5e78",
+ "x": 1947.575496673584,
+ "y": 283.19059467315674,
+ "z": "b6e8aa45.a03d48",
"wires": [
[
- "2b05b5cd.40cb0a"
+ "eb2d673c.26d6e8"
]
]
},
{
- "id": "1bd5d19c.ac71ae",
+ "id": "5a4256cd.31fdd8",
"type": "comment",
"name": "make sure this vnf-id doesn't exist already",
"info": "",
"comments": "",
- "x": 1644.4389114379883,
- "y": 241.2010104926303,
- "z": "872ff8dd.fe5e78",
+ "x": 1635.4324111938477,
+ "y": 248.1905813217163,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "be0c443b.256188",
+ "id": "deb0deb9.10aa8",
"type": "set",
"name": "set new vnf_length",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
"comments": "",
- "x": 626.5818939208984,
- "y": 403.34385516960174,
- "z": "872ff8dd.fe5e78",
+ "x": 617.5753936767578,
+ "y": 410.33342599868774,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "89f88258.b891f",
+ "id": "f27c92ed.2a351",
"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": 613.5818557739258,
- "y": 873.607373979874,
- "z": "872ff8dd.fe5e78",
+ "x": 604.5753555297852,
+ "y": 880.59694480896,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "71ec508c.bf2e1",
+ "id": "5e423ee5.be879",
"type": "save",
"name": "save service relationship in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" />\n\n\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/vpn-resources/vpn-resource/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-resource.vpn-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" /-->",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 676.2486267089844,
- "y": 820.6072671683505,
- "z": "872ff8dd.fe5e78",
+ "x": 667.2421264648438,
+ "y": 827.5968379974365,
+ "z": "b6e8aa45.a03d48",
"wires": [
[]
]
},
{
- "id": "dc405c48.cda4b",
+ "id": "4152c1db.9724f",
"type": "set",
"name": "set vnf-index and vnf-object-path",
- "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-index`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` \" />",
+ "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` \" />",
"comments": "",
- "x": 667.5818862915039,
- "y": 651.6072929175571,
- "z": "872ff8dd.fe5e78",
+ "x": 658.5753860473633,
+ "y": 658.5968637466431,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "1170677a.a70a49",
+ "id": "34769e57.986742",
"type": "set",
"name": "set vnf-request-input.",
"xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",
"comments": "",
- "x": 632.5815277099609,
- "y": 354.33522775489837,
- "z": "872ff8dd.fe5e78",
+ "x": 623.5750274658203,
+ "y": 361.3247985839844,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "2b05b5cd.40cb0a",
+ "id": "eb2d673c.26d6e8",
"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 id ' + $service-data.vnfs.vnf[$idx].vnf-id\n + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",
"comments": "",
- "x": 2085.153366088867,
- "y": 327.2010381491855,
- "z": "872ff8dd.fe5e78",
+ "x": 2076.1468658447266,
+ "y": 334.1906089782715,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "8463cd7c.a7a22",
+ "id": "6aca9b4.e7d1e64",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 1378.5819778442383,
- "y": 330.67710473854095,
- "z": "872ff8dd.fe5e78",
+ "x": 1369.5754776000977,
+ "y": 337.66667556762695,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "ecfeb487.443888",
+ "id": "301883bc.025f5c",
"type": "comment",
"name": "TODO: change AAI models",
"info": "",
"comments": "",
- "x": 656.1924514770508,
- "y": 720.9847257407382,
- "z": "872ff8dd.fe5e78",
+ "x": 647.1859512329102,
+ "y": 727.9742965698242,
+ "z": "b6e8aa45.a03d48",
"wires": []
},
{
- "id": "997721e4.3b61b",
+ "id": "27f27223.64947e",
"type": "save",
"name": "save AnAI - vnf-instance.orchestration-status",
- "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-index\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
"comments": "",
"outputs": 1,
- "x": 722.5561904907227,
- "y": 761.2575099738315,
- "z": "872ff8dd.fe5e78",
+ "x": 713.549690246582,
+ "y": 768.2470808029175,
+ "z": "b6e8aa45.a03d48",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json index 3d26891c..41f88c42 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json @@ -1,36 +1,36 @@ [
{
- "id": "eafcb830.49a558",
+ "id": "a34c8b72.7caca8",
"type": "method",
"name": "method vnf-topology-operation-vpn-site-resource-delete",
"xml": "<method rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 207,
- "y": 214,
- "z": "db08cdbb.446ef",
+ "x": 244.00390625,
+ "y": 243.9999988079071,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "d02b15b4.dd4488"
+ "54a7ab4c.cd61a4"
]
]
},
{
- "id": "d0a64a79.788248",
+ "id": "d8d59f04.fbf0d",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 151.57138061523438,
- "y": 38,
- "z": "db08cdbb.446ef",
+ "x": 188.57528686523438,
+ "y": 67.9999988079071,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "188a7052.71591"
+ "115026d6.80ce89"
]
]
},
{
- "id": "188a7052.71591",
+ "id": "115026d6.80ce89",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -38,530 +38,486 @@ "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": 226.85708618164062,
- "y": 78.23811149597168,
- "z": "db08cdbb.446ef",
+ "x": 263.8609924316406,
+ "y": 108.23811030387878,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "eafcb830.49a558"
+ "a34c8b72.7caca8"
]
]
},
{
- "id": "c2640aa8.7edda8",
+ "id": "e3e6f054.e2739",
"type": "comment",
"name": "site-vnf-topology-operation-delete",
"info": "",
"comments": "",
- "x": 600.9162979125977,
- "y": 111.58639907836914,
- "z": "db08cdbb.446ef",
+ "x": 637.9202041625977,
+ "y": 141.58639788627625,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "d02b15b4.dd4488",
+ "id": "54a7ab4c.cd61a4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 228.23804473876953,
- "y": 339.6666717529297,
- "z": "db08cdbb.446ef",
+ "x": 265.24195098876953,
+ "y": 369.6666705608368,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "ac2e49a1.5e8568",
- "4d83bd7.fa4f844",
- "8cb0635e.d8e2c",
- "faf06bed.cf0a38",
- "c3cf9f4.9560f6",
- "5c51b14f.3f60b",
- "84b98584.0b5d68",
- "64b20017.f4e26",
- "c1ccb47b.c48ef8",
- "dfa19665.762578",
- "f3ab3fd1.f188e"
+ "5cec27dc.b4f998",
+ "e053b514.a7c2a8",
+ "538824d6.c6a6fc",
+ "a69377b.4606688",
+ "3ec3b469.7cc4ec",
+ "25ca64f5.0561dc",
+ "7d20c9cf.4fef58",
+ "4cc92ad1.2ef524",
+ "c339a825.6ccfe8",
+ "dd31e4a5.a51148"
]
]
},
{
- "id": "faf06bed.cf0a38",
+ "id": "a69377b.4606688",
"type": "switchNode",
"name": "switch service-data.vnfs.vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 689.6660842895508,
- "y": 273.26117038726807,
- "z": "db08cdbb.446ef",
+ "x": 717.6699981689453,
+ "y": 287.2611780166626,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "7bb61b60.8ccfe4",
- "6a78f7f6.d96ae8"
+ "4a61f22a.1420fc",
+ "5dae927c.612acc"
]
]
},
{
- "id": "7bb61b60.8ccfe4",
+ "id": "4a61f22a.1420fc",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 954.3883972167969,
- "y": 255.81679248809814,
- "z": "db08cdbb.446ef",
+ "x": 982.3923110961914,
+ "y": 269.8168001174927,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "ded5f144.4823a"
+ "2a103cd5.07a2e4"
]
]
},
{
- "id": "ded5f144.4823a",
+ "id": "2a103cd5.07a2e4",
"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-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 1135.3882675170898,
- "y": 250.81667041778564,
- "z": "db08cdbb.446ef",
+ "x": 1163.3921813964844,
+ "y": 264.8166780471802,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "6a78f7f6.d96ae8",
+ "id": "5dae927c.612acc",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 939.8883972167969,
- "y": 307.8167552947998,
- "z": "db08cdbb.446ef",
+ "x": 967.8923110961914,
+ "y": 321.81676292419434,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "4b9e2f73.508cd"
+ "84a26be6.b55a98"
]
]
},
{
- "id": "4b9e2f73.508cd",
+ "id": "84a26be6.b55a98",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1111.8881034851074,
- "y": 307.8167533874512,
- "z": "db08cdbb.446ef",
+ "x": 1139.892017364502,
+ "y": 321.8167610168457,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "247799a9.6130f6",
- "84b938cb.78bee8"
+ "43c53e66.48eab",
+ "bc2744ca.9b7c98"
]
]
},
{
- "id": "84b938cb.78bee8",
+ "id": "bc2744ca.9b7c98",
"type": "switchNode",
"name": "switch tmp.nidx ",
"xml": "<switch test=\"`$tmp.nidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1286.8882751464844,
- "y": 326.8166751861572,
- "z": "db08cdbb.446ef",
+ "x": 1314.892189025879,
+ "y": 340.81668281555176,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "7a17688b.c98ab8"
+ "36fbace6.f16d84"
]
]
},
{
- "id": "8cb0635e.d8e2c",
+ "id": "538824d6.c6a6fc",
"type": "switchNode",
"name": "switch vnf-level-oper-status",
"xml": "<switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 660.0550842285156,
- "y": 347.70563411712646,
- "z": "db08cdbb.446ef",
+ "x": 688.0589981079102,
+ "y": 361.705641746521,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "6f0effe.88561",
- "4d0008ab.c847c8"
+ "9a7aa2ec.10efc",
+ "8c012c8c.5b9ba"
]
]
},
{
- "id": "6f0effe.88561",
+ "id": "9a7aa2ec.10efc",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 936.888427734375,
- "y": 350.8167338371277,
- "z": "db08cdbb.446ef",
+ "x": 964.8923416137695,
+ "y": 364.8167414665222,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "1d4d444b.bf117c"
+ "bf8c6806.a7bce8"
]
]
},
{
- "id": "4d0008ab.c847c8",
+ "id": "8c012c8c.5b9ba",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 897.8884124755859,
- "y": 396.816782951355,
- "z": "db08cdbb.446ef",
+ "x": 925.8923263549805,
+ "y": 410.8167905807495,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "640a50b6.3e86d"
+ "1ed98412.25294c"
]
]
},
{
- "id": "640a50b6.3e86d",
+ "id": "1ed98412.25294c",
"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 is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
"comments": "",
- "x": 1046.388126373291,
- "y": 395.81676292419434,
- "z": "db08cdbb.446ef",
+ "x": 1074.3920402526855,
+ "y": 409.81677055358887,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "c3cf9f4.9560f6",
- "type": "switchNode",
- "name": "switch vnf-id",
- "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n",
- "comments": "",
- "outputs": 1,
- "x": 625.8884010314941,
- "y": 228.81676387786865,
- "z": "db08cdbb.446ef",
- "wires": [
- [
- "6f94c17f.e94a6"
- ]
- ]
- },
- {
- "id": "6f94c17f.e94a6",
- "type": "outcome",
- "name": "NULL",
- "xml": "<outcome value=''>",
- "comments": "",
- "outputs": 1,
- "x": 823.8884658813477,
- "y": 218.81677627563477,
- "z": "db08cdbb.446ef",
- "wires": [
- [
- "723f2fa7.6d1e3"
- ]
- ]
- },
- {
- "id": "723f2fa7.6d1e3",
- "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-request-input.vnf-input-parameters.name is a required input\" />\n",
- "comments": "",
- "x": 990.3883514404297,
- "y": 215.81677055358887,
- "z": "db08cdbb.446ef",
- "wires": []
- },
- {
- "id": "5c51b14f.3f60b",
+ "id": "3ec3b469.7cc4ec",
"type": "execute",
"name": "execute requiredParameters",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vnf-topology-operation-input.vnf-information.vnf-id\" value=\"$vnf-topology-operation-input.vnf-information.vnf-id\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 683.3884582519531,
- "y": 168.81676292419434,
- "z": "db08cdbb.446ef",
+ "x": 704.392333984375,
+ "y": 230.8167576789856,
+ "z": "f9f35a3e.860ce8",
"wires": [
[]
]
},
{
- "id": "247799a9.6130f6",
+ "id": "43c53e66.48eab",
"type": "for",
"name": "for nidx..service-data.vnfs.vnf[]",
"xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1347.3882789611816,
- "y": 262.81667137145996,
- "z": "db08cdbb.446ef",
+ "x": 1375.3921928405762,
+ "y": 276.8166790008545,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "b01b8e2f.7dbb9"
+ "d2baa75f.a56cd8"
]
]
},
{
- "id": "b01b8e2f.7dbb9",
+ "id": "d2baa75f.a56cd8",
"type": "switchNode",
"name": "switch vnf-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1603.388298034668,
- "y": 262.81667137145996,
- "z": "db08cdbb.446ef",
+ "x": 1631.3922119140625,
+ "y": 276.8166790008545,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "357169.84af7e98"
+ "16946d10.c0e503"
]
]
},
{
- "id": "357169.84af7e98",
+ "id": "16946d10.c0e503",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1779.8883514404297,
- "y": 265.81667137145996,
- "z": "db08cdbb.446ef",
+ "x": 1807.8922653198242,
+ "y": 279.8166790008545,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "38f16832.2c5d68"
+ "c1f09a0b.fa73f8"
]
]
},
{
- "id": "38f16832.2c5d68",
+ "id": "c1f09a0b.fa73f8",
"type": "set",
"name": "set tmp.nidx and ctx.vnf-data",
"xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />\n",
"comments": "",
- "x": 1946.8883666992188,
- "y": 326.81667137145996,
- "z": "db08cdbb.446ef",
+ "x": 1974.8922805786133,
+ "y": 340.8166790008545,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "fc674990.6f1398",
+ "id": "841f20a7.73592",
"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-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 1592.3882904052734,
- "y": 326.8166751861572,
- "z": "db08cdbb.446ef",
+ "x": 1620.392204284668,
+ "y": 340.81668281555176,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "7a17688b.c98ab8",
+ "id": "36fbace6.f16d84",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1454.8882904052734,
- "y": 326.8166751861572,
- "z": "db08cdbb.446ef",
+ "x": 1482.892204284668,
+ "y": 340.81668281555176,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "fc674990.6f1398"
+ "841f20a7.73592"
]
]
},
{
- "id": "ac2e49a1.5e8568",
+ "id": "5cec27dc.b4f998",
"type": "set",
"name": "set vnfId and vnf-object-path",
"xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='vnf-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
"comments": "",
- "x": 646.9051055908203,
- "y": 562.333676815033,
- "z": "db08cdbb.446ef",
+ "x": 674.9090194702148,
+ "y": 576.3336844444275,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "4d83bd7.fa4f844",
+ "id": "e053b514.a7c2a8",
"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": 603.0162582397461,
- "y": 639.8892359733582,
- "z": "db08cdbb.446ef",
+ "x": 631.0201721191406,
+ "y": 653.8892436027527,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "1d4d444b.bf117c",
+ "id": "bf8c6806.a7bce8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1132.1947860717773,
- "y": 358.141939163208,
- "z": "db08cdbb.446ef",
+ "x": 1160.1986999511719,
+ "y": 372.14194679260254,
+ "z": "f9f35a3e.860ce8",
"wires": [
[]
]
},
{
- "id": "84b98584.0b5d68",
+ "id": "25ca64f5.0561dc",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
"comments": "",
- "x": 629.0000762939453,
- "y": 398.00006914138794,
- "z": "db08cdbb.446ef",
+ "x": 657.0039901733398,
+ "y": 412.00007677078247,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "64b20017.f4e26",
+ "id": "7d20c9cf.4fef58",
"type": "for",
"name": "for lidx..service-data.vnfs.vnf[]",
"xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 653.0000610351562,
- "y": 440.00006771087646,
- "z": "db08cdbb.446ef",
+ "x": 681.0039749145508,
+ "y": 454.000075340271,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "ac122a7c.345458"
+ "69a35263.2a030c"
]
]
},
{
- "id": "ac122a7c.345458",
+ "id": "69a35263.2a030c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 914.0001373291016,
- "y": 444.000102519989,
- "z": "db08cdbb.446ef",
+ "x": 942.0040512084961,
+ "y": 458.00011014938354,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "7381e65e.fc3b68"
+ "a4d1dd60.ffc74"
]
]
},
{
- "id": "7381e65e.fc3b68",
+ "id": "a4d1dd60.ffc74",
"type": "switchNode",
"name": "switch vnf-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1106.0000839233398,
- "y": 453.0001468658447,
- "z": "db08cdbb.446ef",
+ "x": 1134.0039978027344,
+ "y": 467.00015449523926,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "61719a57.800f34"
+ "4e20e907.55e038"
]
]
},
{
- "id": "61719a57.800f34",
+ "id": "4e20e907.55e038",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1292.000099182129,
- "y": 437.0000333786011,
- "z": "db08cdbb.446ef",
+ "x": 1320.0040130615234,
+ "y": 451.0000410079956,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "9df0dc24.7346c"
+ "58cf5365.23557c"
]
]
},
{
- "id": "9df0dc24.7346c",
+ "id": "58cf5365.23557c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1443.0000228881836,
- "y": 438.0000696182251,
- "z": "db08cdbb.446ef",
+ "x": 1471.0039367675781,
+ "y": 452.00007724761963,
+ "z": "f9f35a3e.860ce8",
"wires": [
[
- "c661d6a.46dd528",
- "142b6671.1e430a"
+ "b99c095f.2dd4a8",
+ "9d68eef8.da1f9"
]
]
},
{
- "id": "c661d6a.46dd528",
+ "id": "b99c095f.2dd4a8",
"type": "set",
"name": "set vnf data",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />\n",
"comments": "",
- "x": 1610.0001907348633,
- "y": 412.000253200531,
- "z": "db08cdbb.446ef",
+ "x": 1638.0041046142578,
+ "y": 426.00026082992554,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "142b6671.1e430a",
+ "id": "9d68eef8.da1f9",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
"comments": "",
- "x": 1630.0001182556152,
- "y": 469.00018882751465,
- "z": "db08cdbb.446ef",
+ "x": 1658.0040321350098,
+ "y": 483.0001964569092,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "c1ccb47b.c48ef8",
+ "id": "4cc92ad1.2ef524",
"type": "set",
"name": "set new vnf length",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
"comments": "",
- "x": 621.1014747619629,
- "y": 483.80442094802856,
- "z": "db08cdbb.446ef",
+ "x": 649.1053886413574,
+ "y": 497.8044285774231,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "dfa19665.762578",
+ "id": "c339a825.6ccfe8",
"type": "set",
"name": "Remove vnf from ServiceData",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",
"comments": "",
- "x": 651.000244140625,
- "y": 522.0002040863037,
- "z": "db08cdbb.446ef",
+ "x": 679.0041580200195,
+ "y": 536.0002117156982,
+ "z": "f9f35a3e.860ce8",
"wires": []
},
{
- "id": "f3ab3fd1.f188e",
+ "id": "dd31e4a5.a51148",
"type": "save",
"name": "delete AnAI - vnf-instance.orchestration-status",
"xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"PendingDelete\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />\n",
"comments": "",
"outputs": 1,
- "x": 708.0066375732422,
- "y": 599.0106163024902,
- "z": "db08cdbb.446ef",
+ "x": 736.0105514526367,
+ "y": 613.0106239318848,
+ "z": "f9f35a3e.860ce8",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml index 808070fc..9211d48b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml @@ -21,6 +21,10 @@ </outcome>
</switch>
</for>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
<outcome value='0'>
<return status='failure'>
@@ -179,7 +183,7 @@ </for>
<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="esr-thirdparty-sdnc"
- key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND
+ key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND
depth = '1'"
pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
<outcome value='success'>
@@ -415,10 +419,10 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
</set>
<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config'
- key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
- <parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
+ key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
+ <parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />
<parameter name='operational-status' value='Active' />
- <parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />
+ <!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->
</update>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml index d13f6809..e4bdd6f2 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-create.xml @@ -104,6 +104,27 @@ <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`' />
<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`' />
</set>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource'
+ key='site-resource.site-resource-id = $prop.site-vf-index' >
+ <parameter name='site-resource-id' value='`$prop.site-vf-index`' />
+ <parameter name='site-resource-name' value='`$prop.site.name`' />
+ <parameter name='description' value='`$prop.site.description`' />
+ <parameter name='type' value='`$prop.site.type`' />
+ <parameter name='role' value='`$prop.site.role`' />
+ <parameter name='operational-status' value='Created' />
+ <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
+ <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
+ <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />
+ <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.site-vf-index + '/vf-module-data/'` " />
+ </save>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
+ key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
+ force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="site-resource" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/site-resources/site-resource/' + $prop.site-vf-index`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="site-resource.site-resource-id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.site-vf-index`" />
+ </save>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml index 32fa9b27..86099f33 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-activate.xml @@ -35,8 +35,19 @@ </block>
</outcome>
</switch>
+ <switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>
+ <outcome value='Created'>
+ <block atomic="true"></block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
+ </return>
+ </outcome>
+ </switch>
<set>
- <!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml index f7847c7c..b730b324 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml @@ -36,10 +36,10 @@ <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
- <parameter name="ctx-destination" value="prop.vnf-index"/>
+ <parameter name="ctx-destination" value="prop.vnf-id"/>
</execute>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />
@@ -47,7 +47,7 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />
</set>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />
@@ -55,12 +55,12 @@ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
</set>
<set>
- <parameter name='vnfId' value='`$prop.vnf-index`' />
- <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-index + '/vnf-data/'` " />
+ <parameter name='vnfId' value='`$prop.vnf-id`' />
+ <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $prop.vnf-id + '/vnf-data/'` " />
</set>
<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
- key="generic-vnf.vnf-id = $prop.vnf-index" >
+ key="generic-vnf.vnf-id = $prop.vnf-id" >
<parameter name="orchestration-status" value="create" />
<parameter name="vnf-type" value="some vnf-type" />
</save>
@@ -70,14 +70,9 @@ AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-index`" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-index`" />
- <!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
- key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
- AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id
- AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'
- force="true" pfx="tmp.AnAI-data"><parameter name="relationship-list.relationship[0].related-to" value="vpn-resource" /><parameter name="relationship-list.relationship[0].related-link" value="`'/network/vpn-resources/vpn-resource/' + $prop.vnf-index`" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="vpn-resource.vpn-resource-id" /><parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-index`" /-->
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vnf-id`" />
</save>
<return status='success'>
<parameter name="ack-final-indicator" value="Y" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml index 41bab8f3..87e6c528 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml @@ -6,15 +6,6 @@ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
<parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>
</execute>
- <switch test="`$vnf-topology-operation-input.vnf-information.vnf-id`">
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="vnf-request-input.vnf-input-parameters.name is a required input" />
- </return>
- </outcome>
- </switch>
<switch test='`$service-data.vnfs.vnf_length`'>
<outcome value=''>
<return status='failure'>
|