aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main
diff options
context:
space:
mode:
authorprakash.e <prakash.e@huawei.com>2019-04-24 11:25:34 +0530
committerDan Timoney <dtimoney@att.com>2019-04-24 18:09:06 +0000
commit7447a47bb9e911e344260c7edbc09bb3791bd9dd (patch)
treed275958da1f69619caa4b9050fff7390aaa7b50a /platform-logic/generic-resource-api/src/main
parent64bbbabf87a6bd22f48166c4b86d98e36f2474d2 (diff)
Fixed SDWAN lan-port-activate DG with correct AAI resource
SDWAN lan-port-activate DG is updated with correct AAI resource name lan-port-config. Earlier resource name sdwan-vpn is used Change-Id: I2ed2d4da0415a57b4cbb02f13a557f5da93ba80b Issue-ID: SDNC-659 Signed-off-by: Prakash.E <prakash.e@huawei.com> Former-commit-id: 5a05205ebb2299f235e76a2288f7347d29e6cebb
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.json1489
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml12
2 files changed, 845 insertions, 656 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/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" />