summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main
diff options
context:
space:
mode:
authorprakash.e <prakash.e@huawei.com>2018-09-12 17:17:09 +0530
committerprakash.e <prakash.e@huawei.com>2018-09-12 17:17:09 +0530
commit3ad0f7037db572577b42784c2fc9bca13a4d6f11 (patch)
tree998a0fccdd7b140c2de458cc6d133f881055bd00 /platform-logic/generic-resource-api/src/main
parent4e2db0d6e56bc19425e6afa3efc7011820942e9e (diff)
SOTN reoptimization DGs
SOTN Reoptimization DGs added to support policy Change-Id: Id9bfa483fcc83011ed76ee040f2cbc909e0da03f Issue-ID: SDNC-357 Signed-off-by: Prakash.E <prakash.e@huawei.com> Former-commit-id: 97357d818c41c853d295359b843448dcaa2e52f0
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json1155
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json591
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json1998
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json377
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml833
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml255
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml5
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml89
8 files changed, 2982 insertions, 2321 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
index 76d920b1..9b4c70e3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
@@ -1,20 +1,20 @@
[
{
- "id": "79f282c8.82473c",
+ "id": "4e8e1695.988a28",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 126.01040649414062,
- "y": 74.77774620056152,
- "z": "9aad28bb.de6b08",
+ "x": 123.01040649414062,
+ "y": 97.77774596214294,
+ "z": "2db908be.484d28",
"wires": [
[
- "aa8fb88e.70ce88"
+ "3d7adacf.e37b26"
]
]
},
{
- "id": "aa8fb88e.70ce88",
+ "id": "3d7adacf.e37b26",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1631 +22,1694 @@
"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": 207.9627685546875,
- "y": 115.01585865020752,
- "z": "9aad28bb.de6b08",
+ "x": 204.9627685546875,
+ "y": 138.01585841178894,
+ "z": "2db908be.484d28",
"wires": [
[
- "6e24967e.ad6008"
+ "99936fad.eb5a8"
]
]
},
{
- "id": "6e24967e.ad6008",
+ "id": "99936fad.eb5a8",
"type": "method",
"name": "network-topology-operation",
"xml": "<method rpc='network-topology-operation' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 187.4390411376953,
- "y": 165.77775192260742,
- "z": "9aad28bb.de6b08",
+ "x": 184.4390411376953,
+ "y": 188.77775168418884,
+ "z": "2db908be.484d28",
"wires": [
[
- "7a35625.e24119c"
+ "fa94a458.153ec8"
]
]
},
{
- "id": "a789a649.5a0d58",
+ "id": "e85a20e2.1a6f",
"type": "comment",
"name": " NETWORK-TOPOLOGY-OPERATION ",
"info": "",
"comments": "",
- "x": 520.3552627563477,
- "y": 22.364089965820312,
- "z": "9aad28bb.de6b08",
+ "x": 517.3552627563477,
+ "y": 45.36408972740173,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "7a35625.e24119c",
+ "id": "fa94a458.153ec8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 240.01043701171875,
- "y": 238.22122955322266,
- "z": "9aad28bb.de6b08",
+ "x": 237.01043701171875,
+ "y": 261.2212293148041,
+ "z": "2db908be.484d28",
"wires": [
[
- "ba0d38ae.e81c58",
- "457583d9.562e0c",
- "cba36fc0.072d2",
- "d3235e19.d8ecb"
+ "74a7b33e.25ccac",
+ "e6a39d58.fa5d7",
+ "94b2997f.90f198",
+ "2ccd4cf4.cd1224"
]
]
},
{
- "id": "ba0d38ae.e81c58",
+ "id": "74a7b33e.25ccac",
"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": 444.09381103515625,
- "y": 1264.3138828277588,
- "z": "9aad28bb.de6b08",
+ "x": 441.09381103515625,
+ "y": 1287.3138825893402,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "457583d9.562e0c",
+ "id": "e6a39d58.fa5d7",
"type": "switchNode",
"name": "switch svc-action",
"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 466.72467041015625,
- "y": 468.6349239349365,
- "z": "9aad28bb.de6b08",
+ "x": 463.72467041015625,
+ "y": 491.63492369651794,
+ "z": "2db908be.484d28",
"wires": [
[
- "dc5ac960.8b0118",
- "c0a124c2.b074a8",
- "615f84cf.02d10c",
- "5464b8d8.4a3498",
- "fb6e7e31.10ac3",
- "a87a521d.9540c",
- "31fb5db9.aec912",
- "24acb0b8.15f98"
+ "ad7b4573.ffb848",
+ "2a4dd65a.9a82ea",
+ "a50cf8ad.598a18",
+ "f1232753.705208",
+ "de92e919.3dfbf8",
+ "7130c8aa.c3e608",
+ "1591e42d.e2cabc",
+ "d1b59f6c.66aa3",
+ "3a527742.291048"
]
]
},
{
- "id": "dc5ac960.8b0118",
+ "id": "ad7b4573.ffb848",
"type": "other",
"name": "assign",
"xml": "<outcome value='assign'>\n",
"comments": "",
"outputs": 1,
- "x": 681.2009086608887,
- "y": 240.9206027984619,
- "z": "9aad28bb.de6b08",
+ "x": 678.2009086608887,
+ "y": 263.92060256004333,
+ "z": "2db908be.484d28",
"wires": [
[
- "875082ec.7b232"
+ "341de51.f64001a"
]
]
},
{
- "id": "875082ec.7b232",
+ "id": "341de51.f64001a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 853.439079284668,
- "y": 238.92073154449463,
- "z": "9aad28bb.de6b08",
+ "x": 850.439079284668,
+ "y": 261.92073130607605,
+ "z": "2db908be.484d28",
"wires": [
[
- "580a77ff.6cd088"
+ "b2a344c1.b2b118"
]
]
},
{
- "id": "cba36fc0.072d2",
+ "id": "94b2997f.90f198",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-network-input",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 577.0103950500488,
- "y": 178.77775311470032,
- "z": "9aad28bb.de6b08",
+ "x": 574.0103950500488,
+ "y": 201.77775287628174,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "c0a124c2.b074a8",
+ "id": "2a4dd65a.9a82ea",
"type": "other",
"name": "activate",
"xml": "<outcome value='activate'>\n",
"comments": "",
"outputs": 1,
- "x": 684.0104484558105,
- "y": 330.7777404785156,
- "z": "9aad28bb.de6b08",
+ "x": 681.0104484558105,
+ "y": 353.77774024009705,
+ "z": "2db908be.484d28",
"wires": [
[
- "e703e8d7.7187b8"
+ "28e87a49.f59c96"
]
]
},
{
- "id": "5517cc3b.5b0904",
+ "id": "389876cb.1e467a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1060.2486991882324,
- "y": 407.77792263031006,
- "z": "9aad28bb.de6b08",
+ "x": 1057.2486991882324,
+ "y": 430.7779223918915,
+ "z": "2db908be.484d28",
"wires": [
[
- "9c0b8d26.ccc64",
- "7ee91c34.4e4f44",
- "10521c9e.098fa3"
+ "62930298.0b2a1c",
+ "d3301b58.914a58",
+ "fb007c4b.5179"
]
]
},
{
- "id": "4ebef597.bf543c",
+ "id": "c9165975.2c8ce8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:network-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2331.0703353881836,
- "y": 919.38498878479,
- "z": "9aad28bb.de6b08",
+ "x": 2328.0703353881836,
+ "y": 942.3849885463715,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "615f84cf.02d10c",
+ "id": "a50cf8ad.598a18",
"type": "other",
"name": "deactivate",
"xml": "<outcome value='deactivate'>\n",
"comments": "",
"outputs": 1,
- "x": 678.010440826416,
- "y": 562.777738571167,
- "z": "9aad28bb.de6b08",
+ "x": 675.010440826416,
+ "y": 585.7777383327484,
+ "z": "2db908be.484d28",
"wires": [
[
- "c572c289.cadd5"
+ "8e1c520d.d2576"
]
]
},
{
- "id": "1e922072.6c693",
+ "id": "c28aa9c7.571d18",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1080.248664855957,
- "y": 757.7780284881592,
- "z": "9aad28bb.de6b08",
+ "x": 1077.248664855957,
+ "y": 780.7780282497406,
+ "z": "2db908be.484d28",
"wires": [
[
- "9c0b8d26.ccc64",
- "8aea2ef9.6eafd",
- "10521c9e.098fa3"
+ "62930298.0b2a1c",
+ "9d5d0700.ed8698",
+ "fb007c4b.5179"
]
]
},
{
- "id": "8aea2ef9.6eafd",
+ "id": "9d5d0700.ed8698",
"type": "call",
"name": "call GENERIC-RESOURCE-API:network-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1659.2369384765625,
- "y": 1007.6350364685059,
- "z": "9aad28bb.de6b08",
+ "x": 1656.2369384765625,
+ "y": 1030.6350362300873,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "5464b8d8.4a3498",
+ "id": "f1232753.705208",
"type": "other",
"name": "unassign",
"xml": "<outcome value='unassign'>\n",
"comments": "",
"outputs": 1,
- "x": 675.0104598999023,
- "y": 814.7777881622314,
- "z": "9aad28bb.de6b08",
+ "x": 672.0104598999023,
+ "y": 837.7777879238129,
+ "z": "2db908be.484d28",
"wires": [
[
- "a28f55cf.2766d8"
+ "a735954b.9ab908"
]
]
},
{
- "id": "a28f55cf.2766d8",
+ "id": "a735954b.9ab908",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 856.2486190795898,
- "y": 815.777910232544,
- "z": "9aad28bb.de6b08",
+ "x": 853.2486190795898,
+ "y": 838.7779099941254,
+ "z": "2db908be.484d28",
"wires": [
[
- "9c0b8d26.ccc64",
- "f8a88ed3.13cf",
- "10521c9e.098fa3"
+ "62930298.0b2a1c",
+ "21cf404.360a8c",
+ "fb007c4b.5179"
]
]
},
{
- "id": "3a9ebc21.5bb5a4",
+ "id": "c95f430.de215c",
"type": "call",
"name": "call GENERIC-RESOURCE-API:network-topology-operation-unassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2326.820198059082,
- "y": 1112.884958267212,
- "z": "9aad28bb.de6b08",
+ "x": 2323.820198059082,
+ "y": 1135.8849580287933,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "fb6e7e31.10ac3",
+ "id": "de92e919.3dfbf8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 659.0104598999023,
- "y": 1069.7777848243713,
- "z": "9aad28bb.de6b08",
+ "x": 645.0104370117188,
+ "y": 1163.77783203125,
+ "z": "2db908be.484d28",
"wires": [
[
- "ddd743b8.7f7fe"
+ "88ae8f90.f87f8"
]
]
},
{
- "id": "ddd743b8.7f7fe",
+ "id": "88ae8f90.f87f8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n",
"comments": "",
- "x": 841.0104560852051,
- "y": 1068.7777943611145,
- "z": "9aad28bb.de6b08",
+ "x": 827.0104331970215,
+ "y": 1162.7778415679932,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "d3235e19.d8ecb",
+ "id": "2ccd4cf4.cd1224",
"type": "set",
"name": "Set final indicator to Y",
"xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
"comments": "",
- "x": 463.1215057373047,
- "y": 1223.4722213745117,
- "z": "9aad28bb.de6b08",
+ "x": 460.1215057373047,
+ "y": 1246.4722211360931,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "58c301a.4cd9b",
+ "id": "487e294c.601868",
"type": "for",
"name": "for nidx..service-data.networks.network[]",
"xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 2195.740863800049,
- "y": 457.5396976470947,
- "z": "9aad28bb.de6b08",
+ "x": 2192.740863800049,
+ "y": 480.53969740867615,
+ "z": "2db908be.484d28",
"wires": [
[
- "ae92c30c.ac766"
+ "d951934c.04645"
]
]
},
{
- "id": "9c0b8d26.ccc64",
+ "id": "62930298.0b2a1c",
"type": "switchNode",
"name": "switch service-data.networks.network_length",
"xml": "<switch test='`$service-data.networks.network_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1473.205020904541,
- "y": 425.8610897064209,
- "z": "9aad28bb.de6b08",
+ "x": 1470.205020904541,
+ "y": 448.8610894680023,
+ "z": "2db908be.484d28",
"wires": [
[
- "88ad5c25.78bab",
- "eb688204.84b63"
+ "4ffb7265.aead1c",
+ "e7073ffc.39cd9"
]
]
},
{
- "id": "88ad5c25.78bab",
+ "id": "4ffb7265.aead1c",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1772.4548988342285,
- "y": 424.11108779907227,
- "z": "9aad28bb.de6b08",
+ "x": 1769.4548988342285,
+ "y": 447.1110875606537,
+ "z": "2db908be.484d28",
"wires": [
[
- "5cd57caa.022474"
+ "81b94f7b.60cfe"
]
]
},
{
- "id": "eb688204.84b63",
+ "id": "e7073ffc.39cd9",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1726.4549293518066,
- "y": 457.1111087799072,
- "z": "9aad28bb.de6b08",
+ "x": 1723.4549293518066,
+ "y": 480.11110854148865,
+ "z": "2db908be.484d28",
"wires": [
[
- "a9c84ebc.a8703"
+ "b0120e6d.fd62b"
]
]
},
{
- "id": "ae92c30c.ac766",
+ "id": "d951934c.04645",
"type": "switchNode",
"name": "switch networkid found",
"xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2486.1694145202637,
- "y": 456.78978157043457,
- "z": "9aad28bb.de6b08",
+ "x": 2483.1694145202637,
+ "y": 479.789781332016,
+ "z": "2db908be.484d28",
"wires": [
[
- "3c861008.97d8d"
+ "c85e865f.6c4118"
]
]
},
{
- "id": "3c861008.97d8d",
+ "id": "c85e865f.6c4118",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2675.121768951416,
- "y": 457.6825199127197,
- "z": "9aad28bb.de6b08",
+ "x": 2672.121768951416,
+ "y": 480.68251967430115,
+ "z": "2db908be.484d28",
"wires": [
[
- "276ddcff.2cc734"
+ "28d9a085.7b353"
]
]
},
{
- "id": "276ddcff.2cc734",
+ "id": "28d9a085.7b353",
"type": "set",
"name": "set tmp.nidx and network-data",
"xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
"comments": "",
- "x": 2908.653537750244,
- "y": 456.43252754211426,
- "z": "9aad28bb.de6b08",
+ "x": 2905.653537750244,
+ "y": 479.4325273036957,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "b1fb15f0.efbb18",
+ "id": "5286bff0.28cfd",
"type": "comment",
"name": "Find the index to service data for this network - save id in tmp.nidx, save service-data",
"info": "",
"comments": "",
- "x": 1652.5660438537598,
- "y": 391.1111011505127,
- "z": "9aad28bb.de6b08",
+ "x": 1649.5660438537598,
+ "y": 414.1111009120941,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "5cfdd79e.62ec78",
+ "id": "94a02e8f.672a9",
"type": "comment",
"name": "service-data will not be stored until we have a network-id",
"info": "",
"comments": "",
- "x": 1191.6772003173828,
- "y": 20,
- "z": "9aad28bb.de6b08",
+ "x": 1188.6772003173828,
+ "y": 42.99999976158142,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "5cd57caa.022474",
+ "id": "81b94f7b.60cfe",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
"comments": "",
- "x": 1964.2324562072754,
- "y": 422.0000858306885,
- "z": "9aad28bb.de6b08",
+ "x": 1961.2324562072754,
+ "y": 445.0000855922699,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "a9c84ebc.a8703",
+ "id": "b0120e6d.fd62b",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1893.724895477295,
- "y": 456.6656856536865,
- "z": "9aad28bb.de6b08",
+ "x": 1890.724895477295,
+ "y": 479.66568541526794,
+ "z": "2db908be.484d28",
"wires": [
[
- "58c301a.4cd9b",
- "a3b536b8.c2db88"
+ "487e294c.601868",
+ "8b184c42.8ea"
]
]
},
{
- "id": "a3b536b8.c2db88",
+ "id": "8b184c42.8ea",
"type": "switchNode",
"name": "switch tmp.nidx ",
"xml": "<switch test=\"`$tmp.nidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2122.792407989502,
- "y": 507.0228967666626,
- "z": "9aad28bb.de6b08",
+ "x": 2119.792407989502,
+ "y": 530.022896528244,
+ "z": "2db908be.484d28",
"wires": [
[
- "71b6d5f6.52251c",
- "76280ac2.a29dc4"
+ "6f1188e.df71378",
+ "4941aa7.ba31254"
]
]
},
{
- "id": "18569546.2d3f0b",
+ "id": "5f4d6f01.eacb6",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
"comments": "",
- "x": 2475.6493911743164,
- "y": 502.73713874816895,
- "z": "9aad28bb.de6b08",
+ "x": 2472.6493911743164,
+ "y": 525.7371385097504,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "71b6d5f6.52251c",
+ "id": "6f1188e.df71378",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 2294.2209434509277,
- "y": 505.59428215026855,
- "z": "9aad28bb.de6b08",
+ "x": 2291.2209434509277,
+ "y": 528.59428191185,
+ "z": "2db908be.484d28",
"wires": [
[
- "18569546.2d3f0b"
+ "5f4d6f01.eacb6"
]
]
},
{
- "id": "7ee91c34.4e4f44",
+ "id": "d3301b58.914a58",
"type": "switchNode",
"name": "switch network-level-oper-status",
"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1544.0385665893555,
- "y": 919.336389541626,
- "z": "9aad28bb.de6b08",
+ "x": 1541.0385665893555,
+ "y": 942.3363893032074,
+ "z": "2db908be.484d28",
"wires": [
[
- "9b070cdb.c3554",
- "e0410e72.9776b"
+ "df23fde1.eee29",
+ "e3ffbfd1.5bf58"
]
]
},
{
- "id": "9b070cdb.c3554",
+ "id": "df23fde1.eee29",
"type": "outcome",
"name": "outcome PendingCreate",
"xml": "<outcome value='PendingCreate'>\n",
"comments": "",
"outputs": 1,
- "x": 1909.0385462443028,
- "y": 919.3363742828369,
- "z": "9aad28bb.de6b08",
+ "x": 1906.0385462443028,
+ "y": 942.3363740444183,
+ "z": "2db908be.484d28",
"wires": [
[
- "4ebef597.bf543c"
+ "c9165975.2c8ce8"
]
]
},
{
- "id": "e0410e72.9776b",
+ "id": "e3ffbfd1.5bf58",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1859.0385932922363,
- "y": 959.336404800415,
- "z": "9aad28bb.de6b08",
+ "x": 1856.0385932922363,
+ "y": 982.3364045619965,
+ "z": "2db908be.484d28",
"wires": [
[
- "3fd77df7.1089b2"
+ "e72a7431.e545a8"
]
]
},
{
- "id": "3fd77df7.1089b2",
+ "id": "e72a7431.e545a8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
"comments": "",
- "x": 2029.0385932922363,
- "y": 959.336404800415,
- "z": "9aad28bb.de6b08",
+ "x": 2026.0385932922363,
+ "y": 982.3364045619965,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "f8a88ed3.13cf",
+ "id": "21cf404.360a8c",
"type": "switchNode",
"name": "switch network-level-oper-status",
"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1533.6415786743164,
- "y": 1114.4891605377197,
- "z": "9aad28bb.de6b08",
+ "x": 1530.6415786743164,
+ "y": 1137.4891602993011,
+ "z": "2db908be.484d28",
"wires": [
[
- "bc4211ff.d463a",
- "affa5015.d4e59",
- "f59d3b2d.cd5398"
+ "7d4ba4c2.0667bc",
+ "4d4bd64c.75d9f8",
+ "3e2015ec.34c4aa"
]
]
},
{
- "id": "bc4211ff.d463a",
+ "id": "7d4ba4c2.0667bc",
"type": "outcome",
"name": "outcome PendingCreate",
"xml": "<outcome value='PendingCreate'>\n",
"comments": "",
"outputs": 1,
- "x": 1893.6415481567383,
- "y": 1114.4891910552979,
- "z": "9aad28bb.de6b08",
+ "x": 1890.6415481567383,
+ "y": 1137.4891908168793,
+ "z": "2db908be.484d28",
"wires": [
[
- "3a9ebc21.5bb5a4"
+ "c95f430.de215c"
]
]
},
{
- "id": "affa5015.d4e59",
+ "id": "4d4bd64c.75d9f8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1849.391471862793,
- "y": 1185.9892539978027,
- "z": "9aad28bb.de6b08",
+ "x": 1846.391471862793,
+ "y": 1208.9892537593842,
+ "z": "2db908be.484d28",
"wires": [
[
- "3f9880a9.7295a"
+ "7523d96d.5d1058"
]
]
},
{
- "id": "3f9880a9.7295a",
+ "id": "7523d96d.5d1058",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Network is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
"comments": "",
- "x": 2040.7248916625977,
- "y": 1184.6558828353882,
- "z": "9aad28bb.de6b08",
+ "x": 2037.7248916625977,
+ "y": 1207.6558825969696,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "f59d3b2d.cd5398",
+ "id": "3e2015ec.34c4aa",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 1896.8717727661133,
- "y": 1152.3363590240479,
- "z": "9aad28bb.de6b08",
+ "x": 1893.8717727661133,
+ "y": 1175.3363587856293,
+ "z": "2db908be.484d28",
"wires": [
[
- "3a9ebc21.5bb5a4"
+ "c95f430.de215c"
]
]
},
{
- "id": "a87a521d.9540c",
+ "id": "7130c8aa.c3e608",
"type": "other",
"name": "changeassign",
"xml": "<outcome value='changeassign'>",
"comments": "",
"outputs": 1,
- "x": 686.0104789733887,
- "y": 465.77777099609375,
- "z": "9aad28bb.de6b08",
+ "x": 683.0104789733887,
+ "y": 488.77777075767517,
+ "z": "2db908be.484d28",
"wires": [
[
- "4c2bd72a.1c31e8"
+ "8681ccd2.61776"
]
]
},
{
- "id": "4c2bd72a.1c31e8",
+ "id": "8681ccd2.61776",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1058.2604179382324,
- "y": 462.7777624130249,
- "z": "9aad28bb.de6b08",
+ "x": 1055.2604179382324,
+ "y": 485.7777621746063,
+ "z": "2db908be.484d28",
"wires": [
[
- "9c0b8d26.ccc64",
- "8a2b1a64.939138"
+ "62930298.0b2a1c",
+ "755b61e1.5599c"
]
]
},
{
- "id": "a28b0e04.6b316",
+ "id": "8551ad66.6b965",
"type": "call",
"name": "call GENERIC-RESOURCE-API:network-topology-operation-assign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1827.0106010437012,
- "y": 160.77776336669922,
- "z": "9aad28bb.de6b08",
+ "x": 1824.0106010437012,
+ "y": 183.77776312828064,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "580a77ff.6cd088",
+ "id": "b2a344c1.b2b118",
"type": "switchNode",
"name": "switch network-level-oper-status",
"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 1122.9786567687988,
- "y": 98.72915458679199,
- "z": "9aad28bb.de6b08",
+ "x": 1119.9786567687988,
+ "y": 121.72915434837341,
+ "z": "2db908be.484d28",
"wires": [
[
- "bfcbec05.b41b2",
- "ca2b9239.fc004",
- "3e71fe57.a54f32",
- "fd7d3d8b.626ba"
+ "3cdc8b88.b67114",
+ "9df378e0.5934d8",
+ "6224bc8a.6b7094",
+ "bdfd9d9f.89385"
]
]
},
{
- "id": "bfcbec05.b41b2",
+ "id": "3cdc8b88.b67114",
"type": "outcome",
"name": "outcome PendingCreate",
"xml": "<outcome value='PendingCreate'>\n",
"comments": "",
"outputs": 1,
- "x": 1508.978702545166,
- "y": 118.72913646697998,
- "z": "9aad28bb.de6b08",
+ "x": 1505.978702545166,
+ "y": 141.7291362285614,
+ "z": "2db908be.484d28",
"wires": [
[
- "8e3a130b.a0405"
+ "903012af.85f85"
]
]
},
{
- "id": "ca2b9239.fc004",
+ "id": "9df378e0.5934d8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1456.9786987304688,
- "y": 160.72916793823242,
- "z": "9aad28bb.de6b08",
+ "x": 1453.9786987304688,
+ "y": 183.72916769981384,
+ "z": "2db908be.484d28",
"wires": [
[
- "a28b0e04.6b316"
+ "8551ad66.6b965"
]
]
},
{
- "id": "8e3a130b.a0405",
+ "id": "903012af.85f85",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
"comments": "",
- "x": 1783.9789237976074,
- "y": 114.72918510437012,
- "z": "9aad28bb.de6b08",
+ "x": 1780.9789237976074,
+ "y": 137.72918486595154,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "fd7d3d8b.626ba",
+ "id": "bdfd9d9f.89385",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 1507.010440826416,
- "y": 83.77775192260742,
- "z": "9aad28bb.de6b08",
+ "x": 1504.010440826416,
+ "y": 106.77775168418884,
+ "z": "2db908be.484d28",
"wires": [
[
- "8e3a130b.a0405"
+ "903012af.85f85"
]
]
},
{
- "id": "3e71fe57.a54f32",
+ "id": "6224bc8a.6b7094",
"type": "outcome",
"name": "outcome Created",
"xml": "<outcome value='Created'>\n",
"comments": "",
"outputs": 1,
- "x": 1487.0104789733887,
- "y": 48.777753829956055,
- "z": "9aad28bb.de6b08",
+ "x": 1484.0104789733887,
+ "y": 71.77775359153748,
+ "z": "2db908be.484d28",
"wires": [
[
- "8e3a130b.a0405"
+ "903012af.85f85"
]
]
},
{
- "id": "8a2b1a64.939138",
+ "id": "755b61e1.5599c",
"type": "call",
"name": "call GENERIC-RESOURCE-API:network-topology-operation-changeassign",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-changeassign' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1636.2568130493164,
- "y": 851.2738800048828,
- "z": "9aad28bb.de6b08",
+ "x": 1633.2568130493164,
+ "y": 874.2738797664642,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "aa217b3b.e03768",
+ "id": "c908bff.a5def4",
"type": "set",
"name": "set object-path",
"xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n",
"comments": "",
- "x": 472.5113830566406,
- "y": 1129.528715133667,
- "z": "9aad28bb.de6b08",
+ "x": 469.5113830566406,
+ "y": 1152.5287148952484,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "5dd24184.f92cb",
+ "id": "7e1abfb0.77caa",
"type": "set",
"name": "set networkId",
"xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
"comments": "",
- "x": 466.7970161437988,
- "y": 1092.385823249817,
- "z": "9aad28bb.de6b08",
+ "x": 463.7970161437988,
+ "y": 1115.3858230113983,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "c28329f4.0a0298",
+ "id": "57827229.6b2abc",
"type": "set",
"name": "set network-level-oper-status",
"xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
"comments": "",
- "x": 514.7970771789551,
- "y": 1174.9571886062622,
- "z": "9aad28bb.de6b08",
+ "x": 511.7970771789551,
+ "y": 1197.9571883678436,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "10521c9e.098fa3",
+ "id": "fb007c4b.5179",
"type": "switchNode",
"name": "switch network-information.network-instance-group-id",
"xml": "<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n\n",
"comments": "",
"outputs": 1,
- "x": 1548.4490547180176,
- "y": 683.2787666320801,
- "z": "9aad28bb.de6b08",
+ "x": 1545.4490547180176,
+ "y": 706.2787663936615,
+ "z": "2db908be.484d28",
"wires": [
[
- "9cd01d18.8e54",
- "b7c9f72f.a87b48"
+ "9d79b615.01e948",
+ "249b5309.c2bf1c"
]
]
},
{
- "id": "9cd01d18.8e54",
+ "id": "9d79b615.01e948",
"type": "other",
"name": "Other",
"xml": "<outcome value='Other'>",
"comments": "",
"outputs": 1,
- "x": 1835.1989364624023,
- "y": 721.4454336166382,
- "z": "9aad28bb.de6b08",
+ "x": 1832.1989364624023,
+ "y": 744.4454333782196,
+ "z": "2db908be.484d28",
"wires": [
[
- "a5779725.1836a8"
+ "6a373b7d.6814a4"
]
]
},
{
- "id": "b7c9f72f.a87b48",
+ "id": "249b5309.c2bf1c",
"type": "other",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 1832.8658332824707,
- "y": 688.4453077316284,
- "z": "9aad28bb.de6b08",
+ "x": 1829.8658332824707,
+ "y": 711.4453074932098,
+ "z": "2db908be.484d28",
"wires": [
[
- "92ce5cf3.bc142"
+ "a9c385b1.781fe8"
]
]
},
{
- "id": "92ce5cf3.bc142",
+ "id": "a9c385b1.781fe8",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='' value='' />\n",
"comments": "",
- "x": 1993.199062347412,
- "y": 685.4453649520874,
- "z": "9aad28bb.de6b08",
+ "x": 1990.199062347412,
+ "y": 708.4453647136688,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "434328af.62d878",
+ "id": "c0c595e2.aa8d28",
"type": "switchNode",
"name": "service-data.network-instance-groups.network-instance-group_length",
"xml": "<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 2328.2746772766113,
- "y": 714.7111825942993,
- "z": "9aad28bb.de6b08",
+ "x": 2325.2746772766113,
+ "y": 737.7111823558807,
+ "z": "2db908be.484d28",
"wires": [
[
- "b36d81f7.3394d",
- "af36bb73.fa73d8"
+ "f9db9f35.7e7",
+ "581dba4.d6ec244"
]
]
},
{
- "id": "b36d81f7.3394d",
+ "id": "f9db9f35.7e7",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 2687.524368286133,
- "y": 671.7111854553223,
- "z": "9aad28bb.de6b08",
+ "x": 2684.524368286133,
+ "y": 694.7111852169037,
+ "z": "2db908be.484d28",
"wires": [
[
- "14e27ae6.5357e5"
+ "5de331e2.b21f2"
]
]
},
{
- "id": "af36bb73.fa73d8",
+ "id": "581dba4.d6ec244",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2667.524368286133,
- "y": 706.7111854553223,
- "z": "9aad28bb.de6b08",
+ "x": 2664.524368286133,
+ "y": 729.7111852169037,
+ "z": "2db908be.484d28",
"wires": [
[
- "c46e6f.e0c8b19"
+ "c0ff470a.8d1c68"
]
]
},
{
- "id": "a5779725.1836a8",
+ "id": "6a373b7d.6814a4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1969.3101921081543,
- "y": 721.889838218689,
- "z": "9aad28bb.de6b08",
+ "x": 1966.3101921081543,
+ "y": 744.8898379802704,
+ "z": "2db908be.484d28",
"wires": [
[
- "434328af.62d878"
+ "c0c595e2.aa8d28"
]
]
},
{
- "id": "704254e7.9457ec",
+ "id": "7d8245f1.d453ec",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 4091.5181846618652,
- "y": 649.9217891693115,
- "z": "9aad28bb.de6b08",
+ "x": 4088.5181846618652,
+ "y": 672.921788930893,
+ "z": "2db908be.484d28",
"wires": [
[
- "c1e82544.f95008"
+ "1e1e6239.fb4e8e"
]
]
},
{
- "id": "909b166d.5228d8",
+ "id": "fbc8dfca.d5c4e",
"type": "set",
"name": "set tmp.ngidx and ctx.network-instance-group-data",
"xml": "<set>\n<parameter name='tmp.ngidx' value='`$ngidx`' />\n<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />\n",
"comments": "",
- "x": 4534.050151824951,
- "y": 649.6718139648438,
- "z": "9aad28bb.de6b08",
+ "x": 4531.050151824951,
+ "y": 672.6718137264252,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "c1e82544.f95008",
+ "id": "1e1e6239.fb4e8e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 4240.136623382568,
- "y": 649.778974533081,
- "z": "9aad28bb.de6b08",
+ "x": 4237.136623382568,
+ "y": 672.7789742946625,
+ "z": "2db908be.484d28",
"wires": [
[
- "909b166d.5228d8"
+ "fbc8dfca.d5c4e"
]
]
},
{
- "id": "b3d1c50c.fca068",
+ "id": "c50d7ac.b94b688",
"type": "for",
"name": "for ngidx..service-data.network-instance-groups.network-instance-group[]",
"xml": "<for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 3274.386589050293,
- "y": 710.0287618637085,
- "z": "9aad28bb.de6b08",
+ "x": 3271.386589050293,
+ "y": 733.0287616252899,
+ "z": "2db908be.484d28",
"wires": [
[
- "7b57f8f2.c90d48"
+ "6bc50ed2.e98f"
]
]
},
{
- "id": "7b57f8f2.c90d48",
+ "id": "6bc50ed2.e98f",
"type": "switchNode",
"name": "switch network-instance-group-id found",
"xml": "<switch test=\"`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 3719.815185546875,
- "y": 709.7789306640625,
- "z": "9aad28bb.de6b08",
+ "x": 3716.815185546875,
+ "y": 732.7789304256439,
+ "z": "2db908be.484d28",
"wires": [
[
- "704254e7.9457ec"
+ "7d8245f1.d453ec"
]
]
},
{
- "id": "c46e6f.e0c8b19",
+ "id": "c0ff470a.8d1c68",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2886.3704681396484,
- "y": 707.9046869277954,
- "z": "9aad28bb.de6b08",
+ "x": 2883.3704681396484,
+ "y": 730.9046866893768,
+ "z": "2db908be.484d28",
"wires": [
[
- "b3d1c50c.fca068"
+ "c50d7ac.b94b688"
]
]
},
{
- "id": "14e27ae6.5357e5",
+ "id": "5de331e2.b21f2",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data\" />\n",
"comments": "",
- "x": 2879.074020385742,
- "y": 671.2787523269653,
- "z": "9aad28bb.de6b08",
+ "x": 2876.074020385742,
+ "y": 694.2787520885468,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "76280ac2.a29dc4",
+ "id": "4941aa7.ba31254",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2293.7565956115723,
- "y": 536.5238647460938,
- "z": "9aad28bb.de6b08",
+ "x": 2290.7565956115723,
+ "y": 559.5238645076752,
+ "z": "2db908be.484d28",
"wires": [
[
- "d6b32cf3.dcd68"
+ "c2ba8bb7.5d1488"
]
]
},
{
- "id": "d6b32cf3.dcd68",
+ "id": "c2ba8bb7.5d1488",
"type": "set",
"name": "set nidx",
"xml": "<set>\n<parameter name='nidx' value='`$tmp.nidx`' />\n",
"comments": "",
- "x": 2450.7565956115723,
- "y": 537.5238647460938,
- "z": "9aad28bb.de6b08",
+ "x": 2447.7565956115723,
+ "y": 560.5238645076752,
+ "z": "2db908be.484d28",
"wires": []
},
{
- "id": "e703e8d7.7187b8",
+ "id": "28e87a49.f59c96",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 875.1215934753418,
- "y": 323.2326765060425,
- "z": "9aad28bb.de6b08",
+ "x": 872.1215934753418,
+ "y": 346.2326762676239,
+ "z": "2db908be.484d28",
"wires": [
[
- "ab621132.6111e",
- "503d49e7.558b48",
- "79aaad9.716b554",
- "7fc79916.fb5438"
+ "32d531df.85499e",
+ "4bb6e988.fe7c58",
+ "e792c2b8.ea131",
+ "960249a0.73e4e8"
]
]
},
{
- "id": "ab621132.6111e",
+ "id": "32d531df.85499e",
"type": "outcome",
"name": "ActivateDCINetworkInstance",
"xml": "<outcome value='ActivateDCINetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1135.4548149108887,
- "y": 268.2324924468994,
- "z": "9aad28bb.de6b08",
+ "x": 1132.4548149108887,
+ "y": 291.23249220848083,
+ "z": "2db908be.484d28",
"wires": [
[
- "cac59810.e65568"
+ "b83bfcdc.13d1a"
]
]
},
{
- "id": "cac59810.e65568",
+ "id": "b83bfcdc.13d1a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1581.4549140930176,
- "y": 269.8993225097656,
- "z": "9aad28bb.de6b08",
+ "x": 1578.4549140930176,
+ "y": 292.89932227134705,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "503d49e7.558b48",
+ "id": "4bb6e988.fe7c58",
"type": "outcome",
"name": "other",
"xml": "<outcome value='other'>",
"comments": "",
"outputs": 1,
- "x": 1071.454833984375,
- "y": 361.89923095703125,
- "z": "9aad28bb.de6b08",
+ "x": 1068.454833984375,
+ "y": 384.89923071861267,
+ "z": "2db908be.484d28",
"wires": [
[
- "5517cc3b.5b0904"
+ "389876cb.1e467a"
]
]
},
{
- "id": "c572c289.cadd5",
+ "id": "8e1c520d.d2576",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 879.6771430969238,
- "y": 564.6770572662354,
- "z": "9aad28bb.de6b08",
+ "x": 876.6771430969238,
+ "y": 587.6770570278168,
+ "z": "2db908be.484d28",
"wires": [
[
- "b98e948a.2ccfb8",
- "5cdec052.1da21",
- "16f91dec.cb7af2",
- "625d77ac.1d4f58"
+ "5eb403c4.8c424c",
+ "124ca478.59aa4c",
+ "49021010.79466",
+ "2ff099ca.196ee6"
]
]
},
{
- "id": "b98e948a.2ccfb8",
+ "id": "5eb403c4.8c424c",
"type": "outcome",
"name": "DeactivateSOTNConnectivityInstance",
"xml": "<outcome value='DeactivateSOTNConnectivityInstance'>",
"comments": "",
"outputs": 1,
- "x": 1169.455020904541,
- "y": 508.8991947174072,
- "z": "9aad28bb.de6b08",
+ "x": 1166.455020904541,
+ "y": 531.8991944789886,
+ "z": "2db908be.484d28",
"wires": [
[
- "2cfdfb08.ec09b4"
+ "152c7bc7.994c24"
]
]
},
{
- "id": "5cdec052.1da21",
+ "id": "124ca478.59aa4c",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1077.8999862670898,
- "y": 656.5907688140869,
- "z": "9aad28bb.de6b08",
+ "x": 1074.8999862670898,
+ "y": 679.5907685756683,
+ "z": "2db908be.484d28",
"wires": [
[
- "1e922072.6c693"
+ "c28aa9c7.571d18"
]
]
},
{
- "id": "2cfdfb08.ec09b4",
+ "id": "152c7bc7.994c24",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1629.8121376037598,
- "y": 510.18252182006836,
- "z": "9aad28bb.de6b08",
+ "x": 1626.8121376037598,
+ "y": 533.1825215816498,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "31fb5db9.aec912",
+ "id": "1591e42d.e2cabc",
"type": "other",
"name": "create",
"xml": "<outcome value='create'>\n",
"comments": "",
"outputs": 1,
- "x": 665.3439102172852,
- "y": 904.0105962753296,
- "z": "9aad28bb.de6b08",
+ "x": 662.3439102172852,
+ "y": 927.010596036911,
+ "z": "2db908be.484d28",
"wires": [
[
- "b39f385b.dd8e48"
+ "a09e2b38.714a58"
]
]
},
{
- "id": "b39f385b.dd8e48",
+ "id": "a09e2b38.714a58",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 865.6577301025391,
- "y": 903.7882690429688,
- "z": "9aad28bb.de6b08",
+ "x": 862.6577301025391,
+ "y": 926.7882688045502,
+ "z": "2db908be.484d28",
"wires": [
[
- "de767c6b.834f1",
- "6bdbc712.18ec58",
- "c75bd3e1.bc391"
+ "123388e8.cc22d7",
+ "e823c269.0d884",
+ "fe173c3b.37ab5"
]
]
},
{
- "id": "24acb0b8.15f98",
+ "id": "d1b59f6c.66aa3",
"type": "other",
"name": "delete",
"xml": "<outcome value='delete'>\n",
"comments": "",
"outputs": 1,
- "x": 663.3439140319824,
- "y": 981.0106000900269,
- "z": "9aad28bb.de6b08",
+ "x": 660.3439140319824,
+ "y": 1004.0105998516083,
+ "z": "2db908be.484d28",
"wires": [
[
- "7e743816.5d9958"
+ "f91ae971.a2f4f8"
]
]
},
{
- "id": "7e743816.5d9958",
+ "id": "f91ae971.a2f4f8",
"type": "switchNode",
"name": "switch request-action",
"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
"comments": "",
"outputs": 1,
- "x": 865.6321716308594,
- "y": 982.071400642395,
- "z": "9aad28bb.de6b08",
+ "x": 862.6321716308594,
+ "y": 1005.0714004039764,
+ "z": "2db908be.484d28",
"wires": [
[
- "8f457dbf.8b07b",
- "915d81d7.e103a",
- "c7012119.b3554"
+ "81ef432e.c5cd2",
+ "dac05fa.465e7a",
+ "ad7b9fb5.8def5"
]
]
},
{
- "id": "c02f2b27.1444e8",
+ "id": "4debc446.71044c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1609.4551811218262,
- "y": 1338.8993883132935,
- "z": "9aad28bb.de6b08",
+ "x": 1606.4551811218262,
+ "y": 1361.8993880748749,
+ "z": "2db908be.484d28",
"wires": [
[
- "f7aee00f.2cad"
+ "a33b166a.24fd28"
]
]
},
{
- "id": "afea4e67.794a",
+ "id": "21f7416d.44262e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1581.8996543884277,
- "y": 1537.454912662506,
- "z": "9aad28bb.de6b08",
+ "x": 1578.8996543884277,
+ "y": 1560.4549124240875,
+ "z": "2db908be.484d28",
"wires": [
[
- "1b882c62.b4d5c4"
+ "c3e850c.08aaab"
]
]
},
{
- "id": "f7aee00f.2cad",
+ "id": "a33b166a.24fd28",
"type": "call",
"name": "call GENERIC-RESOURCE-API:network-topology-operation-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1974.1216773986816,
- "y": 1338.3440103530884,
- "z": "9aad28bb.de6b08",
+ "x": 1971.1216773986816,
+ "y": 1361.3440101146698,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "1b882c62.b4d5c4",
+ "id": "c3e850c.08aaab",
"type": "call",
"name": "call GENERIC-RESOURCE-API:network-topology-operation-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1946.8995780944824,
- "y": 1536.4548411369324,
- "z": "9aad28bb.de6b08",
+ "x": 1943.8995780944824,
+ "y": 1559.4548408985138,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "de767c6b.834f1",
+ "id": "123388e8.cc22d7",
"type": "outcome",
"name": "other",
"xml": "<outcome value='other'>",
"comments": "",
"outputs": 1,
- "x": 1427.65771484375,
- "y": 1340.677001953125,
- "z": "9aad28bb.de6b08",
+ "x": 1424.65771484375,
+ "y": 1363.6770017147064,
+ "z": "2db908be.484d28",
"wires": [
[
- "c02f2b27.1444e8"
+ "4debc446.71044c"
]
]
},
{
- "id": "6bdbc712.18ec58",
+ "id": "e823c269.0d884",
"type": "outcome",
"name": "CreateSOTNConnectivityInstance",
"xml": "<outcome value='CreateSOTNConnectivityInstance'>",
"comments": "",
"outputs": 1,
- "x": 1507.3244438171387,
- "y": 1241.4549032608047,
- "z": "9aad28bb.de6b08",
+ "x": 1504.3244438171387,
+ "y": 1264.4549030223861,
+ "z": "2db908be.484d28",
"wires": [
[
- "cc35726f.72d91"
+ "f75de23d.a281"
]
]
},
{
- "id": "cc35726f.72d91",
+ "id": "f75de23d.a281",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1986.2132606506348,
- "y": 1243.6770855346695,
- "z": "9aad28bb.de6b08",
+ "x": 1983.2132606506348,
+ "y": 1266.6770852962509,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "915d81d7.e103a",
+ "id": "dac05fa.465e7a",
"type": "outcome",
"name": "DeleteSOTNConnectivityInstance",
"xml": "<outcome value='DeleteSOTNConnectivityInstance'>",
"comments": "",
"outputs": 1,
- "x": 1504.7435417175293,
- "y": 1434.6269526481628,
- "z": "9aad28bb.de6b08",
+ "x": 1501.7435417175293,
+ "y": 1457.6269524097443,
+ "z": "2db908be.484d28",
"wires": [
[
- "ffefe985.e53578"
+ "37fda84e.b42608"
]
]
},
{
- "id": "ffefe985.e53578",
+ "id": "37fda84e.b42608",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1971.6323585510254,
- "y": 1436.8491349220276,
- "z": "9aad28bb.de6b08",
+ "x": 1968.6323585510254,
+ "y": 1459.849134683609,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "8f457dbf.8b07b",
+ "id": "81ef432e.c5cd2",
"type": "outcome",
"name": "other",
"xml": "<outcome value='other'>",
"comments": "",
"outputs": 1,
- "x": 1424.0767822265625,
- "y": 1541.8489990234375,
- "z": "9aad28bb.de6b08",
+ "x": 1421.0767822265625,
+ "y": 1564.848998785019,
+ "z": "2db908be.484d28",
"wires": [
[
- "afea4e67.794a"
+ "21f7416d.44262e"
]
]
},
{
- "id": "79aaad9.716b554",
+ "id": "e792c2b8.ea131",
"type": "outcome",
"name": "ActivateSOTNConnectivityInstance",
"xml": "<outcome value='ActivateSOTNConnectivityInstance'>",
"comments": "",
"outputs": 1,
- "x": 1158.4548530578613,
- "y": 223.01040077209473,
- "z": "9aad28bb.de6b08",
+ "x": 1155.4548530578613,
+ "y": 246.01040053367615,
+ "z": "2db908be.484d28",
"wires": [
[
- "a1756e2.236019"
+ "284dd097.c8e25"
]
]
},
{
- "id": "a1756e2.236019",
+ "id": "284dd097.c8e25",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1583.6770095825195,
- "y": 219.24494327697903,
- "z": "9aad28bb.de6b08",
+ "x": 1580.6770095825195,
+ "y": 242.24494303856045,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "16f91dec.cb7af2",
+ "id": "49021010.79466",
"type": "outcome",
"name": "DeActivateDCINetworkInstance",
"xml": "<outcome value='DeActivateDCINetworkInstance'>",
"comments": "",
"outputs": 1,
- "x": 1149.5555610656738,
- "y": 551.9999942779541,
- "z": "9aad28bb.de6b08",
+ "x": 1146.5555610656738,
+ "y": 574.9999940395355,
+ "z": "2db908be.484d28",
"wires": [
[
- "20c06620.a7484a"
+ "8f0d395a.fe6d58"
]
]
},
{
- "id": "20c06620.a7484a",
+ "id": "8f0d395a.fe6d58",
"type": "call",
"name": "call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1624.5557823181152,
- "y": 550.6668124198914,
- "z": "9aad28bb.de6b08",
+ "x": 1621.5557823181152,
+ "y": 573.6668121814728,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "7fc79916.fb5438",
+ "id": "960249a0.73e4e8",
"type": "outcome",
"name": "ActivateSDWANConnectivityInstance",
"xml": "<outcome value='ActivateSDWANConnectivityInstance'>",
"comments": "",
"outputs": 1,
- "x": 1155.0000228881836,
- "y": 318.0000190734863,
- "z": "9aad28bb.de6b08",
+ "x": 1152.0000228881836,
+ "y": 341.00001883506775,
+ "z": "2db908be.484d28",
"wires": [
[
- "8f8df3ac.f43bf"
+ "8e724d0c.12ad"
]
]
},
{
- "id": "8f8df3ac.f43bf",
+ "id": "8e724d0c.12ad",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-network-topology-operation-activate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-activate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1598.0002136230469,
- "y": 315.66684770584106,
- "z": "9aad28bb.de6b08",
+ "x": 1595.0002136230469,
+ "y": 338.6668474674225,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "625d77ac.1d4f58",
+ "id": "2ff099ca.196ee6",
"type": "outcome",
"name": "DeactivateSDWANConnectivityInstance",
"xml": "<outcome value='DeactivateSDWANConnectivityInstance'>",
"comments": "",
"outputs": 1,
- "x": 1167,
- "y": 605,
- "z": "9aad28bb.de6b08",
+ "x": 1164,
+ "y": 627.9999997615814,
+ "z": "2db908be.484d28",
"wires": [
[
- "3bbfdab2.224de6"
+ "5313db5b.ba3784"
]
]
},
{
- "id": "3bbfdab2.224de6",
+ "id": "5313db5b.ba3784",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-network-topology-operation-deactivate",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-deactivate' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1610.0001907348633,
- "y": 602.6668286323547,
- "z": "9aad28bb.de6b08",
+ "x": 1607.0001907348633,
+ "y": 625.6668283939362,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "c75bd3e1.bc391",
+ "id": "fe173c3b.37ab5",
"type": "outcome",
"name": "CreateSDWANConnectivityInstance",
"xml": "<outcome value='CreateSDWANConnectivityInstance'>",
"comments": "",
"outputs": 1,
- "x": 1513,
- "y": 1290,
- "z": "9aad28bb.de6b08",
+ "x": 1510,
+ "y": 1312.9999997615814,
+ "z": "2db908be.484d28",
"wires": [
[
- "db52f061.34611"
+ "55f558b0.f98bd8"
]
]
},
{
- "id": "db52f061.34611",
+ "id": "55f558b0.f98bd8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-network-topology-operation-create",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1956.0001907348633,
- "y": 1287.6668286323547,
- "z": "9aad28bb.de6b08",
+ "x": 1953.0001907348633,
+ "y": 1310.6668283939362,
+ "z": "2db908be.484d28",
"wires": [
[]
]
},
{
- "id": "c7012119.b3554",
+ "id": "ad7b9fb5.8def5",
"type": "outcome",
"name": "DeleteSDWANConnectivityInstance",
"xml": "<outcome value='DeleteSDWANConnectivityInstance'>",
"comments": "",
"outputs": 1,
- "x": 1506,
- "y": 1485,
- "z": "9aad28bb.de6b08",
+ "x": 1503,
+ "y": 1507.9999997615814,
+ "z": "2db908be.484d28",
"wires": [
[
- "c57dac36.dcf83"
+ "483a39e2.dfbcc8"
]
]
},
{
- "id": "c57dac36.dcf83",
+ "id": "483a39e2.dfbcc8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sdwan-network-topology-operation-delete",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-delete' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1972.888816833496,
- "y": 1487.2221822738647,
- "z": "9aad28bb.de6b08",
+ "x": 1969.888816833496,
+ "y": 1510.2221820354462,
+ "z": "2db908be.484d28",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "3a527742.291048",
+ "type": "other",
+ "name": "reoptimize",
+ "xml": "<outcome value='reoptimize'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 653,
+ "y": 1074,
+ "z": "2db908be.484d28",
+ "wires": [
+ [
+ "8989e10f.fcf5f"
+ ]
+ ]
+ },
+ {
+ "id": "8989e10f.fcf5f",
+ "type": "switchNode",
+ "name": "switch request-action",
+ "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 842,
+ "y": 1076,
+ "z": "2db908be.484d28",
+ "wires": [
+ [
+ "c0517ae5.fea898"
+ ]
+ ]
+ },
+ {
+ "id": "c0517ae5.fea898",
+ "type": "outcome",
+ "name": "ReoptimizeSOTNInstance",
+ "xml": "<outcome value='ReoptimizeSOTNInstance'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1472,
+ "y": 1641,
+ "z": "2db908be.484d28",
+ "wires": [
+ [
+ "70bb459.77727bc"
+ ]
+ ]
+ },
+ {
+ "id": "70bb459.77727bc",
+ "type": "call",
+ "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-reoptimize",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-reoptimize' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1913,
+ "y": 1636,
+ "z": "2db908be.484d28",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
index 76e0f703..d123bd70 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
@@ -1,20 +1,20 @@
[
{
- "id": "c38bd7d5.df77b8",
+ "id": "a907ba2f.81c9d8",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 220.00390625,
- "y": 142.00390625,
- "z": "152c5971.7ac927",
+ "x": 97,
+ "y": 49,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "9db33c19.af792"
+ "46194736.3f09f8"
]
]
},
{
- "id": "9db33c19.af792",
+ "id": "46194736.3f09f8",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,712 +22,793 @@
"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": 432.00391006469727,
- "y": 214.0039234161377,
- "z": "152c5971.7ac927",
+ "x": 275.00000381469727,
+ "y": 114.0000171661377,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "d521798b.eb0348"
+ "5cc16d87.a8a744"
]
]
},
{
- "id": "d521798b.eb0348",
+ "id": "5cc16d87.a8a744",
"type": "method",
"name": "sdwan-get-site-param",
"xml": "<method rpc='sdwan-get-site-param' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 420.0040283203125,
- "y": 302.00390625,
- "z": "152c5971.7ac927",
+ "x": 263.0001220703125,
+ "y": 202,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "71ba9c6d.9a9864"
+ "2fcad45c.204f2c"
]
]
},
{
- "id": "71ba9c6d.9a9864",
+ "id": "2fcad45c.204f2c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 427.00392150878906,
- "y": 388.0039644241333,
- "z": "152c5971.7ac927",
+ "x": 270.00001525878906,
+ "y": 288.0000581741333,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "b3f4200f.57507"
+ "a59bab93.b75108"
]
]
},
{
- "id": "b3f4200f.57507",
+ "id": "a59bab93.b75108",
"type": "for",
"name": "for each sdwan-get-request-input-param",
"xml": "<for index='idx' start='0' end='`$vnf-request-input.vnf-input-parameters.param_length`' >\n\n",
"comments": "",
"outputs": 1,
- "x": 463.6706848144531,
- "y": 470.670560836792,
- "z": "152c5971.7ac927",
+ "x": 306.6667785644531,
+ "y": 370.666654586792,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "6800f034.117f8"
+ "e896db23.035228"
]
]
},
{
- "id": "6800f034.117f8",
+ "id": "e896db23.035228",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 750.5042343139648,
- "y": 388.00400829315186,
- "z": "152c5971.7ac927",
+ "x": 593.5003280639648,
+ "y": 288.00010204315186,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "a6377b98.e830f8",
- "517edbd2.91b704",
- "a701284f.455118",
- "ca16c569.719ab8",
- "86e64461.d62ec8",
- "c6f06bc6.074328",
- "24b313e.2bb53ec",
- "3a793fa2.7f94e",
- "fee596dc.022e48",
- "2bb40b1d.ca77f4",
- "663914f5.d948fc",
- "9a6d9a43.210478",
- "d3c58875.e0f958"
+ "17beedf5.3fa3a2",
+ "9658f5ce.551378",
+ "9f759735.d76cd8",
+ "9966cd8b.1697a",
+ "11d51c5.93463e4",
+ "8cb0a11.7bd686",
+ "5f3ab5eb.71688c",
+ "ca7858b9.e061c8",
+ "5ff23f08.f8215",
+ "5dd3c67.a478d38",
+ "4f1e9b40.0d5344",
+ "32f8d4e8.435a2c",
+ "3e3aefd6.843cc"
]
]
},
{
- "id": "a6377b98.e830f8",
+ "id": "17beedf5.3fa3a2",
"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": 954.0049743652344,
- "y": 757.004668712616,
- "z": "152c5971.7ac927",
+ "x": 795.001106262207,
+ "y": 721.0007653236389,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "517edbd2.91b704",
+ "id": "9658f5ce.551378",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 970.0039443969727,
- "y": 184.003981590271,
- "z": "152c5971.7ac927",
+ "x": 813.0000381469727,
+ "y": 84.000075340271,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "7a153116.0d4e7"
+ "1180c11c.4e5d3f"
]
]
},
{
- "id": "7a153116.0d4e7",
+ "id": "1180c11c.4e5d3f",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1112.0039443969727,
- "y": 185.003981590271,
- "z": "152c5971.7ac927",
+ "x": 955.0000381469727,
+ "y": 85.000075340271,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "d8a2309b.8475f"
+ "c4a1ef6b.cb92a"
]
]
},
{
- "id": "d8a2309b.8475f",
+ "id": "c4a1ef6b.cb92a",
"type": "set",
"name": "set name",
"xml": "<set>\n<parameter name='prop.site.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1246.0039443969727,
- "y": 185.60398769378662,
- "z": "152c5971.7ac927",
+ "x": 1089.0000381469727,
+ "y": 85.60008144378662,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "a701284f.455118",
+ "id": "9f759735.d76cd8",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 966.0040512084961,
- "y": 275.0039396286011,
- "z": "152c5971.7ac927",
+ "x": 809.0001449584961,
+ "y": 175.00003337860107,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "de455822.f8ce78"
+ "d7f5a60b.3b5968"
]
]
},
{
- "id": "de455822.f8ce78",
+ "id": "d7f5a60b.3b5968",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1144.0040645599365,
- "y": 278.0039396286011,
- "z": "152c5971.7ac927",
+ "x": 987.0001583099365,
+ "y": 178.00003337860107,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "78b4f47e.c7bfcc"
+ "a9112d64.3441b"
]
]
},
{
- "id": "78b4f47e.c7bfcc",
+ "id": "a9112d64.3441b",
"type": "set",
"name": "set name",
"xml": "<set>\n<parameter name='prop.site.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1291.0040740966797,
- "y": 277.6039352416992,
- "z": "152c5971.7ac927",
+ "x": 1134.0001678466797,
+ "y": 177.60002899169922,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "2bb40b1d.ca77f4",
+ "id": "5dd3c67.a478d38",
"type": "switchNode",
"name": "switch type",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'type'`\">\n",
"comments": "",
"outputs": 1,
- "x": 944.8997230529785,
- "y": 572.9773893356323,
- "z": "152c5971.7ac927",
+ "x": 787.8958168029785,
+ "y": 472.9734830856323,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "8bb0abec.ed7288"
+ "abf743a3.45204"
]
]
},
{
- "id": "8bb0abec.ed7288",
- "type": "outcomeTrue",
- "name": "true",
- "xml": "<outcome value='true'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1123.8995666503906,
- "y": 573.9773092269897,
- "z": "152c5971.7ac927",
- "wires": [
- [
- "bb6bcb71.b39508"
- ]
- ]
- },
- {
- "id": "bb6bcb71.b39508",
+ "id": "59ff6271.db05ec",
"type": "set",
"name": "set type",
"xml": "<set>\n<parameter name='prop.site.type' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n<parameter name='prop.site.sdwan' value='true' />",
"comments": "",
- "x": 1273.8995780944824,
- "y": 575.5773239135742,
- "z": "152c5971.7ac927",
+ "x": 1439.8958778381348,
+ "y": 526.5734176635742,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "663914f5.d948fc",
+ "id": "4f1e9b40.0d5344",
"type": "switchNode",
"name": "switch role",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'role'`\">\n",
"comments": "",
"outputs": 1,
- "x": 945.8993988037109,
- "y": 616.9774293899536,
- "z": "152c5971.7ac927",
+ "x": 786.8955307006836,
+ "y": 580.9735260009766,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "a0fc9634.928638"
+ "30daf487.0dff4c"
]
]
},
{
- "id": "a0fc9634.928638",
+ "id": "30daf487.0dff4c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1115.8994064331055,
- "y": 626.9773921966553,
- "z": "152c5971.7ac927",
+ "x": 956.8955383300781,
+ "y": 590.9734888076782,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "55d77248.d68a9c"
+ "685d8c42.5d6ca4"
]
]
},
{
- "id": "ca16c569.719ab8",
+ "id": "9966cd8b.1697a",
"type": "switchNode",
"name": "switch location-name",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'location-name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 988.8992385864258,
- "y": 316.9772481918335,
- "z": "152c5971.7ac927",
+ "x": 831.8953323364258,
+ "y": 216.9733419418335,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "4c784934.a87448"
+ "cc9616ce.430f58"
]
]
},
{
- "id": "4c784934.a87448",
+ "id": "cc9616ce.430f58",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1152.8994102478027,
- "y": 316.9772491455078,
- "z": "152c5971.7ac927",
+ "x": 995.8955039978027,
+ "y": 216.9733428955078,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "3e756eb.d90f392"
+ "ec0a2191.fba48"
]
]
},
{
- "id": "3e756eb.d90f392",
+ "id": "ec0a2191.fba48",
"type": "set",
"name": "set location-name",
"xml": "<set>\n<parameter name='prop.site.location-name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1314.8994216918945,
- "y": 316.5773057937622,
- "z": "152c5971.7ac927",
+ "x": 1157.8955154418945,
+ "y": 216.5733995437622,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "86e64461.d62ec8",
+ "id": "11d51c5.93463e4",
"type": "switchNode",
"name": "switch address",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'address'`\">\n",
"comments": "",
"outputs": 1,
- "x": 971.8992385864258,
- "y": 352.97725200653076,
- "z": "152c5971.7ac927",
+ "x": 814.8953323364258,
+ "y": 252.97334575653076,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "4b7d0893.6d1a98"
+ "c8c98295.92206"
]
]
},
{
- "id": "4b7d0893.6d1a98",
+ "id": "c8c98295.92206",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1141.8990859985352,
- "y": 360.97725105285645,
- "z": "152c5971.7ac927",
+ "x": 984.8951797485352,
+ "y": 260.97334480285645,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "2c26a847.9d4008"
+ "c8183604.5bf978"
]
]
},
{
- "id": "2c26a847.9d4008",
+ "id": "c8183604.5bf978",
"type": "set",
"name": "set location-address",
"xml": "<set>\n<parameter name='prop.site.location-address' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1329.8992614746094,
- "y": 356.57722663879395,
- "z": "152c5971.7ac927",
+ "x": 1172.8953552246094,
+ "y": 256.57332038879395,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "c6f06bc6.074328",
+ "id": "8cb0a11.7bd686",
"type": "switchNode",
"name": "switch postcode",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'postcode'`\">\n",
"comments": "",
"outputs": 1,
- "x": 972.8992385864258,
- "y": 394.9772129058838,
- "z": "152c5971.7ac927",
+ "x": 815.8953323364258,
+ "y": 294.9733066558838,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "af6ba3e1.07f47"
+ "164b8673.bea07a"
]
]
},
{
- "id": "af6ba3e1.07f47",
+ "id": "164b8673.bea07a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1137.8994102478027,
- "y": 393.9772129058838,
- "z": "152c5971.7ac927",
+ "x": 980.8955039978027,
+ "y": 293.9733066558838,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "2e6a288b.539db8"
+ "9880bf16.cc774"
]
]
},
{
- "id": "2e6a288b.539db8",
+ "id": "9880bf16.cc774",
"type": "set",
"name": "set location-postcode",
"xml": "<set>\n<parameter name='prop.site.location-postcode' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1324.8992614746094,
- "y": 395.5772294998169,
- "z": "152c5971.7ac927",
+ "x": 1167.8953552246094,
+ "y": 295.5733232498169,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "9a6d9a43.210478",
+ "id": "32f8d4e8.435a2c",
"type": "switchNode",
"name": "switch controlPoint",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'controlPoint'`\">\n",
"comments": "",
"outputs": 1,
- "x": 964.7826232910156,
- "y": 677.0042304992676,
- "z": "152c5971.7ac927",
+ "x": 805.7787551879883,
+ "y": 641.0003271102905,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "610c92a.a595c6c"
+ "f9a2e4bf.e893d8"
]
]
},
{
- "id": "610c92a.a595c6c",
+ "id": "f9a2e4bf.e893d8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1126.7825469970703,
- "y": 673.0042533874512,
- "z": "152c5971.7ac927",
+ "x": 967.778678894043,
+ "y": 637.0003499984741,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "be722424.9e5438"
+ "2b1dae74.689ae2"
]
]
},
{
- "id": "64aa63f1.8e581c",
+ "id": "cdec920f.b6fa4",
"type": "set",
"name": "set role",
"xml": "<set>\n<parameter name='prop.site.role' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n\n",
"comments": "",
- "x": 1487.7826957702637,
- "y": 603.0041675567627,
- "z": "152c5971.7ac927",
+ "x": 1339.7788467407227,
+ "y": 565.0002994537354,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "79665fbb.1aeb5",
+ "id": "f025176.9eb87e8",
"type": "set",
"name": "set controlPoint",
"xml": "<set>\n<parameter name='prop.site.controlPoint' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n\n",
"comments": "",
- "x": 1511.7825736999512,
- "y": 693.0042514801025,
- "z": "152c5971.7ac927",
+ "x": 1352.7787055969238,
+ "y": 657.0003480911255,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "adfd7aba.7276f8",
+ "id": "95df77a9.2015c8",
"type": "execute",
"name": "execute split roles",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.site.role`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.site.roles\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1526.4489212036133,
- "y": 650.0040855407715,
- "z": "152c5971.7ac927",
+ "x": 1367.445053100586,
+ "y": 614.0001821517944,
+ "z": "94b1afc3.a0dc",
"wires": [
[]
]
},
{
- "id": "55d77248.d68a9c",
+ "id": "685d8c42.5d6ca4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1273.4490585327148,
- "y": 630.0040855407715,
- "z": "152c5971.7ac927",
+ "x": 1114.4451904296875,
+ "y": 594.0001821517944,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "64aa63f1.8e581c",
- "adfd7aba.7276f8"
+ "cdec920f.b6fa4",
+ "95df77a9.2015c8"
]
]
},
{
- "id": "be722424.9e5438",
+ "id": "2b1dae74.689ae2",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1285.4488945007324,
- "y": 677.0040092468262,
- "z": "152c5971.7ac927",
+ "x": 1126.445026397705,
+ "y": 641.0001058578491,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "79665fbb.1aeb5",
- "db6408de.efe4c8"
+ "f025176.9eb87e8",
+ "9399b06c.d4d46"
]
]
},
{
- "id": "db6408de.efe4c8",
+ "id": "9399b06c.d4d46",
"type": "execute",
"name": "execute split control points",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.site.controlPoint`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.site.controlpoints\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1536.4490509033203,
- "y": 745.004111289978,
- "z": "152c5971.7ac927",
+ "x": 1377.445182800293,
+ "y": 709.000207901001,
+ "z": "94b1afc3.a0dc",
"wires": [
[]
]
},
{
- "id": "24b313e.2bb53ec",
+ "id": "5f3ab5eb.71688c",
"type": "switchNode",
"name": "switch latitude",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'latitude'`\">\n",
"comments": "",
"outputs": 1,
- "x": 963.1155471801758,
- "y": 439.00399017333984,
- "z": "152c5971.7ac927",
+ "x": 806.1116409301758,
+ "y": 339.00008392333984,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "13e09627.b199da"
+ "17934d90.83f8b2"
]
]
},
{
- "id": "13e09627.b199da",
+ "id": "17934d90.83f8b2",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1139.1153945922852,
- "y": 434.00394916534424,
- "z": "152c5971.7ac927",
+ "x": 982.1114883422852,
+ "y": 334.00004291534424,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "3ac65d27.a38462"
+ "c1cb3429.151d98"
]
]
},
{
- "id": "3ac65d27.a38462",
+ "id": "c1cb3429.151d98",
"type": "set",
"name": "set location-latitude",
"xml": "<set>\n<parameter name='prop.site.location-latitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1313.1154022216797,
- "y": 432.60396575927734,
- "z": "152c5971.7ac927",
+ "x": 1156.1114959716797,
+ "y": 332.60005950927734,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "3a793fa2.7f94e",
+ "id": "ca7858b9.e061c8",
"type": "switchNode",
"name": "switch longitude",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'longitude'`\">\n",
"comments": "",
"outputs": 1,
- "x": 966.1155471801758,
- "y": 479.0040330886841,
- "z": "152c5971.7ac927",
+ "x": 809.1116409301758,
+ "y": 379.0001268386841,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "55ab0e28.8342d"
+ "8f39dcfa.83f0e"
]
]
},
{
- "id": "55ab0e28.8342d",
+ "id": "8f39dcfa.83f0e",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1138.1155548095703,
- "y": 474.004075050354,
- "z": "152c5971.7ac927",
+ "x": 981.1116485595703,
+ "y": 374.000168800354,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "de42d185.f22c5"
+ "257b4537.3c066a"
]
]
},
{
- "id": "de42d185.f22c5",
+ "id": "257b4537.3c066a",
"type": "set",
"name": "set location-longitude",
"xml": "<set>\n<parameter name='prop.site.location-longitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1320.1154098510742,
- "y": 477.60392665863037,
- "z": "152c5971.7ac927",
+ "x": 1163.1115036010742,
+ "y": 377.60002040863037,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "954fde0c.db00e",
+ "id": "44ed6e14.4ca7e",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1129.1155548095703,
- "y": 524.004077911377,
- "z": "152c5971.7ac927",
+ "x": 972.1116485595703,
+ "y": 424.00017166137695,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "ec738ea.7ff107"
+ "e5a3e724.d41f08"
]
]
},
{
- "id": "ddfdabba.c44028",
+ "id": "2490dffe.947e9",
"type": "set",
"name": "set emails",
"xml": "<set>\n<parameter name='prop.site.emails' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1487.115249633789,
- "y": 492.6039299964905,
- "z": "152c5971.7ac927",
+ "x": 1330.111343383789,
+ "y": 392.6000237464905,
+ "z": "94b1afc3.a0dc",
"wires": []
},
{
- "id": "fee596dc.022e48",
+ "id": "5ff23f08.f8215",
"type": "switchNode",
"name": "switch emails",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'emails'`\">\n",
"comments": "",
"outputs": 1,
- "x": 956.1156234741211,
- "y": 524.004077911377,
- "z": "152c5971.7ac927",
+ "x": 799.1117172241211,
+ "y": 424.00017166137695,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "954fde0c.db00e"
+ "44ed6e14.4ca7e"
]
]
},
{
- "id": "803294bd.b33768",
+ "id": "b15996ac.1ac678",
"type": "execute",
"name": "execute split emails",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.site.emails`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.site.email\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1512.781593322754,
- "y": 539.0038328170776,
- "z": "152c5971.7ac927",
+ "x": 1355.777687072754,
+ "y": 438.99992656707764,
+ "z": "94b1afc3.a0dc",
"wires": [
[]
]
},
{
- "id": "ec738ea.7ff107",
+ "id": "e5a3e724.d41f08",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1291.1155624389648,
- "y": 525.0039954185486,
- "z": "152c5971.7ac927",
+ "x": 1134.1116561889648,
+ "y": 425.0000891685486,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "ddfdabba.c44028",
- "803294bd.b33768"
+ "2490dffe.947e9",
+ "b15996ac.1ac678"
]
]
},
{
- "id": "d3c58875.e0f958",
+ "id": "3e3aefd6.843cc",
"type": "switchNode",
"name": "switch description",
"xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'description'`\">\n",
"comments": "",
"outputs": 1,
- "x": 971.00390625,
- "y": 229.00390625,
- "z": "152c5971.7ac927",
+ "x": 814,
+ "y": 129,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "8aebe9ab.cbad88"
+ "2b975758.fb5fb8"
]
]
},
{
- "id": "8aebe9ab.cbad88",
+ "id": "2b975758.fb5fb8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1113.00390625,
- "y": 230.00390625,
- "z": "152c5971.7ac927",
+ "x": 956,
+ "y": 130,
+ "z": "94b1afc3.a0dc",
"wires": [
[
- "d7605ed6.36544"
+ "d08aa9c0.911c88"
]
]
},
{
- "id": "d7605ed6.36544",
+ "id": "d08aa9c0.911c88",
"type": "set",
"name": "set description",
"xml": "<set>\n<parameter name='prop.site.description' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1259.0039825439453,
- "y": 230.60393619537354,
- "z": "152c5971.7ac927",
+ "x": 1102.0000762939453,
+ "y": 130.60002994537354,
+ "z": "94b1afc3.a0dc",
"wires": []
+ },
+ {
+ "id": "e1339417.d483a8",
+ "type": "other",
+ "name": "outcome Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1329.00004196167,
+ "y": 478.00005531311035,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "9d513524.b6af68"
+ ]
+ ]
+ },
+ {
+ "id": "d2b9e663.ae14c8",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1312.5003700256348,
+ "y": 526.0000152587891,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "59ff6271.db05ec"
+ ]
+ ]
+ },
+ {
+ "id": "abf743a3.45204",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 925.8956985473633,
+ "y": 472.97340202331543,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "b178377b.d61118"
+ ]
+ ]
+ },
+ {
+ "id": "b178377b.d61118",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1042.0000305175781,
+ "y": 475.00001430511475,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "bb291d8b.bac3a"
+ ]
+ ]
+ },
+ {
+ "id": "bb291d8b.bac3a",
+ "type": "switchNode",
+ "name": "switch value",
+ "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].value`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1172.0000343322754,
+ "y": 507.00001335144043,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "e1339417.d483a8",
+ "d2b9e663.ae14c8"
+ ]
+ ]
+ },
+ {
+ "id": "9d513524.b6af68",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1468.0000457763672,
+ "y": 478.00001335144043,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ []
+ ]
}
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
index 01b405f3..80b22323 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
@@ -1,20 +1,20 @@
[
{
- "id": "d8f994a.905d468",
+ "id": "f1032bbd.b31d28",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 80,
- "y": 65,
- "z": "8408bfb2.5391c",
+ "x": 85,
+ "y": 38,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3c2e6d4d.c2bd82"
+ "ded6a886.414a98"
]
]
},
{
- "id": "3c2e6d4d.c2bd82",
+ "id": "ded6a886.414a98",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,2872 +22,2904 @@
"comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 292.00000381469727,
- "y": 137.0000171661377,
- "z": "8408bfb2.5391c",
+ "x": 297.00000381469727,
+ "y": 110.0000171661377,
+ "z": "cbb28df7.1359",
"wires": [
[
- "26038810.a7ef78"
+ "a2425e96.87088"
]
]
},
{
- "id": "26038810.a7ef78",
+ "id": "a2425e96.87088",
"type": "method",
"name": "sotn-attachment-topology-operation-activate",
"xml": "<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 280.0001220703125,
- "y": 225,
- "z": "8408bfb2.5391c",
+ "x": 285.0001220703125,
+ "y": 198,
+ "z": "cbb28df7.1359",
"wires": [
[
- "1c3cd19e.85c58e"
+ "e7f36c41.5e57f"
]
]
},
{
- "id": "1c3cd19e.85c58e",
+ "id": "e7f36c41.5e57f",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 296.0001220703125,
- "y": 780.0002446174622,
- "z": "8408bfb2.5391c",
+ "x": 301.0001220703125,
+ "y": 753.0002446174622,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2327aa5f.54ef36",
- "99534ea9.895be",
- "a2e616e3.120d38",
- "a9a5a283.d6f32",
- "9011b40c.35c348",
- "6ba17b8d.9294d4",
- "1a3613fe.fb52ac",
- "7282ea04.8f4254",
- "38dcc355.b103ac",
- "8ae6fd1b.92978",
- "20f5a5d.63f625a",
- "b5b11ed1.c43bd",
- "43ca1b3a.8238a4",
- "b210c8e1.8a1f58",
- "a7a8f21b.2788e",
- "e85cfb03.0cc698",
- "d41d9b4e.b5c868",
- "d29d9e3d.acace",
- "37ff9c4b.85c4b4",
- "48b1d949.e92058"
+ "e04b6e39.cae71",
+ "b9edbe74.6fc66",
+ "e027a6b9.d5fec8",
+ "6f3c3c57.eb6864",
+ "f719861e.58e0d8",
+ "c02fb64d.81dcb8",
+ "308c70eb.a087f",
+ "d993c33b.774ec",
+ "acc938bc.eae1d8",
+ "d519b726.ce9b88",
+ "8ad08551.c43818",
+ "dad7cff3.85c1b",
+ "f192b08c.ec685",
+ "17f7a6f0.5e20c9",
+ "f18db1f7.e4c95",
+ "7bf02ef8.1215c",
+ "f879cc99.b3ef8",
+ "75a3a30e.eab54c",
+ "bd9c39e4.8a1478",
+ "3b7ef3d8.70ae1c"
]
]
},
{
- "id": "2327aa5f.54ef36",
+ "id": "e04b6e39.cae71",
"type": "set",
"name": "set tmp.ar.allotted-resource-id,etc",
"xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
"comments": "",
- "x": 692.9935607910156,
- "y": 178.9934868812561,
- "z": "8408bfb2.5391c",
+ "x": 697.9935607910156,
+ "y": 151.9934868812561,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "de9b3e6.47f7ac",
+ "id": "afb2368f.9bd8f8",
"type": "comment",
"name": "set tmp ar-id to fetch resource from MDSAL",
"info": "",
"comments": "",
- "x": 721.9538726806641,
- "y": 143.02528285980225,
- "z": "8408bfb2.5391c",
+ "x": 726.9538726806641,
+ "y": 116.02528285980225,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "99534ea9.895be",
+ "id": "b9edbe74.6fc66",
"type": "set",
"name": "set tmp.ar.self-link",
"xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
"comments": "",
- "x": 646.9934997558594,
- "y": 271.99349212646484,
- "z": "8408bfb2.5391c",
+ "x": 651.9934997558594,
+ "y": 244.99349212646484,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "9011b40c.35c348",
+ "id": "f719861e.58e0d8",
"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": 653.2553901672363,
- "y": 359.6602210998535,
- "z": "8408bfb2.5391c",
+ "x": 658.2553901672363,
+ "y": 332.6602210998535,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "a2e616e3.120d38",
+ "id": "e027a6b9.d5fec8",
"type": "execute",
"name": "generate allotted-resource tmp.ar-url",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 700.2554473876953,
- "y": 447.6602249145508,
- "z": "8408bfb2.5391c",
+ "x": 705.2554473876953,
+ "y": 420.6602249145508,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "76aa0cc6.9d0f44",
+ "id": "452cf8b8.86cc88",
"type": "comment",
"name": "GET connection-attachment-allotted-resource from mdsal",
"info": "",
"comments": "",
- "x": 746.8083801269531,
- "y": 578.5386590957642,
- "z": "8408bfb2.5391c",
+ "x": 751.8083801269531,
+ "y": 551.5386590957642,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "5edbb6db.a8fc38",
+ "id": "12f54fa3.aaff3",
"type": "comment",
"name": "Used for setting output to API Handler",
"info": "",
"comments": "",
- "x": 700.9935302734375,
- "y": 238.993501663208,
- "z": "8408bfb2.5391c",
+ "x": 705.9935302734375,
+ "y": 211.993501663208,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "c666ffbb.fc8ca",
+ "id": "926a67a.4a82498",
"type": "comment",
"name": "Obtain different URL, template location etc",
"info": "For saving resource information to MDSAL & for AAI",
"comments": "",
- "x": 718.9934959411621,
- "y": 324.8823823928833,
- "z": "8408bfb2.5391c",
+ "x": 723.9934959411621,
+ "y": 297.8823823928833,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "b8b88660.9e4428",
+ "id": "f41dfc4.f4cda",
"type": "comment",
"name": "Used to Get AR by id to MDSAL, same as self-link",
"info": "",
"comments": "",
- "x": 744.9935150146484,
- "y": 411.8823413848877,
- "z": "8408bfb2.5391c",
+ "x": 749.9935150146484,
+ "y": 384.8823413848877,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "936be6c0.7bea88",
+ "id": "a1fbf2bd.6b2d9",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1206.6667919158936,
- "y": 595.9999847412109,
- "z": "8408bfb2.5391c",
+ "x": 1211.6667919158936,
+ "y": 568.9999847412109,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b80a91b9.c696c"
+ "9cd08c09.1d068"
]
]
},
{
- "id": "b80a91b9.c696c",
+ "id": "9cd08c09.1d068",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1350.6668701171875,
- "y": 553.4999027252197,
- "z": "8408bfb2.5391c",
+ "x": 1355.6668701171875,
+ "y": 526.4999027252197,
+ "z": "cbb28df7.1359",
"wires": [
[
- "17081217.bb83fe"
+ "33641e94.7a0b72"
]
]
},
{
- "id": "17081217.bb83fe",
+ "id": "33641e94.7a0b72",
"type": "switchNode",
"name": "switch cr length",
"xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1519.5242938995361,
- "y": 551.1190738677979,
- "z": "8408bfb2.5391c",
+ "x": 1524.5242938995361,
+ "y": 524.1190738677979,
+ "z": "cbb28df7.1359",
"wires": [
[
- "25c765d1.dcabfa",
- "7d4970ac.b46e2"
+ "affca4cd.d977a8",
+ "c376fca7.816d6"
]
]
},
{
- "id": "25c765d1.dcabfa",
+ "id": "affca4cd.d977a8",
"type": "other",
"name": "outcome 1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1674.8574295043945,
- "y": 523.1189889907837,
- "z": "8408bfb2.5391c",
+ "x": 1679.8574295043945,
+ "y": 496.1189889907837,
+ "z": "cbb28df7.1359",
"wires": [
[
- "dd6e63a4.58a4c"
+ "53c06015.6266b"
]
]
},
{
- "id": "dd6e63a4.58a4c",
+ "id": "53c06015.6266b",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic='true'>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1833.381233215332,
- "y": 521.0238361358643,
- "z": "8408bfb2.5391c",
+ "x": 1838.381233215332,
+ "y": 494.02383613586426,
+ "z": "cbb28df7.1359",
"wires": [
[
- "7d4cf7ca.b708d8",
- "b39fcc17.895c5",
- "2aaa9fcc.38bd8"
+ "7ac858c4.60b0b8",
+ "dad8eb30.a0d438",
+ "c39c89e4.ebe398"
]
]
},
{
- "id": "899b09dd.666cb8",
+ "id": "27d51102.19665e",
"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=\"Error: Connection attachment resource not exist\" />\n \n",
"comments": "",
- "x": 1773.5191650390625,
- "y": 628.0660705566406,
- "z": "8408bfb2.5391c",
+ "x": 1778.5191650390625,
+ "y": 601.0660705566406,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "e9cdf97c.418498",
+ "id": "97f58790.fbe988",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1198.5185947418213,
- "y": 631.0660696029663,
- "z": "8408bfb2.5391c",
+ "x": 1203.5185947418213,
+ "y": 604.0660696029663,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2d136e8b.0dda42"
+ "e6b498e7.ee1fb8"
]
]
},
{
- "id": "2d136e8b.0dda42",
+ "id": "e6b498e7.ee1fb8",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1378.5185451507568,
- "y": 631.7326202392578,
- "z": "8408bfb2.5391c",
+ "x": 1383.5185451507568,
+ "y": 604.7326202392578,
+ "z": "cbb28df7.1359",
"wires": [
[
- "899b09dd.666cb8"
+ "27d51102.19665e"
]
]
},
{
- "id": "7d4970ac.b46e2",
+ "id": "c376fca7.816d6",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1666.185432434082,
- "y": 582.3993635177612,
- "z": "8408bfb2.5391c",
+ "x": 1671.185432434082,
+ "y": 555.3993635177612,
+ "z": "cbb28df7.1359",
"wires": [
[
- "899b09dd.666cb8"
+ "27d51102.19665e"
]
]
},
{
- "id": "7d4cf7ca.b708d8",
+ "id": "7ac858c4.60b0b8",
"type": "set",
"name": "set connection-attachment-ar from get",
"xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
"comments": "",
- "x": 2080.4446868896484,
- "y": 494.00008821487427,
- "z": "8408bfb2.5391c",
+ "x": 2085.4446868896484,
+ "y": 467.00008821487427,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "2aaa9fcc.38bd8",
+ "id": "c39c89e4.ebe398",
"type": "set",
"name": "set oper-status",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
"comments": "",
- "x": 2014.4447174072266,
- "y": 567.4285907745361,
- "z": "8408bfb2.5391c",
+ "x": 2019.4447174072266,
+ "y": 540.4285907745361,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "b39fcc17.895c5",
+ "id": "dad8eb30.a0d438",
"type": "switchNode",
"name": "switch order-status",
"xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 2024.4444961547852,
- "y": 533.0000247955322,
- "z": "8408bfb2.5391c",
+ "x": 2029.4444961547852,
+ "y": 506.0000247955322,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3c6d5162.4dd28e",
- "fef42f12.64b0e"
+ "cc20c996.8c9528",
+ "d77bf1ee.049a3",
+ "453143a6.32929c"
]
]
},
{
- "id": "3c6d5162.4dd28e",
+ "id": "cc20c996.8c9528",
"type": "outcome",
"name": "outcome Created",
"xml": "<outcome value='Created'>\n",
"comments": "",
"outputs": 1,
- "x": 2260.044578552246,
- "y": 527.0000557899475,
- "z": "8408bfb2.5391c",
+ "x": 2265.044578552246,
+ "y": 500.0000557899475,
+ "z": "cbb28df7.1359",
"wires": [
[
- "6af9dab4.2f9774"
+ "3a4bc81f.b971d8"
]
]
},
{
- "id": "fef42f12.64b0e",
+ "id": "d77bf1ee.049a3",
"type": "outcome",
"name": "outcome Other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2253.759017944336,
- "y": 566.4286637306213,
- "z": "8408bfb2.5391c",
+ "x": 2258.759078979492,
+ "y": 580.4286904335022,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f2cd9f47.d7377"
+ "f8e833ae.2c3a5"
]
]
},
{
- "id": "6af9dab4.2f9774",
+ "id": "3a4bc81f.b971d8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2418.515251159668,
- "y": 527.37571144104,
- "z": "8408bfb2.5391c",
+ "x": 2423.515251159668,
+ "y": 500.37571144104004,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "f2cd9f47.d7377",
+ "id": "f8e833ae.2c3a5",
"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\" \n value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
"comments": "",
- "x": 2429.666831970215,
- "y": 565.0000629425049,
- "z": "8408bfb2.5391c",
+ "x": 2434.666893005371,
+ "y": 579.0000896453857,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "1faeed04.ccc693",
+ "id": "a031723a.72d45",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 917.303050994873,
- "y": 678.4936046600342,
- "z": "8408bfb2.5391c",
+ "x": 922.303050994873,
+ "y": 651.4936046600342,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "6ba17b8d.9294d4",
+ "id": "c02fb64d.81dcb8",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 611.3091506958008,
- "y": 679.4999752044678,
- "z": "8408bfb2.5391c",
+ "x": 616.3091506958008,
+ "y": 652.4999752044678,
+ "z": "cbb28df7.1359",
"wires": [
[
- "1faeed04.ccc693"
+ "a031723a.72d45"
]
]
},
{
- "id": "8dc6288b.69f3c8",
+ "id": "8474372c.daa338",
"type": "comment",
"name": "GET parent-service-data from mdsal to check existence of other End point",
"info": "",
"comments": "",
- "x": 799.00048828125,
- "y": 724.5317525863647,
- "z": "8408bfb2.5391c",
+ "x": 804.00048828125,
+ "y": 697.5317525863647,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "68cf6590.29454c",
+ "id": "dfd9ac30.4d327",
"type": "for",
"name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
"xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1690.1851959228516,
- "y": 877.0042300224304,
- "z": "8408bfb2.5391c",
+ "x": 1695.1851959228516,
+ "y": 850.0042300224304,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d6ae5f76.c8f15"
+ "69bb7e37.5502b"
]
]
},
{
- "id": "a9a5a283.d6f32",
+ "id": "6f3c3c57.eb6864",
"type": "switchNode",
"name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
"xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 774.1842193603516,
- "y": 984.7182664871216,
- "z": "8408bfb2.5391c",
+ "x": 779.1842193603516,
+ "y": 957.7182664871216,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e20f3541.b06af8",
- "5e0c5641.7d4838",
- "50edb11a.27a72"
+ "e5034add.dc7ee8",
+ "ea87fbba.a1ee38",
+ "37719ae7.6e63d6"
]
]
},
{
- "id": "e20f3541.b06af8",
+ "id": "e5034add.dc7ee8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1102.3272399902344,
- "y": 1057.5755405426025,
- "z": "8408bfb2.5391c",
+ "x": 1107.3272399902344,
+ "y": 1030.5755405426025,
+ "z": "cbb28df7.1359",
"wires": [
[
- "bd3642c3.e39b9"
+ "882cb355.05a04"
]
]
},
{
- "id": "5a0c4146.2d462",
+ "id": "4d6165bb.ea8a7c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1286.454502105713,
- "y": 916.7015495300293,
- "z": "8408bfb2.5391c",
+ "x": 1291.454502105713,
+ "y": 889.7015495300293,
+ "z": "cbb28df7.1359",
"wires": [
[
- "68cf6590.29454c",
- "9f978556.72d7a8"
+ "dfd9ac30.4d327",
+ "3a395b7f.25dd64"
]
]
},
{
- "id": "d6ae5f76.c8f15",
+ "id": "69bb7e37.5502b",
"type": "switchNode",
"name": "switch allotted-resource-id",
"xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2130.2965240478516,
- "y": 874.0040321350098,
- "z": "8408bfb2.5391c",
+ "x": 2135.2965240478516,
+ "y": 847.0040321350098,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d913a74c.a2fc88",
- "7618c5b2.5c314c"
+ "cc363d65.ffc05",
+ "15afd920.4feac7"
]
]
},
{
- "id": "d913a74c.a2fc88",
+ "id": "cc363d65.ffc05",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2303.1067390441895,
- "y": 845.4686470031738,
- "z": "8408bfb2.5391c",
+ "x": 2308.1067390441895,
+ "y": 818.4686470031738,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2345ff9d.8801f"
+ "1c47a88e.29f817"
]
]
},
{
- "id": "5607eea5.cfd0b",
+ "id": "8ff402e2.b14b9",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2451.8672103881836,
- "y": 902.3257341384888,
- "z": "8408bfb2.5391c",
+ "x": 2456.8672103881836,
+ "y": 875.3257341384888,
+ "z": "cbb28df7.1359",
"wires": [
[
- "fa337068.73737"
+ "42b3d0fe.09e55"
]
]
},
{
- "id": "fa337068.73737",
+ "id": "42b3d0fe.09e55",
"type": "set",
"name": "set tmp.pidx and ptx.consumed-ar",
"xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
"comments": "",
- "x": 2686.724636077881,
- "y": 900.8972663879395,
- "z": "8408bfb2.5391c",
+ "x": 2691.724636077881,
+ "y": 873.8972663879395,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "38da952f.2ea48a",
+ "id": "b37984c.e70a578",
"type": "comment",
"name": "Check existence of other AR in parent service data",
"info": "Check if other allotted resource is available.",
"comments": "",
- "x": 721.9626579284668,
- "y": 889.8929615020752,
- "z": "8408bfb2.5391c",
+ "x": 726.9626579284668,
+ "y": 862.8929615020752,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "5e0c5641.7d4838",
+ "id": "ea87fbba.a1ee38",
"type": "other",
"name": "outcome 1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1116.9797096252441,
- "y": 996.6772241592407,
- "z": "8408bfb2.5391c",
+ "x": 1121.9797096252441,
+ "y": 969.6772241592407,
+ "z": "cbb28df7.1359",
"wires": [
[
- "87c536f.c550fc8"
+ "c0453fc3.0e237"
]
]
},
{
- "id": "bd3642c3.e39b9",
+ "id": "882cb355.05a04",
"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=\"Error: End points not available\" />\n \n",
"comments": "",
- "x": 1261.9795875549316,
- "y": 1056.67746925354,
- "z": "8408bfb2.5391c",
+ "x": 1266.9795875549316,
+ "y": 1029.67746925354,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "50edb11a.27a72",
+ "id": "37719ae7.6e63d6",
"type": "other",
"name": "outcome 2",
"xml": "<outcome value='2'>\n",
"comments": "",
"outputs": 1,
- "x": 1111.9795227050781,
- "y": 917.6772499084473,
- "z": "8408bfb2.5391c",
+ "x": 1116.9795227050781,
+ "y": 890.6772499084473,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5a0c4146.2d462"
+ "4d6165bb.ea8a7c"
]
]
},
{
- "id": "2345ff9d.8801f",
+ "id": "1c47a88e.29f817",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2461.0909538269043,
- "y": 844.6773900985718,
- "z": "8408bfb2.5391c",
+ "x": 2466.0909538269043,
+ "y": 817.6773900985718,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "7618c5b2.5c314c",
+ "id": "15afd920.4feac7",
"type": "outcomeTrue",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 2310.0905952453613,
- "y": 901.6772499084473,
- "z": "8408bfb2.5391c",
+ "x": 2315.0905952453613,
+ "y": 874.6772499084473,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5607eea5.cfd0b"
+ "8ff402e2.b14b9"
]
]
},
{
- "id": "9f978556.72d7a8",
+ "id": "3a395b7f.25dd64",
"type": "switchNode",
"name": "switch tmp.found-in-ar",
"xml": "<switch test='`$tmp.found-in-ar`'>\n\n",
"comments": "",
"outputs": 1,
- "x": 1498.9794998168945,
- "y": 970.4550676345825,
- "z": "8408bfb2.5391c",
+ "x": 1503.9794998168945,
+ "y": 943.4550676345825,
+ "z": "cbb28df7.1359",
"wires": [
[
- "81a77acc.304778"
+ "620a8680.ec1638"
]
]
},
{
- "id": "81a77acc.304778",
+ "id": "620a8680.ec1638",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1669.97953414917,
- "y": 971.5662889480591,
- "z": "8408bfb2.5391c",
+ "x": 1674.97953414917,
+ "y": 944.5662889480591,
+ "z": "cbb28df7.1359",
"wires": [
[
- "9ffb9a81.6b3718"
+ "54a50118.05977"
]
]
},
{
- "id": "9ffb9a81.6b3718",
+ "id": "54a50118.05977",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1818.9796295166016,
- "y": 971.5662879943848,
- "z": "8408bfb2.5391c",
+ "x": 1823.9796295166016,
+ "y": 944.5662879943848,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5c659a2b.afc754",
- "8cf7d234.3dc16"
+ "2fbf3350.d69d7c",
+ "51067155.cb254"
]
]
},
{
- "id": "989dac87.78e81",
+ "id": "7d7dc112.d678b",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2565.097454071045,
- "y": 987.7951421737671,
- "z": "8408bfb2.5391c",
+ "x": 2570.097454071045,
+ "y": 960.7951421737671,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ec7b01c7.d1285"
+ "94f95621.9a2ea8"
]
]
},
{
- "id": "34bec365.7b96ac",
+ "id": "79425b66.b91424",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2556.9492568969727,
- "y": 1022.8612270355225,
- "z": "8408bfb2.5391c",
+ "x": 2561.9492568969727,
+ "y": 995.8612270355225,
+ "z": "cbb28df7.1359",
"wires": [
[
- "a5c61aa1.3f8f98"
+ "3ebc390b.802eb6"
]
]
},
{
- "id": "fe59f6b4.0bb438",
+ "id": "90be4eb6.fdc8c",
"type": "switchNode",
"name": "switch mdsal-psd.service-data.networks_length",
"xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1562.313003540039,
- "y": 1071.899908065796,
- "z": "8408bfb2.5391c",
+ "x": 1567.313003540039,
+ "y": 1044.899908065796,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e9948315.8ea76",
- "6bae8ece.fed41"
+ "b54c4867.028668",
+ "73000cce.d47514"
]
]
},
{
- "id": "6bae8ece.fed41",
+ "id": "73000cce.d47514",
"type": "other",
"name": "outcome 1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1826.3128509521484,
- "y": 1051.7886543273926,
- "z": "8408bfb2.5391c",
+ "x": 1831.3128509521484,
+ "y": 1024.7886543273926,
+ "z": "cbb28df7.1359",
"wires": [
[
- "468dd517.bd59ec"
+ "d471d131.1144d"
]
]
},
{
- "id": "e9948315.8ea76",
+ "id": "b54c4867.028668",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1816.3129119873047,
- "y": 1099.788625717163,
- "z": "8408bfb2.5391c",
+ "x": 1821.3129119873047,
+ "y": 1072.788625717163,
+ "z": "cbb28df7.1359",
"wires": [
[
- "fdb79d00.1f625"
+ "5f3379.2755bc88"
]
]
},
{
- "id": "fdb79d00.1f625",
+ "id": "5f3379.2755bc88",
"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=\"Error: Incorrect state found more then 1 network\" />\n \n",
"comments": "",
- "x": 1954.9652557373047,
- "y": 1101.890386581421,
- "z": "8408bfb2.5391c",
+ "x": 1959.9652557373047,
+ "y": 1074.890386581421,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "4b31996c.2e9dd8",
+ "id": "d6222ed2.2e3d3",
"type": "set",
"name": "set tmp.network.",
"xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n\n\n",
"comments": "",
- "x": 2187.757709503174,
- "y": 1052.788824081421,
- "z": "8408bfb2.5391c",
+ "x": 2192.757709503174,
+ "y": 1025.788824081421,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "87c536f.c550fc8",
+ "id": "c0453fc3.0e237",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1284.4240188598633,
- "y": 995.7884912490845,
- "z": "8408bfb2.5391c",
+ "x": 1289.4240188598633,
+ "y": 968.7884912490845,
+ "z": "cbb28df7.1359",
"wires": [
[
- "fe59f6b4.0bb438"
+ "90be4eb6.fdc8c"
]
]
},
{
- "id": "468dd517.bd59ec",
+ "id": "d471d131.1144d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1985.0906219482422,
- "y": 1054.7884883880615,
- "z": "8408bfb2.5391c",
+ "x": 1990.0906219482422,
+ "y": 1027.7884883880615,
+ "z": "cbb28df7.1359",
"wires": [
[
- "4b31996c.2e9dd8",
- "35ea2ff8.819d3"
+ "d6222ed2.2e3d3",
+ "ce58bf5a.0189d"
]
]
},
{
- "id": "35ea2ff8.819d3",
+ "id": "ce58bf5a.0189d",
"type": "for",
"name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
"xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
"comments": "",
"outputs": 1,
- "x": 2348.090660095215,
- "y": 1100.7886428833008,
- "z": "8408bfb2.5391c",
+ "x": 2353.090660095215,
+ "y": 1073.7886428833008,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e42ebe27.208ea"
+ "a4f1258e.f8f7e8"
]
]
},
{
- "id": "e42ebe27.208ea",
+ "id": "a4f1258e.f8f7e8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2394.646728515625,
- "y": 1331.7884521484375,
- "z": "8408bfb2.5391c",
+ "x": 2399.646728515625,
+ "y": 1304.7884521484375,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b0894bea.c54948",
- "8a2437bd.a21588",
- "3ab7c28c.29ebee",
- "26dbc77e.931828",
- "ea187132.b5e71",
- "89603344.a7cf9",
- "c98b4f19.64757",
- "42370cde.333864",
- "542afd70.800e84",
- "bb2b418a.7b353"
+ "ce9cca12.4f0af8",
+ "d379e536.6a0348",
+ "63d37889.57ca38",
+ "ff3897ba.b2c938",
+ "410b060d.0c2948",
+ "805eddea.23b52",
+ "623ff136.8ac42",
+ "3055227f.6b6a0e",
+ "830a582f.f084d8",
+ "f77b8935.e0ba38"
]
]
},
{
- "id": "b0894bea.c54948",
+ "id": "ce9cca12.4f0af8",
"type": "switchNode",
"name": "switch access-node-id",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
"comments": "",
"outputs": 1,
- "x": 2671.1569442749023,
- "y": 1173.7991995811462,
- "z": "8408bfb2.5391c",
+ "x": 2676.1569442749023,
+ "y": 1146.7991995811462,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b3ce3deb.b8884"
+ "c66b2919.5cf5d8"
]
]
},
{
- "id": "b3ce3deb.b8884",
+ "id": "c66b2919.5cf5d8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2860.1565704345703,
- "y": 1175.7990641593933,
- "z": "8408bfb2.5391c",
+ "x": 2865.1565704345703,
+ "y": 1148.7990641593933,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5da4de6b.c7114"
+ "f9c2cbff.de99a8"
]
]
},
{
- "id": "5da4de6b.c7114",
+ "id": "f9c2cbff.de99a8",
"type": "set",
"name": "set tmp.found-in-network tmp.ep-available",
"xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
"comments": "",
- "x": 3113.1567459106445,
- "y": 1175.3991103172302,
- "z": "8408bfb2.5391c",
+ "x": 3118.1567459106445,
+ "y": 1148.3991103172302,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "8a2437bd.a21588",
+ "id": "d379e536.6a0348",
"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": 2645.146396636963,
- "y": 1547.7884907722473,
- "z": "8408bfb2.5391c",
+ "x": 2650.146396636963,
+ "y": 1520.7884907722473,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "b5b11ed1.c43bd",
+ "id": "dad7cff3.85c1b",
"type": "switchNode",
"name": "switch tmp.ep-available",
"xml": "<switch test='`$tmp.ep-available`'>\n",
"comments": "",
"outputs": 1,
- "x": 637.3128204345703,
- "y": 1180.232801437378,
- "z": "8408bfb2.5391c",
+ "x": 642.3128204345703,
+ "y": 1153.232801437378,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f1872c0f.1837d",
- "9ac98463.c4b848"
+ "6ca6c936.2c3768",
+ "eac664c0.e13b08"
]
]
},
{
- "id": "9ac98463.c4b848",
+ "id": "eac664c0.e13b08",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 855.9795398712158,
- "y": 1229.5661582946777,
- "z": "8408bfb2.5391c",
+ "x": 860.9795398712158,
+ "y": 1202.5661582946777,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ab243d87.b71c1"
+ "750588ef.b99fe8"
]
]
},
{
- "id": "f1872c0f.1837d",
+ "id": "6ca6c936.2c3768",
"type": "outcomeTrue",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 860.8683414459229,
- "y": 1138.566219329834,
- "z": "8408bfb2.5391c",
+ "x": 865.8683414459229,
+ "y": 1111.566219329834,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d737a2f6.f391a"
+ "749ef9db.5d3a08"
]
]
},
{
- "id": "d737a2f6.f391a",
+ "id": "749ef9db.5d3a08",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1007.8683376312256,
- "y": 1140.4550323486328,
- "z": "8408bfb2.5391c",
+ "x": 1012.8683376312256,
+ "y": 1113.4550323486328,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "ab243d87.b71c1",
+ "id": "750588ef.b99fe8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1026.090627670288,
- "y": 1227.5661163330078,
- "z": "8408bfb2.5391c",
+ "x": 1031.090627670288,
+ "y": 1200.5661163330078,
+ "z": "cbb28df7.1359",
"wires": [
[
- "19d2fe63.b868b2",
- "4546d667.4ae1b8",
- "b9f6cbba.591c38"
+ "fceb9616.eb61b8",
+ "7c3f1ab0.926054",
+ "d86d0f7e.bebac"
]
]
},
{
- "id": "19d2fe63.b868b2",
+ "id": "fceb9616.eb61b8",
"type": "switchNode",
"name": "switch tmp.found-in-ar",
"xml": "<switch test='`$tmp.found-in-ar`'>\n",
"comments": "",
"outputs": 1,
- "x": 1252.2016410827637,
- "y": 1194.5661163330078,
- "z": "8408bfb2.5391c",
+ "x": 1257.2016410827637,
+ "y": 1167.5661163330078,
+ "z": "cbb28df7.1359",
"wires": [
[
- "50e50db9.eaaab4",
- "af3e410f.b9392"
+ "c8457f81.3c93c",
+ "ce69f5f5.7107f8"
]
]
},
{
- "id": "50e50db9.eaaab4",
+ "id": "c8457f81.3c93c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1447.6460876464844,
- "y": 1172.566177368164,
- "z": "8408bfb2.5391c",
+ "x": 1452.6460876464844,
+ "y": 1145.566177368164,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d166c0ee.6a20a"
+ "7996be51.f87bd"
]
]
},
{
- "id": "af3e410f.b9392",
+ "id": "ce69f5f5.7107f8",
"type": "outcomeTrue",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1444.64599609375,
- "y": 1220.566162109375,
- "z": "8408bfb2.5391c",
+ "x": 1449.64599609375,
+ "y": 1193.566162109375,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ffc03ec.99f0ec"
+ "1e79b4e5.a1cc3b"
]
]
},
{
- "id": "d166c0ee.6a20a",
+ "id": "7996be51.f87bd",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1635.2017517089844,
- "y": 1169.566177368164,
- "z": "8408bfb2.5391c",
+ "x": 1640.2017517089844,
+ "y": 1142.566177368164,
+ "z": "cbb28df7.1359",
"wires": [
[
- "4058090.d4f72f8"
+ "2b6b416f.53780e"
]
]
},
{
- "id": "ffc03ec.99f0ec",
+ "id": "1e79b4e5.a1cc3b",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1632.20166015625,
- "y": 1219.566162109375,
- "z": "8408bfb2.5391c",
+ "x": 1637.20166015625,
+ "y": 1192.566162109375,
+ "z": "cbb28df7.1359",
"wires": [
[
- "defdcdc4.5501c"
+ "1a9c7979.469227"
]
]
},
{
- "id": "ab3d5af0.b7c608",
+ "id": "add86bf3.f17608",
"type": "comment",
"name": "GET connection-attachment-ar to store AR data from mdsal",
"info": "",
"comments": "",
- "x": 2144.4728355407715,
- "y": 456.50394773483276,
- "z": "8408bfb2.5391c",
+ "x": 2149.4728355407715,
+ "y": 429.50394773483276,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "c32af7d5.1a65c8",
+ "id": "652dad92.494ca4",
"type": "comment",
"name": "Set source end point",
"info": "",
"comments": "",
- "x": 633.9727325439453,
- "y": 545.2539677619934,
- "z": "8408bfb2.5391c",
+ "x": 638.9727325439453,
+ "y": 518.2539677619934,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "1a3613fe.fb52ac",
+ "id": "308c70eb.a087f",
"type": "set",
"name": "set tmp.ar.parent-service-instance-id",
"xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
"comments": "",
- "x": 684.9688262939453,
- "y": 754.0000905990601,
- "z": "8408bfb2.5391c",
+ "x": 689.9688262939453,
+ "y": 727.0000905990601,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "29a80022.cf94",
+ "id": "76dc332e.fe177c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1044.968978881836,
- "y": 825.0000772476196,
- "z": "8408bfb2.5391c",
+ "x": 1049.968978881836,
+ "y": 798.0000772476196,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d5049708.bf05f8"
+ "9d0d7b21.e0ad98"
]
]
},
{
- "id": "6ef3a6c9.24a468",
+ "id": "cbf3f4e6.00aa98",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1036.8207817077637,
- "y": 860.066162109375,
- "z": "8408bfb2.5391c",
+ "x": 1041.8207817077637,
+ "y": 833.066162109375,
+ "z": "cbb28df7.1359",
"wires": [
[
- "c085c15a.7561d"
+ "d8b072f9.d7c21"
]
]
},
{
- "id": "c085c15a.7561d",
+ "id": "d8b072f9.d7c21",
"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=\"Error: Parent service data not available\" />\n \n",
"comments": "",
- "x": 1182.9695625305176,
- "y": 859.3335733413696,
- "z": "8408bfb2.5391c",
+ "x": 1187.9695625305176,
+ "y": 832.3335733413696,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d5049708.bf05f8",
+ "id": "9d0d7b21.e0ad98",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1175.9690742492676,
- "y": 825.0001382827759,
- "z": "8408bfb2.5391c",
+ "x": 1180.9690742492676,
+ "y": 798.0001382827759,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "a5c61aa1.3f8f98",
+ "id": "3ebc390b.802eb6",
"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=\"Error: SOTN provided attachment resource not found\" />\n \n",
"comments": "",
- "x": 2706.969306945801,
- "y": 1023.00026512146,
- "z": "8408bfb2.5391c",
+ "x": 2711.969306945801,
+ "y": 996.00026512146,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "ec7b01c7.d1285",
+ "id": "94f95621.9a2ea8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2691.9694290161133,
- "y": 990.0002498626709,
- "z": "8408bfb2.5391c",
+ "x": 2696.9694290161133,
+ "y": 963.0002498626709,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "7282ea04.8f4254",
+ "id": "d993c33b.774ec",
"type": "set",
"name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
"xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
"comments": "",
- "x": 770.9687652587891,
- "y": 927.0000648498535,
- "z": "8408bfb2.5391c",
+ "x": 775.9687652587891,
+ "y": 900.0000648498535,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "c2ebe251.65d25",
+ "id": "336df829.2ff8b8",
"type": "comment",
"name": "If other EP exists set destination end point",
"info": "Check if other allotted resource is available.",
"comments": "",
- "x": 687.9687652587891,
- "y": 1105.0000133514404,
- "z": "8408bfb2.5391c",
+ "x": 692.9687652587891,
+ "y": 1078.0000133514404,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "22068d64.f16a22",
+ "id": "917d1ab.d2608e8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1427.9688873291016,
- "y": 1432.0002946853638,
- "z": "8408bfb2.5391c",
+ "x": 1432.9688873291016,
+ "y": 1405.0002946853638,
+ "z": "cbb28df7.1359",
"wires": [
[
- "52d775a5.5ac3dc",
- "124f9640.78093a",
- "f7902989.b82738",
- "a976aa7c.720c08",
- "fd92d693.19e5f8",
- "a34cb9dd.d28f48",
- "724051d8.4335d",
- "aa8cb96a.2b0388"
+ "a62deca7.bcade",
+ "81802c0b.6f8f",
+ "11a25f88.82eed",
+ "47a81553.315d4c",
+ "ee81a378.a7601",
+ "b4347cf5.49bc8",
+ "5c76f693.8395f8",
+ "59d53676.123ac8"
]
]
},
{
- "id": "52d775a5.5ac3dc",
+ "id": "a62deca7.bcade",
"type": "switchNode",
"name": "switch access-node-id",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`\">",
"comments": "",
"outputs": 1,
- "x": 1670.4791889190674,
- "y": 1302.010691165924,
- "z": "8408bfb2.5391c",
+ "x": 1675.4791889190674,
+ "y": 1275.010691165924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "7d3f8794.bd4838"
+ "fe688e94.da33b"
]
]
},
{
- "id": "124f9640.78093a",
+ "id": "81802c0b.6f8f",
"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": 1643.4691410064697,
- "y": 1607.0006546974182,
- "z": "8408bfb2.5391c",
+ "x": 1648.4691410064697,
+ "y": 1580.0006546974182,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "f7902989.b82738",
+ "id": "11a25f88.82eed",
"type": "switchNode",
"name": "switch access-ltp-id",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`\">",
"comments": "",
"outputs": 1,
- "x": 1661.9690189361572,
- "y": 1345.7782225608826,
- "z": "8408bfb2.5391c",
+ "x": 1666.9690189361572,
+ "y": 1318.7782225608826,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f4be3b97.453c38"
+ "c02ee204.0e0d9"
]
]
},
{
- "id": "a976aa7c.720c08",
+ "id": "47a81553.315d4c",
"type": "switchNode",
"name": "switch clientSignal",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`\">",
"comments": "",
"outputs": 1,
- "x": 1655.9690570831299,
- "y": 1391.778269290924,
- "z": "8408bfb2.5391c",
+ "x": 1660.9690570831299,
+ "y": 1364.778269290924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2d6f043a.f526ac"
+ "54c81360.7adb5c"
]
]
},
{
- "id": "fd92d693.19e5f8",
+ "id": "ee81a378.a7601",
"type": "switchNode",
"name": "switch cVLAN",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`\">",
"comments": "",
"outputs": 1,
- "x": 1639.9585590362549,
- "y": 1430.767771244049,
- "z": "8408bfb2.5391c",
+ "x": 1644.9585590362549,
+ "y": 1403.767771244049,
+ "z": "cbb28df7.1359",
"wires": [
[
- "8a9f16c4.814038"
+ "99167636.bd39c8"
]
]
},
{
- "id": "7d3f8794.bd4838",
+ "id": "fe688e94.da33b",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1848.1911029815674,
- "y": 1302.6670632362366,
- "z": "8408bfb2.5391c",
+ "x": 1853.1911029815674,
+ "y": 1275.6670632362366,
+ "z": "cbb28df7.1359",
"wires": [
[
- "a7752993.c80d28"
+ "ba53eaa4.9c9d68"
]
]
},
{
- "id": "a7752993.c80d28",
+ "id": "ba53eaa4.9c9d68",
"type": "set",
"name": "set dst-access-node-id",
"xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
"comments": "",
- "x": 2023.1911029815674,
- "y": 1302.267038345337,
- "z": "8408bfb2.5391c",
+ "x": 2028.1911029815674,
+ "y": 1275.267038345337,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "f4be3b97.453c38",
+ "id": "c02ee204.0e0d9",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1843.6809711456299,
- "y": 1345.434519290924,
- "z": "8408bfb2.5391c",
+ "x": 1848.6809711456299,
+ "y": 1318.434519290924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d0325deb.a98b5"
+ "d114cdd9.cd628"
]
]
},
{
- "id": "2d6f043a.f526ac",
+ "id": "54c81360.7adb5c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1843.6809711456299,
- "y": 1391.434519290924,
- "z": "8408bfb2.5391c",
+ "x": 1848.6809711456299,
+ "y": 1364.434519290924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ecea19c4.1c06b8"
+ "b311a80c.06bd18"
]
]
},
{
- "id": "8a9f16c4.814038",
+ "id": "99167636.bd39c8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1843.6704730987549,
- "y": 1430.4241433143616,
- "z": "8408bfb2.5391c",
+ "x": 1848.6704730987549,
+ "y": 1403.4241433143616,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d2defa52.a9bb28"
+ "9a953c6c.d3922"
]
]
},
{
- "id": "4546d667.4ae1b8",
+ "id": "7c3f1ab0.926054",
"type": "for",
"name": "for idx..tmp.ep.parameters[]",
"xml": "<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>\n\n",
"comments": "",
"outputs": 1,
- "x": 1280.96875,
- "y": 1320,
- "z": "8408bfb2.5391c",
+ "x": 1285.96875,
+ "y": 1293,
+ "z": "cbb28df7.1359",
"wires": [
[
- "22068d64.f16a22"
+ "917d1ab.d2608e8"
]
]
},
{
- "id": "4058090.d4f72f8",
+ "id": "2b6b416f.53780e",
"type": "set",
"name": "set tmp.ep.parameters",
"xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$mdsal-other-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.`' />\n",
"comments": "",
- "x": 1846.9688053131104,
- "y": 1169.0000743865967,
- "z": "8408bfb2.5391c",
+ "x": 1851.9688053131104,
+ "y": 1142.0000743865967,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "defdcdc4.5501c",
+ "id": "1a9c7979.469227",
"type": "set",
"name": "set tmp.ep.parameters",
"xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />\n",
"comments": "",
- "x": 1843.968713760376,
- "y": 1215.0000591278076,
- "z": "8408bfb2.5391c",
+ "x": 1848.968713760376,
+ "y": 1188.0000591278076,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d0325deb.a98b5",
+ "id": "d114cdd9.cd628",
"type": "set",
"name": "set dst-access-node-id",
"xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
"comments": "",
- "x": 2020.9689350128174,
- "y": 1345.0003151893616,
- "z": "8408bfb2.5391c",
+ "x": 2025.9689350128174,
+ "y": 1318.0003151893616,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "ecea19c4.1c06b8",
+ "id": "b311a80c.06bd18",
"type": "set",
"name": "set dst-clientSignal",
"xml": "<set>\n<parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />",
"comments": "",
- "x": 2014.9689350128174,
- "y": 1389.0003151893616,
- "z": "8408bfb2.5391c",
+ "x": 2019.9689350128174,
+ "y": 1362.0003151893616,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d2defa52.a9bb28",
+ "id": "9a953c6c.d3922",
"type": "set",
"name": "set dst-cVLAN",
"xml": "<set>\n<parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />",
"comments": "",
- "x": 2005.9689350128174,
- "y": 1428.0003151893616,
- "z": "8408bfb2.5391c",
+ "x": 2010.9689350128174,
+ "y": 1401.0003151893616,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "bdd4e0c8.a95a4",
+ "id": "41e007bc.b49c58",
"type": "comment",
"name": "Get controller info and send request",
"info": "",
"comments": "",
- "x": 1887.968807220459,
- "y": 1899.000153541565,
- "z": "8408bfb2.5391c",
+ "x": 1892.968807220459,
+ "y": 1872.000153541565,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "dce4c016.eb68d",
+ "id": "ce79c05a.55781",
"type": "execute",
"name": "execute RestApiCallNode Create ethernet Service",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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": 1940.96923828125,
- "y": 2042.0009536743164,
- "z": "8408bfb2.5391c",
+ "x": 1945.96923828125,
+ "y": 2015.0009536743164,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d73f8f6a.bf95e",
- "93c5c8ec.0f2668"
+ "163df924.1c4a27",
+ "eec75b28.8ba118"
]
]
},
{
- "id": "d73f8f6a.bf95e",
+ "id": "163df924.1c4a27",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2206.968963623047,
- "y": 2071.001076698303,
- "z": "8408bfb2.5391c",
+ "x": 2211.968963623047,
+ "y": 2044.0010766983032,
+ "z": "cbb28df7.1359",
"wires": [
[
- "56a9c0b6.f8192"
+ "638866f6.2498c8"
]
]
},
{
- "id": "56a9c0b6.f8192",
+ "id": "638866f6.2498c8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 2354.968963623047,
- "y": 2069.0009546279907,
- "z": "8408bfb2.5391c",
+ "x": 2359.968963623047,
+ "y": 2042.0009546279907,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "9708b12d.0139f",
+ "id": "bb864308.fd063",
"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 rest api\" />\n",
"comments": "",
- "x": 2336.968994140625,
- "y": 2016.0010147094727,
- "z": "8408bfb2.5391c",
+ "x": 2341.968994140625,
+ "y": 1989.0010147094727,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "93c5c8ec.0f2668",
+ "id": "eec75b28.8ba118",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2197.9689025878906,
- "y": 2016.0010147094727,
- "z": "8408bfb2.5391c",
+ "x": 2202.9689025878906,
+ "y": 1989.0010147094727,
+ "z": "cbb28df7.1359",
"wires": [
[
- "9708b12d.0139f"
+ "bb864308.fd063"
]
]
},
{
- "id": "1b789a42.5731a6",
+ "id": "4cd33402.f5bedc",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 859.7311744689941,
- "y": 2122.9537086486816,
- "z": "8408bfb2.5391c",
+ "x": 864.7311744689941,
+ "y": 2095.9537086486816,
+ "z": "cbb28df7.1359",
"wires": [
[
- "c0a71186.8f35f"
+ "ed40bf1a.07a59"
]
]
},
{
- "id": "c0a71186.8f35f",
+ "id": "ed40bf1a.07a59",
"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=\"AAI failed\" />\n",
"comments": "",
- "x": 1026.2549953460693,
- "y": 2149.5727157592773,
- "z": "8408bfb2.5391c",
+ "x": 1031.2549953460693,
+ "y": 2122.5727157592773,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "38fb2ac3.f4e026",
+ "id": "589b918b.e1a7",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 861.8264026641846,
- "y": 2170.715551376343,
- "z": "8408bfb2.5391c",
+ "x": 866.8264026641846,
+ "y": 2143.715551376343,
+ "z": "cbb28df7.1359",
"wires": [
[
- "c0a71186.8f35f"
+ "ed40bf1a.07a59"
]
]
},
{
- "id": "25a98b94.f96284",
+ "id": "489a8dba.917834",
"type": "comment",
"name": "Save Resource to AAI",
"info": "",
"comments": "",
- "x": 633.7788181304932,
- "y": 2111.3028717041016,
- "z": "8408bfb2.5391c",
+ "x": 638.7788181304932,
+ "y": 2084.3028717041016,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d29d9e3d.acace",
+ "id": "75a3a30e.eab54c",
"type": "set",
"name": "set output to api handler",
"xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
"comments": "",
- "x": 648.5465145111084,
- "y": 2032.8283529281616,
- "z": "8408bfb2.5391c",
+ "x": 653.5465145111084,
+ "y": 2005.8283529281616,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "48b1d949.e92058",
+ "id": "3b7ef3d8.70ae1c",
"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": 608.9596862792969,
- "y": 2218.4441413879395,
- "z": "8408bfb2.5391c",
+ "x": 613.9596862792969,
+ "y": 2191.4441413879395,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d41d9b4e.b5c868",
+ "id": "f879cc99.b3ef8",
"type": "execute",
"name": "execute RestApiCallNode - PUT AR by id",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 701.2785968780518,
- "y": 1957.4692058563232,
- "z": "8408bfb2.5391c",
+ "x": 706.2785968780518,
+ "y": 1930.4692058563232,
+ "z": "cbb28df7.1359",
"wires": [
[
- "cbf0048f.1976a8",
- "ceabdd96.4d7c2",
- "fd522403.9ba2f8"
+ "e695cbc9.963178",
+ "c00494c2.3f5b48",
+ "2e65b760.7a5738"
]
]
},
{
- "id": "cbf0048f.1976a8",
+ "id": "e695cbc9.963178",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 955.9200191497803,
- "y": 2001.8006000518799,
- "z": "8408bfb2.5391c",
+ "x": 960.9200191497803,
+ "y": 1974.8006000518799,
+ "z": "cbb28df7.1359",
"wires": [
[
- "97e00130.f2f9"
+ "c996b950.fcda58"
]
]
},
{
- "id": "ceabdd96.4d7c2",
+ "id": "c00494c2.3f5b48",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 957.9200420379639,
- "y": 1960.3005641922355,
- "z": "8408bfb2.5391c",
+ "x": 962.9200420379639,
+ "y": 1933.3005641922355,
+ "z": "cbb28df7.1359",
"wires": [
[
- "97e00130.f2f9"
+ "c996b950.fcda58"
]
]
},
{
- "id": "fd522403.9ba2f8",
+ "id": "2e65b760.7a5738",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 961.6701259613037,
- "y": 1911.6577167510986,
- "z": "8408bfb2.5391c",
+ "x": 966.6701259613037,
+ "y": 1884.6577167510986,
+ "z": "cbb28df7.1359",
"wires": [
[
- "977fddb0.04443"
+ "fe27e5ca.7550c8"
]
]
},
{
- "id": "97e00130.f2f9",
+ "id": "c996b950.fcda58",
"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 updating md-sal for connection-attachment-allotted-resource\" />\n",
"comments": "",
- "x": 1116.67014503479,
- "y": 1980.050630569458,
- "z": "8408bfb2.5391c",
+ "x": 1121.67014503479,
+ "y": 1953.050630569458,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "977fddb0.04443",
+ "id": "fe27e5ca.7550c8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1089.3260707855225,
- "y": 1913.8498849868774,
- "z": "8408bfb2.5391c",
+ "x": 1094.3260707855225,
+ "y": 1886.8498849868774,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "43ca1b3a.8238a4",
+ "id": "f192b08c.ec685",
"type": "set",
"name": "set ar-data",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />",
"comments": "",
- "x": 603.4922122955322,
- "y": 1791.8501069545746,
- "z": "8408bfb2.5391c",
+ "x": 608.4922122955322,
+ "y": 1764.8501069545746,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "a7a8f21b.2788e",
+ "id": "f18db1f7.e4c95",
"type": "execute",
"name": "execute getTime",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 620.77805519104,
- "y": 1864.4697046279907,
- "z": "8408bfb2.5391c",
+ "x": 625.77805519104,
+ "y": 1837.4697046279907,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "e85cfb03.0cc698",
+ "id": "7bf02ef8.1215c",
"type": "set",
"name": "set allotted-resource-oper-status",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
"comments": "",
- "x": 670.7651348114014,
- "y": 1901.4207849502563,
- "z": "8408bfb2.5391c",
+ "x": 675.7651348114014,
+ "y": 1874.4207849502563,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "b210c8e1.8a1f58",
+ "id": "17f7a6f0.5e20c9",
"type": "set",
"name": "set model-data",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
"comments": "",
- "x": 617.3337535858154,
- "y": 1831.024757385254,
- "z": "8408bfb2.5391c",
+ "x": 622.3337535858154,
+ "y": 1804.024757385254,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "c1cb8c0d.2e37e",
+ "id": "59f6758a.f1882c",
"type": "comment",
"name": "Prepare data for allotted-resource addition to MDSAL",
"info": "This will add to allotted-resource which is present inside service.",
"comments": "",
- "x": 730.66721534729,
- "y": 1752.0247094631195,
- "z": "8408bfb2.5391c",
+ "x": 735.66721534729,
+ "y": 1725.0247094631195,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "df3f7f58.d001f",
+ "id": "e5584499.737208",
"type": "comment",
"name": "Add to allotted-resources in mdsal",
"info": "",
"comments": "",
- "x": 672.2470417022705,
- "y": 1719.4380111694336,
- "z": "8408bfb2.5391c",
+ "x": 677.2470417022705,
+ "y": 1692.4380111694336,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "37ff9c4b.85c4b4",
+ "id": "bd9c39e4.8a1478",
"type": "update",
"name": "update AAI allotted-resource",
"xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
"comments": "",
"outputs": 1,
- "x": 660.2230968475342,
- "y": 2148.7550144195557,
- "z": "8408bfb2.5391c",
+ "x": 665.2230968475342,
+ "y": 2121.7550144195557,
+ "z": "cbb28df7.1359",
"wires": [
[
- "1b789a42.5731a6",
- "38fb2ac3.f4e026"
+ "4cd33402.f5bedc",
+ "589b918b.e1a7"
]
]
},
{
- "id": "21d3ff91.ea3ad",
+ "id": "dfdb9aed.f71ce8",
"type": "execute",
"name": "execute RestApiCallNode getPath from OOF",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"http://oof.api.simpledemo.onap.org:8698/api/oof/v1/route\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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`\" />",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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": 1468.973056793213,
- "y": 1711.2546663284302,
- "z": "8408bfb2.5391c",
+ "x": 1473.973056793213,
+ "y": 1684.2546663284302,
+ "z": "cbb28df7.1359",
"wires": [
[
- "bafb67de.3074a8",
- "5a6c0e0a.12b56"
+ "5746b590.8e789c",
+ "dfadca6b.0a2088"
]
]
},
{
- "id": "bafb67de.3074a8",
+ "id": "5746b590.8e789c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1708.9731979370117,
- "y": 1735.254635810852,
- "z": "8408bfb2.5391c",
+ "x": 1713.9731979370117,
+ "y": 1708.254635810852,
+ "z": "cbb28df7.1359",
"wires": [
[
- "710b598a.58f428"
+ "6ae16eae.42967"
]
]
},
{
- "id": "18674100.77537f",
+ "id": "882eddea.960c4",
"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 OOF api\" />\n",
"comments": "",
- "x": 1847.973232269287,
- "y": 1684.2547273635864,
- "z": "8408bfb2.5391c",
+ "x": 1852.973232269287,
+ "y": 1657.2547273635864,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "5a6c0e0a.12b56",
+ "id": "dfadca6b.0a2088",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1707.9729843139648,
- "y": 1684.254726409912,
- "z": "8408bfb2.5391c",
+ "x": 1712.9729843139648,
+ "y": 1657.254726409912,
+ "z": "cbb28df7.1359",
"wires": [
[
- "18674100.77537f"
+ "882eddea.960c4"
]
]
},
{
- "id": "26f2f7bd.b11308",
+ "id": "4ef28c1a.417b14",
"type": "comment",
"name": "Get VPNs from OOF",
"info": "",
"comments": "",
- "x": 1454.976978302002,
- "y": 1678.2586660385132,
- "z": "8408bfb2.5391c",
+ "x": 1459.976978302002,
+ "y": 1651.2586660385132,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "bfb31be6.a42bf8",
+ "id": "14017773.15ade9",
"type": "for",
"name": "for vidx..oof.vpns_length[]",
"xml": "<for index='vidx' start='0' end='`$oof.vpns_length`' >",
"comments": "",
"outputs": 1,
- "x": 1408.972900390625,
- "y": 1793.50439453125,
- "z": "8408bfb2.5391c",
+ "x": 1413.972900390625,
+ "y": 1766.50439453125,
+ "z": "cbb28df7.1359",
"wires": [
[
- "7ccc98bc.08a1c8"
+ "1e38af3f.f6ce71"
]
]
},
{
- "id": "b17db7bf.7ed888",
+ "id": "3e61c92c.93c8a6",
"type": "comment",
"name": "Loop through VPN and configure them",
"info": "",
"comments": "",
- "x": 1454.9733505249023,
- "y": 1928.0047721862793,
- "z": "8408bfb2.5391c",
+ "x": 1459.9733505249023,
+ "y": 1901.0047721862793,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "3ab7c28c.29ebee",
+ "id": "63d37889.57ca38",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`\">\n \n",
"comments": "",
"outputs": 1,
- "x": 2648.757080078125,
- "y": 1265.121826171875,
- "z": "8408bfb2.5391c",
+ "x": 2653.757080078125,
+ "y": 1238.121826171875,
+ "z": "cbb28df7.1359",
"wires": [
[
- "80770609.775ee8"
+ "bead713d.d0c48"
]
]
},
{
- "id": "80770609.775ee8",
+ "id": "bead713d.d0c48",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2837.757049560547,
- "y": 1265.121811389923,
- "z": "8408bfb2.5391c",
+ "x": 2842.757049560547,
+ "y": 1238.121811389923,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e1e890c6.ecbaa"
+ "e5afa8f6.b33978"
]
]
},
{
- "id": "e1e890c6.ecbaa",
+ "id": "e5afa8f6.b33978",
"type": "set",
"name": "set etht-svc-name & bandwidth-profile-name",
"xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
"comments": "",
- "x": 3078.75736618042,
- "y": 1264.7218661308289,
- "z": "8408bfb2.5391c",
+ "x": 3083.75736618042,
+ "y": 1237.7218661308289,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "26dbc77e.931828",
+ "id": "ff3897ba.b2c938",
"type": "switchNode",
"name": "switch description",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2661.5969581604004,
- "y": 1300.1219210624695,
- "z": "8408bfb2.5391c",
+ "x": 2666.5969581604004,
+ "y": 1273.1219210624695,
+ "z": "cbb28df7.1359",
"wires": [
[
- "85ca2389.bb6f4"
+ "7e0c933d.418d0c"
]
]
},
{
- "id": "85ca2389.bb6f4",
+ "id": "7e0c933d.418d0c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2836.597023010254,
- "y": 1302.1219067573547,
- "z": "8408bfb2.5391c",
+ "x": 2841.597023010254,
+ "y": 1275.1219067573547,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d8003739.5fe0f8"
+ "3819c097.d5b38"
]
]
},
{
- "id": "d8003739.5fe0f8",
+ "id": "3819c097.d5b38",
"type": "set",
"name": "set etht-svc-descr",
"xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
"comments": "",
- "x": 2992.9303398132324,
- "y": 1299.5829815864563,
- "z": "8408bfb2.5391c",
+ "x": 2997.9303398132324,
+ "y": 1272.5829815864563,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "ea187132.b5e71",
+ "id": "410b060d.0c2948",
"type": "switchNode",
"name": "switch tenantId",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2656.979221343994,
- "y": 1333.4553112983704,
- "z": "8408bfb2.5391c",
+ "x": 2661.979221343994,
+ "y": 1306.4553112983704,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b902a644.d22b48"
+ "2df9d1b1.36383e"
]
]
},
{
- "id": "b902a644.d22b48",
+ "id": "2df9d1b1.36383e",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2834.9792251586914,
- "y": 1337.4551892280579,
- "z": "8408bfb2.5391c",
+ "x": 2839.9792251586914,
+ "y": 1310.4551892280579,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f54bc445.403788"
+ "357ff876.835a78"
]
]
},
{
- "id": "f54bc445.403788",
+ "id": "357ff876.835a78",
"type": "set",
"name": "set tenantId",
"xml": "<set>\n<parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
"comments": "",
- "x": 2972.9794120788574,
- "y": 1334.0551648139954,
- "z": "8408bfb2.5391c",
+ "x": 2977.9794120788574,
+ "y": 1307.0551648139954,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "c98b4f19.64757",
+ "id": "623ff136.8ac42",
"type": "switchNode",
"name": "switch cir",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2639.818820953369,
- "y": 1406.4552664756775,
- "z": "8408bfb2.5391c",
+ "x": 2644.818820953369,
+ "y": 1379.4552664756775,
+ "z": "cbb28df7.1359",
"wires": [
[
- "9783697c.7bd558"
+ "a057011b.3d0e6"
]
]
},
{
- "id": "9783697c.7bd558",
+ "id": "a057011b.3d0e6",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2834.8188858032227,
- "y": 1407.4552664756775,
- "z": "8408bfb2.5391c",
+ "x": 2839.8188858032227,
+ "y": 1380.4552664756775,
+ "z": "cbb28df7.1359",
"wires": [
[
- "466b0eb3.bb2f5"
+ "25f349b7.7cabf6"
]
]
},
{
- "id": "466b0eb3.bb2f5",
+ "id": "25f349b7.7cabf6",
"type": "set",
"name": "set cir",
"xml": "<set>\n<parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
"comments": "",
- "x": 2959.15238571167,
- "y": 1405.916341304779,
- "z": "8408bfb2.5391c",
+ "x": 2964.15238571167,
+ "y": 1378.916341304779,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "89603344.a7cf9",
+ "id": "805eddea.23b52",
"type": "switchNode",
"name": "switch vpnType",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2654.127109527588,
- "y": 1369.232976436615,
- "z": "8408bfb2.5391c",
+ "x": 2659.127109527588,
+ "y": 1342.232976436615,
+ "z": "cbb28df7.1359",
"wires": [
[
- "87ab7779.c52db8"
+ "f566b2bd.002c1"
]
]
},
{
- "id": "87ab7779.c52db8",
+ "id": "f566b2bd.002c1",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2836.127296447754,
- "y": 1372.232961177826,
- "z": "8408bfb2.5391c",
+ "x": 2841.127296447754,
+ "y": 1345.232961177826,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3f32f379.afc74c"
+ "69079e30.4f1f7"
]
]
},
{
- "id": "3f32f379.afc74c",
+ "id": "69079e30.4f1f7",
"type": "set",
"name": "set vpnType",
"xml": "<set>\n<parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
"comments": "",
- "x": 2972.461040496826,
- "y": 1368.6942028999329,
- "z": "8408bfb2.5391c",
+ "x": 2977.461040496826,
+ "y": 1341.6942028999329,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "42370cde.333864",
+ "id": "3055227f.6b6a0e",
"type": "switchNode",
"name": "switch eir",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2635.1091651916504,
- "y": 1440.1531739234924,
- "z": "8408bfb2.5391c",
+ "x": 2640.1091651916504,
+ "y": 1413.1531739234924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "15d6de1e.22e142"
+ "2ee770d4.d5299"
]
]
},
{
- "id": "15d6de1e.22e142",
+ "id": "2ee770d4.d5299",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2835.1094131469727,
- "y": 1443.1531128883362,
- "z": "8408bfb2.5391c",
+ "x": 2840.1094131469727,
+ "y": 1416.1531128883362,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b64e8009.4dda9"
+ "b9ec2386.9ae27"
]
]
},
{
- "id": "b64e8009.4dda9",
+ "id": "b9ec2386.9ae27",
"type": "set",
"name": "set eir",
"xml": "<set>\n<parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
"comments": "",
- "x": 2958.4430351257324,
- "y": 1442.6141724586487,
- "z": "8408bfb2.5391c",
+ "x": 2963.4430351257324,
+ "y": 1415.6141724586487,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "542afd70.800e84",
+ "id": "830a582f.f084d8",
"type": "switchNode",
"name": "switch colorAware",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2660.109775543213,
- "y": 1474.1530528068542,
- "z": "8408bfb2.5391c",
+ "x": 2665.109775543213,
+ "y": 1447.1530528068542,
+ "z": "cbb28df7.1359",
"wires": [
[
- "c02edc40.a4984"
+ "e42ebbc6.466e88"
]
]
},
{
- "id": "c02edc40.a4984",
+ "id": "e42ebbc6.466e88",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2831.1095962524414,
- "y": 1480.1529912948608,
- "z": "8408bfb2.5391c",
+ "x": 2836.1095962524414,
+ "y": 1453.1529912948608,
+ "z": "cbb28df7.1359",
"wires": [
[
- "bc113f5e.da64f"
+ "6fd3f45c.5fea2c"
]
]
},
{
- "id": "bc113f5e.da64f",
+ "id": "6fd3f45c.5fea2c",
"type": "set",
"name": "set colorAware",
"xml": "<set>\n<parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
"comments": "",
- "x": 2979.44291305542,
- "y": 1480.6142039299011,
- "z": "8408bfb2.5391c",
+ "x": 2984.44291305542,
+ "y": 1453.6142039299011,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "bb2b418a.7b353",
+ "id": "f77b8935.e0ba38",
"type": "switchNode",
"name": "switch couplingFlag",
"xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2662.1097145080566,
- "y": 1510.1531147956848,
- "z": "8408bfb2.5391c",
+ "x": 2667.1097145080566,
+ "y": 1483.1531147956848,
+ "z": "cbb28df7.1359",
"wires": [
[
- "7f802b07.ecbf24"
+ "66020844.5e3b48"
]
]
},
{
- "id": "7f802b07.ecbf24",
+ "id": "66020844.5e3b48",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2834.1095962524414,
- "y": 1519.1530842781067,
- "z": "8408bfb2.5391c",
+ "x": 2839.1095962524414,
+ "y": 1492.1530842781067,
+ "z": "cbb28df7.1359",
"wires": [
[
- "c56e4808.694228"
+ "74a5b014.5554d"
]
]
},
{
- "id": "c56e4808.694228",
+ "id": "74a5b014.5554d",
"type": "set",
"name": "set couplingFlag",
"xml": "<set>\n<parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
"comments": "",
- "x": 2987.44291305542,
- "y": 1519.6142048835754,
- "z": "8408bfb2.5391c",
+ "x": 2992.44291305542,
+ "y": 1492.6142048835754,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "88779084.b1b7a",
+ "id": "4bea378a.ee8c98",
"type": "comment",
"name": "Check if other EP exists in SOTNConnectionResource",
"info": "",
"comments": "",
- "x": 2793.312744140625,
- "y": 1128.7884521484375,
- "z": "8408bfb2.5391c",
+ "x": 2798.312744140625,
+ "y": 1101.7884521484375,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "218cf941.d932e6",
+ "id": "c5b17466.a418c8",
"type": "comment",
"name": "Get other global parameters from network",
"info": "",
"comments": "",
- "x": 2729.3125,
- "y": 1214.7884521484375,
- "z": "8408bfb2.5391c",
+ "x": 2734.3125,
+ "y": 1187.7884521484375,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "a34cb9dd.d28f48",
+ "id": "b4347cf5.49bc8",
"type": "switchNode",
"name": "switch access-provider-id",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`\">",
"comments": "",
"outputs": 1,
- "x": 1677.5348529815674,
- "y": 1476.2329812049866,
- "z": "8408bfb2.5391c",
+ "x": 1682.5348529815674,
+ "y": 1449.2329812049866,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5225a75b.b6a278"
+ "1b940064.8ad79"
]
]
},
{
- "id": "5225a75b.b6a278",
+ "id": "1b940064.8ad79",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1864.5348529815674,
- "y": 1472.2329812049866,
- "z": "8408bfb2.5391c",
+ "x": 1869.5348529815674,
+ "y": 1445.2329812049866,
+ "z": "cbb28df7.1359",
"wires": [
[
- "bb23f0a1.13aff"
+ "427c462c.3a8218"
]
]
},
{
- "id": "bb23f0a1.13aff",
+ "id": "427c462c.3a8218",
"type": "set",
"name": "set access-provider-id",
"xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2032.5348529815674,
- "y": 1472.8329873085022,
- "z": "8408bfb2.5391c",
+ "x": 2037.5348529815674,
+ "y": 1445.8329873085022,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "724051d8.4335d",
+ "id": "5c76f693.8395f8",
"type": "switchNode",
"name": "switch access-client-id",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`\">",
"comments": "",
"outputs": 1,
- "x": 1668.5348682403564,
- "y": 1519.2434296607971,
- "z": "8408bfb2.5391c",
+ "x": 1673.5348682403564,
+ "y": 1492.2434296607971,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ff129381.47439"
+ "8078ffd1.06781"
]
]
},
{
- "id": "ff129381.47439",
+ "id": "8078ffd1.06781",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1855.5348682403564,
- "y": 1515.2434296607971,
- "z": "8408bfb2.5391c",
+ "x": 1860.5348682403564,
+ "y": 1488.2434296607971,
+ "z": "cbb28df7.1359",
"wires": [
[
- "646b3044.5a019"
+ "ee89727e.012f2"
]
]
},
{
- "id": "646b3044.5a019",
+ "id": "ee89727e.012f2",
"type": "set",
"name": "set access-client-id",
"xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2023.5348682403564,
- "y": 1515.8434357643127,
- "z": "8408bfb2.5391c",
+ "x": 2028.5348682403564,
+ "y": 1488.8434357643127,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "aa8cb96a.2b0388",
+ "id": "59d53676.123ac8",
"type": "switchNode",
"name": "switch access-topology-id",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`\">",
"comments": "",
"outputs": 1,
- "x": 1681.534812927246,
- "y": 1561.2434606552124,
- "z": "8408bfb2.5391c",
+ "x": 1686.534812927246,
+ "y": 1534.2434606552124,
+ "z": "cbb28df7.1359",
"wires": [
[
- "850aea86.efd2b8"
+ "ad434cbd.d2efc"
]
]
},
{
- "id": "850aea86.efd2b8",
+ "id": "ad434cbd.d2efc",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1868.534812927246,
- "y": 1557.2434606552124,
- "z": "8408bfb2.5391c",
+ "x": 1873.534812927246,
+ "y": 1530.2434606552124,
+ "z": "cbb28df7.1359",
"wires": [
[
- "684120ad.73ee4"
+ "2b625bb5.d8dfe4"
]
]
},
{
- "id": "684120ad.73ee4",
+ "id": "2b625bb5.d8dfe4",
"type": "set",
"name": "set access-topology-id",
"xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2036.534812927246,
- "y": 1557.843466758728,
- "z": "8408bfb2.5391c",
+ "x": 2041.534812927246,
+ "y": 1530.843466758728,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "7ccc98bc.08a1c8",
+ "id": "1e38af3f.f6ce71",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1632.090217590332,
- "y": 1830.3444538116455,
- "z": "8408bfb2.5391c",
+ "x": 1637.090217590332,
+ "y": 1803.3444538116455,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5e2345ea.98643c",
- "9cdc2e08.4c708",
- "49da5087.2ef8c",
- "28e7193.be6e4e6",
- "af1ee321.f9c8f",
- "9e37cd9e.2c26b",
- "22309e2d.4e2112",
- "c455d29d.5ee15",
- "dce4c016.eb68d",
- "8bccebfa.8dc598"
+ "25129de9.186342",
+ "bf4d6589.d6b308",
+ "2c248924.320b46",
+ "97ef93ae.8225c",
+ "71bec3b2.6b692c",
+ "803aa791.a5b668",
+ "55ed92f3.9f37ac",
+ "b5e33c1e.9cd83",
+ "ce79c05a.55781",
+ "23370a9.5aed5f6"
]
]
},
{
- "id": "56421575.13e47c",
+ "id": "a8cc5d14.06bf4",
"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": 2273.534881591797,
- "y": 1894.6776461601257,
- "z": "8408bfb2.5391c",
+ "x": 2278.534881591797,
+ "y": 1867.6776461601257,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "c455d29d.5ee15",
+ "id": "b5e33c1e.9cd83",
"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 = $tmp.thirdparty-sdnc-id AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
"comments": "",
"outputs": 1,
- "x": 1890.0347900390625,
- "y": 1931.6775856018066,
- "z": "8408bfb2.5391c",
+ "x": 1895.0347900390625,
+ "y": 1904.6775856018066,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3cdb301b.34dde",
- "8a438cce.4438d",
- "1a1ad8a.53da727"
+ "f21a66d9.8077a8",
+ "63593a58.c04864",
+ "7c8fedda.36f2d4"
]
]
},
{
- "id": "3cdb301b.34dde",
+ "id": "f21a66d9.8077a8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2110.034725189209,
- "y": 1895.6775546073914,
- "z": "8408bfb2.5391c",
+ "x": 2115.034725189209,
+ "y": 1868.6775546073914,
+ "z": "cbb28df7.1359",
"wires": [
[
- "56421575.13e47c"
+ "a8cc5d14.06bf4"
]
]
},
{
- "id": "8a438cce.4438d",
+ "id": "63593a58.c04864",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 2119.525665283203,
- "y": 1936.2515606880188,
- "z": "8408bfb2.5391c",
+ "x": 2124.525665283203,
+ "y": 1909.2515606880188,
+ "z": "cbb28df7.1359",
"wires": [
[
- "7adc3011.31b48"
+ "ba7a24b5.83e278"
]
]
},
{
- "id": "1a1ad8a.53da727",
+ "id": "7c8fedda.36f2d4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2114.858642578125,
- "y": 1972.5848736763,
- "z": "8408bfb2.5391c",
+ "x": 2119.858642578125,
+ "y": 1945.5848736763,
+ "z": "cbb28df7.1359",
"wires": [
[
- "c476b95c.317398"
+ "9d46cc37.6bebe"
]
]
},
{
- "id": "7adc3011.31b48",
+ "id": "ba7a24b5.83e278",
"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": 2266.0970153808594,
- "y": 1932.5373873710632,
- "z": "8408bfb2.5391c",
+ "x": 2271.0970153808594,
+ "y": 1905.5373873710632,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "c476b95c.317398",
+ "id": "9d46cc37.6bebe",
"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": 2269.6312866210938,
- "y": 1974.0240216255188,
- "z": "8408bfb2.5391c",
+ "x": 2274.6312866210938,
+ "y": 1947.0240216255188,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "22309e2d.4e2112",
+ "id": "55ed92f3.9f37ac",
"type": "get-resource",
"name": "get-resource pnf",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n pfx='tmp.aai.pnf' local-only='false' >\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1835.534683227539,
- "y": 1840.6772294044495,
- "z": "8408bfb2.5391c",
+ "x": 1840.534683227539,
+ "y": 1813.6772294044495,
+ "z": "cbb28df7.1359",
"wires": [
[
- "4c6591a0.fd0d5",
- "3f03425.dc307be",
- "55a8764.382b688"
+ "4c302da.addb0d4",
+ "5d24a360.057f4c",
+ "41a13e1a.fbbb1"
]
]
},
{
- "id": "4c6591a0.fd0d5",
+ "id": "4c302da.addb0d4",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2017.5347290039062,
- "y": 1785.677339553833,
- "z": "8408bfb2.5391c",
+ "x": 2022.5347290039062,
+ "y": 1758.677339553833,
+ "z": "cbb28df7.1359",
"wires": [
[
- "44f2e24b.08176c"
+ "5347e72e.2bfef8"
]
]
},
{
- "id": "3f03425.dc307be",
+ "id": "5d24a360.057f4c",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 2018.0256309509277,
- "y": 1823.2514362335205,
- "z": "8408bfb2.5391c",
+ "x": 2023.0256309509277,
+ "y": 1796.2514362335205,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b1d992a2.3473"
+ "30e7544d.83010c"
]
]
},
{
- "id": "55a8764.382b688",
+ "id": "41a13e1a.fbbb1",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2009.358642578125,
- "y": 1856.5848112106323,
- "z": "8408bfb2.5391c",
+ "x": 2014.358642578125,
+ "y": 1829.5848112106323,
+ "z": "cbb28df7.1359",
"wires": [
[
- "de897f67.8434"
+ "2ea2fe84.d1da82"
]
]
},
{
- "id": "b1d992a2.3473",
+ "id": "30e7544d.83010c",
"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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
"comments": "",
- "x": 2165.597255706787,
- "y": 1822.5373249053955,
- "z": "8408bfb2.5391c",
+ "x": 2170.597255706787,
+ "y": 1795.5373249053955,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "de897f67.8434",
+ "id": "2ea2fe84.d1da82",
"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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
"comments": "",
- "x": 2163.1312866210938,
- "y": 1856.023959159851,
- "z": "8408bfb2.5391c",
+ "x": 2168.1312866210938,
+ "y": 1829.023959159851,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "44f2e24b.08176c",
+ "id": "5347e72e.2bfef8",
"type": "set",
"name": "set tmp.thirdparty-sdnc-id",
"xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
"comments": "",
- "x": 2202.5347290039062,
- "y": 1784.6774616241455,
- "z": "8408bfb2.5391c",
+ "x": 2207.5347290039062,
+ "y": 1757.6774616241455,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d17a16c8.3b48c8",
+ "id": "d0963e5.17cefc",
"type": "comment",
"name": "get domain controller information",
"info": "",
"comments": "",
- "x": 1886.0385971069336,
- "y": 1807.6811847686768,
- "z": "8408bfb2.5391c",
+ "x": 1891.0385971069336,
+ "y": 1780.6811847686768,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "8bccebfa.8dc598",
+ "id": "23370a9.5aed5f6",
"type": "set",
"name": "set oof.vpn",
"xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />",
"comments": "",
- "x": 1847.534683227539,
- "y": 1761.7883129119873,
- "z": "8408bfb2.5391c",
+ "x": 1852.534683227539,
+ "y": 1734.7883129119873,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "9cdc2e08.4c708",
+ "id": "bf4d6589.d6b308",
"type": "save",
"name": "save VPN resource in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n key='vpn-binding.vpn-id = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n<parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />",
"comments": "",
"outputs": 1,
- "x": 1866.000099182129,
- "y": 2178.7507152557373,
- "z": "8408bfb2.5391c",
+ "x": 1871.000099182129,
+ "y": 2151.7507152557373,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "49da5087.2ef8c",
+ "id": "2c248924.320b46",
"type": "set",
"name": "set tmp.vpnName",
"xml": "<set>\n<parameter name='tmp.vpnName' value=\"`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`\" />",
"comments": "",
- "x": 1842.500099182129,
- "y": 2131.2504119873047,
- "z": "8408bfb2.5391c",
+ "x": 1847.500099182129,
+ "y": 2104.2504119873047,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "28e7193.be6e4e6",
+ "id": "97ef93ae.8225c",
"type": "save",
"name": "save connectivity relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$mdsal-psd.service-data.networks.network[0].network-id`\" />",
"comments": "",
"outputs": 1,
- "x": 1901.000099182129,
- "y": 2223.7504711151123,
- "z": "8408bfb2.5391c",
+ "x": 1906.000099182129,
+ "y": 2196.7504711151123,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "5e9a8894.bc5eb8",
+ "id": "cc0d73cc.20adc",
"type": "comment",
"name": "save vpn and its relation to AAI",
"info": "",
"comments": "",
- "x": 1884.0002975463867,
- "y": 2092.750680923462,
- "z": "8408bfb2.5391c",
+ "x": 1889.0002975463867,
+ "y": 2065.750680923462,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "5e2345ea.98643c",
+ "id": "25129de9.186342",
"type": "set",
"name": "set src-ltpId dst-ltpId",
"xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
"comments": "",
- "x": 1853.000129699707,
- "y": 2263.750591278076,
- "z": "8408bfb2.5391c",
+ "x": 1858.000129699707,
+ "y": 2236.750591278076,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "af1ee321.f9c8f",
+ "id": "71bec3b2.6b692c",
"type": "save",
"name": "save srcLTP relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1887.0003814697266,
- "y": 2303.5008001327515,
- "z": "8408bfb2.5391c",
+ "x": 1892.0003814697266,
+ "y": 2276.5008001327515,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "9e37cd9e.2c26b",
+ "id": "803aa791.a5b668",
"type": "save",
"name": "save dstLTP relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
"comments": "",
"outputs": 1,
- "x": 1885.0002136230469,
- "y": 2349.250638961792,
- "z": "8408bfb2.5391c",
+ "x": 1890.0002136230469,
+ "y": 2322.250638961792,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "38dcc355.b103ac",
+ "id": "acc938bc.eae1d8",
"type": "execute",
"name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 827.0039367675781,
- "y": 614.0039119720459,
- "z": "8408bfb2.5391c",
+ "x": 832.0039367675781,
+ "y": 587.0039119720459,
+ "z": "cbb28df7.1359",
"wires": [
[
- "936be6c0.7bea88",
- "e9cdf97c.418498"
+ "a1fbf2bd.6b2d9",
+ "97f58790.fbe988"
]
]
},
{
- "id": "8ae6fd1b.92978",
+ "id": "d519b726.ce9b88",
"type": "execute",
"name": "execute RestApiCallNode - get-resource parent service data",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 754.0040893554688,
- "y": 841.004075050354,
- "z": "8408bfb2.5391c",
+ "x": 759.0040893554688,
+ "y": 814.004075050354,
+ "z": "cbb28df7.1359",
"wires": [
[
- "29a80022.cf94",
- "6ef3a6c9.24a468"
+ "76dc332e.fe177c",
+ "cbf3f4e6.00aa98"
]
]
},
{
- "id": "20f5a5d.63f625a",
+ "id": "8ad08551.c43818",
"type": "execute",
"name": "get parent-service-data url",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 654.0039978027344,
- "y": 804.0039081573486,
- "z": "8408bfb2.5391c",
+ "x": 659.0039978027344,
+ "y": 777.0039081573486,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "5c659a2b.afc754",
+ "id": "2fbf3350.d69d7c",
"type": "execute",
"name": "generate tmp.ar-other-url-connection",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-other-url-connection\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.provided-ar.allotted-resource-id`\"/>\n \n\n",
"comments": "",
"outputs": 1,
- "x": 2068.0003509521484,
- "y": 960.3334693908691,
- "z": "8408bfb2.5391c",
+ "x": 2073.0003509521484,
+ "y": 933.3334693908691,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "8cf7d234.3dc16",
+ "id": "51067155.cb254",
"type": "execute",
"name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-other-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-other-ar\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 2205.000991821289,
- "y": 1002.8333339691162,
- "z": "8408bfb2.5391c",
+ "x": 2210.000991821289,
+ "y": 975.8333339691162,
+ "z": "cbb28df7.1359",
"wires": [
[
- "989dac87.78e81",
- "34bec365.7b96ac"
+ "7d7dc112.d678b",
+ "79425b66.b91424"
]
]
},
{
- "id": "710b598a.58f428",
+ "id": "6ae16eae.42967",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1830.0002708435059,
- "y": 1726.0001192092896,
- "z": "8408bfb2.5391c",
+ "x": 1835.0002708435059,
+ "y": 1699.0001192092896,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "b9f6cbba.591c38",
+ "id": "d86d0f7e.bebac",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1206.9688835144043,
- "y": 1751.0003032684326,
- "z": "8408bfb2.5391c",
+ "x": 1211.9688835144043,
+ "y": 1724.0003032684326,
+ "z": "cbb28df7.1359",
"wires": [
[
- "21d3ff91.ea3ad",
- "bfb31be6.a42bf8"
+ "dfdb9aed.f71ce8",
+ "14017773.15ade9"
]
]
+ },
+ {
+ "id": "453143a6.32929c",
+ "type": "outcome",
+ "name": "outcome PendingDelete",
+ "xml": "<outcome value='PendingDelete'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2286.0313415527344,
+ "y": 539.0312976837158,
+ "z": "cbb28df7.1359",
+ "wires": [
+ [
+ "ea213aeb.c1a238"
+ ]
+ ]
+ },
+ {
+ "id": "ea213aeb.c1a238",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2470.031352996826,
+ "y": 535.0312976837158,
+ "z": "cbb28df7.1359",
+ "wires": [
+ []
+ ]
}
] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json
new file mode 100644
index 00000000..2fc5b3ea
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json
@@ -0,0 +1,377 @@
+[
+ {
+ "id": "ba830c79.783fc",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 112,
+ "y": 60,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "4ae6deec.cd3f3"
+ ]
+ ]
+ },
+ {
+ "id": "4ae6deec.cd3f3",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "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": 330.49999237060547,
+ "y": 140.9999928767793,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "d2d46081.2fceb"
+ ]
+ ]
+ },
+ {
+ "id": "d2d46081.2fceb",
+ "type": "method",
+ "name": "sotn-network-topology-operation-reoptimize",
+ "xml": "<method rpc='sotn-network-topology-operation-reoptimize' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 331.5,
+ "y": 194,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "36051f70.beb8c"
+ ]
+ ]
+ },
+ {
+ "id": "36051f70.beb8c",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 409.50000762939453,
+ "y": 252.000009059906,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "7af3f162.64be",
+ "def5a09c.a5553",
+ "ecfb074a.096988",
+ "17f9a997.150a06",
+ "a8c6638b.cba29",
+ "59b44687.021ed8"
+ ]
+ ]
+ },
+ {
+ "id": "7af3f162.64be",
+ "type": "set",
+ "name": "set tmp.network.parent-network-id,etc",
+ "xml": "<set>\n<parameter name='tmp.network.network-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='tmp.network.service-instance-id' value='`$network-topology-operation-input.service-information.service-instance-id`' />\n\n\n",
+ "comments": "",
+ "x": 757.0000152587891,
+ "y": 147.00000476837158,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "e6874582.0b2958",
+ "type": "comment",
+ "name": "set tmp connectivity-id to fetch resource from MDSAL",
+ "info": "",
+ "comments": "",
+ "x": 826.9603424072266,
+ "y": 112.03180408477783,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "def5a09c.a5553",
+ "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": 700.9999542236328,
+ "y": 230.00000476837158,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "5022e1ba.bc98c",
+ "type": "comment",
+ "name": "Obtain different URL, template location etc",
+ "info": "For saving resource information to MDSAL & for AAI",
+ "comments": "",
+ "x": 796.7380523681641,
+ "y": 195.22217273712158,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "ecfb074a.096988",
+ "type": "for",
+ "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
+ "xml": "<for index='pidx' start='0' end='`$service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 911.0000991821289,
+ "y": 312.0000705718994,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "d7a2d973.f454d8"
+ ]
+ ]
+ },
+ {
+ "id": "d7a2d973.f454d8",
+ "type": "block",
+ "name": "block atomic",
+ "xml": "<block atomic=\"true\">\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 882.8459091186523,
+ "y": 368.224645614624,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "23cb526c.80076e",
+ "39defcd5.3339e4",
+ "165dda1d.49d8c6",
+ "6d05051.63437fc",
+ "2355af77.170bb",
+ "c3991295.942e1",
+ "5cbe5e79.5b38f",
+ "5573aa15.2f76f4",
+ "92a8c0e.7e8084",
+ "53bd8f16.8bed2"
+ ]
+ ]
+ },
+ {
+ "id": "23cb526c.80076e",
+ "type": "set",
+ "name": "set prop.ar.provided-allotted-resource-id",
+ "xml": "<set>\n<parameter name='prop.ar.provided-allotted-resource-id' value='`$service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />\n\n",
+ "comments": "",
+ "x": 1152.8153915405273,
+ "y": 351.02744245529175,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "39defcd5.3339e4",
+ "type": "execute",
+ "name": "generate tmp.ar-url-connection url",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-connection\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value='`$prop.ar.provided-allotted-resource-id`'/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1141.815284729004,
+ "y": 403.5724229812622,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "165dda1d.49d8c6",
+ "type": "execute",
+ "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-providedAr\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1282.8151321411133,
+ "y": 459.2390090227127,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "cd095866.b31848",
+ "1215888c.ee51e7"
+ ]
+ ]
+ },
+ {
+ "id": "cd095866.b31848",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1658.185203552246,
+ "y": 459.7611274719238,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "7c49cfc5.d8cce"
+ ]
+ ]
+ },
+ {
+ "id": "1215888c.ee51e7",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1650.0370063781738,
+ "y": 494.8272123336792,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ [
+ "77edea1f.976304"
+ ]
+ ]
+ },
+ {
+ "id": "7c49cfc5.d8cce",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1789.1852989196777,
+ "y": 459.7611885070801,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "77edea1f.976304",
+ "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=\"Error: Parent service data not available\" />\n \n",
+ "comments": "",
+ "x": 1796.1857872009277,
+ "y": 494.0946235656738,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "c3991295.942e1",
+ "type": "set",
+ "name": "set model-data to input",
+ "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.onap-model-information.` \" />",
+ "comments": "",
+ "x": 1123.0001907348633,
+ "y": 594.0000371932983,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "2355af77.170bb",
+ "type": "set",
+ "name": "set connection-attachment-ar-identifiers to input",
+ "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.service-information.service-instance-id' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id` \" />\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.parent-service-instance-id` \" />\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-type` \" />\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-id` \" />\n",
+ "comments": "",
+ "x": 1198.301872253418,
+ "y": 556.0159864425659,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "6d05051.63437fc",
+ "type": "set",
+ "name": "set ar-data to input",
+ "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.request-information.request-action' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-status.action` \" />\n<parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-status.rpc-action` \" />\n<parameter name='connection-attachment-topology-operation-input.request-information.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.request-information.` \" />\n<parameter name='connection-attachment-topology-operation-input.sdnc-request-header.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.` \" />\n<parameter name='connection-attachment-topology-operation-input.service-information.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.service-information.` \" />\n<parameter name='connection-attachment-topology-operation-input.allotted-resource-information.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.` \" />\n<parameter name='connection-attachment-topology-operation-input.connection-attachment-request-input.' value=\"`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.` \" />\n",
+ "comments": "",
+ "x": 1105.1586456298828,
+ "y": 514.8253927230835,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "53bd8f16.8bed2",
+ "type": "call",
+ "name": "call sotn-attachment-topology-operation-activate",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-activate' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1199.0001945495605,
+ "y": 769.0000486373901,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "5573aa15.2f76f4",
+ "type": "call",
+ "name": "call sotn-attachment-topology-operation-deactivate",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-deactivate' mode='sync' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1208.0002746582031,
+ "y": 678.0000429153442,
+ "z": "e5bf33cc.860bc",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "92a8c0e.7e8084",
+ "type": "set",
+ "name": "set request-action and svc-action",
+ "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value=\"activate\" />\n<parameter name='connection-attachment-topology-operation-input.request-information.request-action' value=\"ActivateSOTNAttachmentInstance\" />\n\n\n",
+ "comments": "",
+ "x": 1154.0002746582031,
+ "y": 723.0000457763672,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "5cbe5e79.5b38f",
+ "type": "set",
+ "name": "set request-action and svc-action",
+ "xml": "<set>\n<parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value=\"deactivate\" />\n<parameter name='connection-attachment-topology-operation-input.request-information.request-action' value=\"DeactivateSOTNAttachmentInstance\" />\n<parameter name='connection-attachment-topology-operation-input.service-information.global-customer-id' value=\"`$service-data.service-information.global-customer-id` \" />\n<parameter name='connection-attachment-topology-operation-input.service-information.subscription-service-type' value=\"`$service-data.service-information.subscription-service-type` \" />\n<parameter name='connection-attachment-topology-operation-input.service-information.subscriber-name' value=\"`$service-data.service-information.subscriber-name` \" />",
+ "comments": "",
+ "x": 1154.000114440918,
+ "y": 637.0000410079956,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "17f9a997.150a06",
+ "type": "set",
+ "name": "set service-data in tmp var",
+ "xml": "<set>\n<parameter name = 'tmp.service-data.' value=\"`$service-data.`\"/>\n",
+ "comments": "",
+ "x": 719.0001983642578,
+ "y": 266.0000944137573,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "a8c6638b.cba29",
+ "type": "set",
+ "name": "set tmp.service-data to service-data",
+ "xml": "<set>\n<parameter name = 'service-data. ' value = \"`$tmp.service-data.`\"/>\n",
+ "comments": "",
+ "x": 822.0003814697266,
+ "y": 845.0001068115234,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ },
+ {
+ "id": "59b44687.021ed8",
+ "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": 743.0001831054688,
+ "y": 889.0000267028809,
+ "z": "e5bf33cc.860bc",
+ "wires": []
+ }
+]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
index 88377fc5..05328d29 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
@@ -1,413 +1,420 @@
-<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}'>
- <method rpc='network-topology-operation' mode='sync'>
- <block atomic="true">
- <call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' ></call>
- <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
- <outcome value='assign'>
- <block atomic="true">
- <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
- <outcome value='Created'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- <outcome value='PendingDelete'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- <outcome value='PendingCreate'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- <outcome value='Other'>
- <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' ></call>
- </outcome>
- </switch>
- </block>
- </outcome>
- <outcome value='activate'>
- <switch test='`$network-topology-operation-input.request-information.request-action`'>
- <outcome value='ActivateSOTNConnectivityInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' ></call>
- </outcome>
- <outcome value='ActivateDCINetworkInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' ></call>
- </outcome>
- <outcome value='ActivateSDWANConnectivityInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-activate' mode='sync' ></call>
- </outcome>
- <outcome value='other'>
- <block atomic="true">
- <switch test='`$service-data.networks.network_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <block atomic="true">
- <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
- <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value='true'>
- <set>
- <parameter name='tmp.nidx' value='`$nidx`' />
- <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test="`$tmp.nidx`">
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='nidx' value='`$tmp.nidx`' />
- </set>
- </outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
- <outcome value=''>
- <return status='success'>
- <parameter name='' value='' />
- </return>
- </outcome>
- <outcome value='Other'>
- <block>
- <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <block atomic="true">
- <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
- <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='tmp.ngidx' value='`$ngidx`' />
- <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
- </set>
- </block>
- </outcome>
- </switch>
- </for>
- </block>
- </outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
- <outcome value='PendingCreate'>
- <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' ></call>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- </outcome>
- <outcome value='changeassign'>
- <block atomic="true">
- <switch test='`$service-data.networks.network_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <block atomic="true">
- <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
- <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value='true'>
- <set>
- <parameter name='tmp.nidx' value='`$nidx`' />
- <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test="`$tmp.nidx`">
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='nidx' value='`$tmp.nidx`' />
- </set>
- </outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-changeassign' mode='sync' ></call>
- </block>
- </outcome>
- <outcome value='deactivate'>
- <switch test='`$network-topology-operation-input.request-information.request-action`'>
- <outcome value='DeactivateSOTNConnectivityInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' ></call>
- </outcome>
- <outcome value='DeActivateDCINetworkInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' ></call>
- </outcome>
- <outcome value='DeactivateSDWANConnectivityInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-deactivate' mode='sync' ></call>
- </outcome>
- <outcome value='Other'>
- <block atomic="true">
- <switch test='`$service-data.networks.network_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <block atomic="true">
- <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
- <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value='true'>
- <set>
- <parameter name='tmp.nidx' value='`$nidx`' />
- <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test="`$tmp.nidx`">
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='nidx' value='`$tmp.nidx`' />
- </set>
- </outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
- <outcome value=''>
- <return status='success'>
- <parameter name='' value='' />
- </return>
- </outcome>
- <outcome value='Other'>
- <block>
- <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <block atomic="true">
- <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
- <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='tmp.ngidx' value='`$ngidx`' />
- <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
- </set>
- </block>
- </outcome>
- </switch>
- </for>
- </block>
- </outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' ></call>
- </block>
- </outcome>
- </switch>
- </outcome>
- <outcome value='unassign'>
- <block atomic="true">
- <switch test='`$service-data.networks.network_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <block atomic="true">
- <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
- <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
- <outcome value='true'>
- <set>
- <parameter name='tmp.nidx' value='`$nidx`' />
- <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
- </set>
- </outcome>
- </switch>
- </for>
- <switch test="`$tmp.nidx`">
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='nidx' value='`$tmp.nidx`' />
- </set>
- </outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
- <outcome value=''>
- <return status='success'>
- <parameter name='' value='' />
- </return>
- </outcome>
- <outcome value='Other'>
- <block>
- <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
- <outcome value=''>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
- </return>
- </outcome>
- <outcome value='Other'>
- <block atomic="true">
- <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
- <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='tmp.ngidx' value='`$ngidx`' />
- <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
- </set>
- </block>
- </outcome>
- </switch>
- </for>
- </block>
- </outcome>
- </switch>
- </block>
- </outcome>
- </switch>
- <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
- <outcome value='PendingCreate'>
- <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' ></call>
- </outcome>
- <outcome value='PendingDelete'>
- <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' ></call>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Network is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
- </return>
- </outcome>
- </switch>
- </block>
- </outcome>
- <outcome value='create'>
- <switch test='`$network-topology-operation-input.request-information.request-action`'>
- <outcome value='CreateSOTNConnectivityInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' ></call>
- </outcome>
- <outcome value='CreateSDWANConnectivityInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-create' mode='sync' ></call>
- </outcome>
- <outcome value='other'>
- <block atomic="true">
- <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' ></call>
- </block>
- </outcome>
- </switch>
- </outcome>
- <outcome value='delete'>
- <switch test='`$network-topology-operation-input.request-information.request-action`'>
- <outcome value='DeleteSOTNConnectivityInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' ></call>
- </outcome>
- <outcome value='DeleteSDWANConnectivityInstance'>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-delete' mode='sync' ></call>
- </outcome>
- <outcome value='other'>
- <block atomic="true">
- <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' ></call>
- </block>
- </outcome>
- </switch>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="sdnc-request-header.svc-action is a required input" />
- </return>
- </outcome>
- </switch>
- <set>
- <parameter name="ack-final" value="Y"/>
- </set>
- <return status='success'>
- <parameter name="ack-final-indicator" value="Y" />
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="`$error-message`" />
- </return>
- </block>
- </method>
-</service-logic>
+<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}'>
+ <method rpc='network-topology-operation' mode='sync'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' ></call>
+ <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+ <outcome value='assign'>
+ <block atomic="true">
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='Created'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
+ </outcome>
+ <outcome value='PendingDelete'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
+ </outcome>
+ <outcome value='PendingCreate'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' ></call>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='activate'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='ActivateSOTNConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' ></call>
+ </outcome>
+ <outcome value='ActivateDCINetworkInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' ></call>
+ </outcome>
+ <outcome value='ActivateSDWANConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-activate' mode='sync' ></call>
+ </outcome>
+ <outcome value='other'>
+ <block atomic="true">
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+ <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <set>
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.nidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='nidx' value='`$tmp.nidx`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+ <outcome value=''>
+ <return status='success'>
+ <parameter name='' value='' />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+ <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.ngidx' value='`$ngidx`' />
+ <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='PendingCreate'>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' ></call>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='changeassign'>
+ <block atomic="true">
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+ <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <set>
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.nidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='nidx' value='`$tmp.nidx`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-changeassign' mode='sync' ></call>
+ </block>
+ </outcome>
+ <outcome value='deactivate'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeactivateSOTNConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' ></call>
+ </outcome>
+ <outcome value='DeActivateDCINetworkInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' ></call>
+ </outcome>
+ <outcome value='DeactivateSDWANConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-deactivate' mode='sync' ></call>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+ <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <set>
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.nidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='nidx' value='`$tmp.nidx`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+ <outcome value=''>
+ <return status='success'>
+ <parameter name='' value='' />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+ <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.ngidx' value='`$ngidx`' />
+ <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' ></call>
+ </block>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='unassign'>
+ <block atomic="true">
+ <switch test='`$service-data.networks.network_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+ <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+ <outcome value='true'>
+ <set>
+ <parameter name='tmp.nidx' value='`$nidx`' />
+ <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ <switch test="`$tmp.nidx`">
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='nidx' value='`$tmp.nidx`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+ <outcome value=''>
+ <return status='success'>
+ <parameter name='' value='' />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+ <outcome value=''>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+ <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.ngidx' value='`$ngidx`' />
+ <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+ <outcome value='PendingCreate'>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' ></call>
+ </outcome>
+ <outcome value='PendingDelete'>
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' ></call>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Network is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='create'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='CreateSOTNConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' ></call>
+ </outcome>
+ <outcome value='CreateSDWANConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-create' mode='sync' ></call>
+ </outcome>
+ <outcome value='other'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' ></call>
+ </block>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='delete'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='DeleteSOTNConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' ></call>
+ </outcome>
+ <outcome value='DeleteSDWANConnectivityInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-delete' mode='sync' ></call>
+ </outcome>
+ <outcome value='other'>
+ <block atomic="true">
+ <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' ></call>
+ </block>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='reoptimize'>
+ <switch test='`$network-topology-operation-input.request-information.request-action`'>
+ <outcome value='ReoptimizeSOTNInstance'>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-reoptimize' mode='sync' ></call>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="sdnc-request-header.svc-action is a required input" />
+ </return>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name="ack-final" value="Y"/>
+ </set>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
index d957ba6b..5b00ed19 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
@@ -1,123 +1,132 @@
-<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}'>
- <method rpc='sdwan-get-site-param' mode='sync'>
- <block atomic="true">
- <for index='idx' start='0' end='`$vnf-request-input.vnf-input-parameters.param_length`' >
- <block>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'description'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.description' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'location-name'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.location-name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'address'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.location-address' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'postcode'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.location-postcode' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'latitude'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.location-latitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'longitude'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.location-longitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'emails'`">
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='prop.site.emails' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
- <parameter name="original_string" value='`$prop.site.emails`'/>
- <parameter name="regex" value=","/>
- <parameter name="ctx_memory_result_key" value="prop.site.email"/>
- </execute>
- </block>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'type'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.site.type' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- <parameter name='prop.site.sdwan' value='true' />
- </set>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'role'`">
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='prop.site.role' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
- <parameter name="original_string" value='`$prop.site.role`'/>
- <parameter name="regex" value=","/>
- <parameter name="ctx_memory_result_key" value="prop.site.roles"/>
- </execute>
- </block>
- </outcome>
- </switch>
- <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'controlPoint'`">
- <outcome value='true'>
- <block atomic="true">
- <set>
- <parameter name='prop.site.controlPoint' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
- </set>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
- <parameter name="original_string" value='`$prop.site.controlPoint`'/>
- <parameter name="regex" value=","/>
- <parameter name="ctx_memory_result_key" value="prop.site.controlpoints"/>
- </execute>
- </block>
- </outcome>
- </switch>
- <return status='success'>
- <parameter name="ack-final-indicator" value="Y" />
- <parameter name="error-code" value="200" />
- <parameter name="error-message" value="`$error-message`" />
- </return>
- </block>
- </for>
- </block>
- </method>
-</service-logic>
+<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}'>
+ <method rpc='sdwan-get-site-param' mode='sync'>
+ <block atomic="true">
+ <for index='idx' start='0' end='`$vnf-request-input.vnf-input-parameters.param_length`' >
+ <block>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.site.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'description'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.site.description' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.site.name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'location-name'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.site.location-name' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'address'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.site.location-address' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'postcode'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.site.location-postcode' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'latitude'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.site.location-latitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'longitude'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.site.location-longitude' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'emails'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.site.emails' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$prop.site.emails`'/>
+ <parameter name="regex" value=","/>
+ <parameter name="ctx_memory_result_key" value="prop.site.email"/>
+ </execute>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'type'`">
+ <outcome value='true'>
+ <block>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].value`">
+ <outcome value=''>
+ <block></block>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='prop.site.type' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ <parameter name='prop.site.sdwan' value='true' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'role'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.site.role' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$prop.site.role`'/>
+ <parameter name="regex" value=","/>
+ <parameter name="ctx_memory_result_key" value="prop.site.roles"/>
+ </execute>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'controlPoint'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.site.controlPoint' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$prop.site.controlPoint`'/>
+ <parameter name="regex" value=","/>
+ <parameter name="ctx_memory_result_key" value="prop.site.controlpoints"/>
+ </execute>
+ </block>
+ </outcome>
+ </switch>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </for>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index 7ec1dd82..9e0e96c6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -41,6 +41,9 @@
<outcome value='Created'>
<block></block>
</outcome>
+ <outcome value='PendingDelete'>
+ <block></block>
+ </outcome>
<outcome value='Other'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -594,4 +597,4 @@
</return>
</block>
</method>
-</service-logic> \ No newline at end of file
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml
new file mode 100644
index 00000000..9a257eb4
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml
@@ -0,0 +1,89 @@
+<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}'>
+ <method rpc='sotn-network-topology-operation-reoptimize' mode='sync'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.network.network-id' value='`$network-topology-operation-input.network-information.network-id`' />
+ <parameter name='tmp.network.service-instance-id' value='`$network-topology-operation-input.service-information.service-instance-id`' />
+ </set>
+ <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>
+ <set>
+ <parameter name = 'tmp.service-data.' value="`$service-data.`"/>
+ </set>
+ <for index='pidx' start='0' end='`$service-data.provided-allotted-resources.provided-allotted-resource_length`' >
+ <block atomic="true">
+ <set>
+ <parameter name='prop.ar.provided-allotted-resource-id' value='`$service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+ <parameter name="outputPath" value="tmp.ar-url-connection"/>
+ <parameter name="target" value="{allotted-resource-id}"/>
+ <parameter name="replacement" value='`$prop.ar.provided-allotted-resource-id`'/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-connection`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='GET' />
+ <parameter name="responsePrefix" value="mdsal-providedAr" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="404" />
+ <parameter name="error-message" value="Error: Parent service data not available" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='connection-attachment-topology-operation-input.request-information.request-action' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-status.action` " />
+ <parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-status.rpc-action` " />
+ <parameter name='connection-attachment-topology-operation-input.request-information.' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.request-information.` " />
+ <parameter name='connection-attachment-topology-operation-input.sdnc-request-header.' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.` " />
+ <parameter name='connection-attachment-topology-operation-input.service-information.' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.service-information.` " />
+ <parameter name='connection-attachment-topology-operation-input.allotted-resource-information.' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.` " />
+ <parameter name='connection-attachment-topology-operation-input.connection-attachment-request-input.' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.` " />
+ </set>
+ <set>
+ <parameter name='connection-attachment-topology-operation-input.service-information.service-instance-id' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.consuming-service-instance-id` " />
+ <parameter name='connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.parent-service-instance-id` " />
+ <parameter name='connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-type` " />
+ <parameter name='connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.allotted-resource-id` " />
+ </set>
+ <set>
+ <parameter name='connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.' value="`$mdsal-providedAr.connection-attachment-allotted-resource[0].allotted-resource-data.connection-attachment-topology.onap-model-information.` " />
+ </set>
+ <set>
+ <parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value="deactivate" />
+ <parameter name='connection-attachment-topology-operation-input.request-information.request-action' value="DeactivateSOTNAttachmentInstance" />
+ <parameter name='connection-attachment-topology-operation-input.service-information.global-customer-id' value="`$service-data.service-information.global-customer-id` " />
+ <parameter name='connection-attachment-topology-operation-input.service-information.subscription-service-type' value="`$service-data.service-information.subscription-service-type` " />
+ <parameter name='connection-attachment-topology-operation-input.service-information.subscriber-name' value="`$service-data.service-information.subscriber-name` " />
+ </set>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-deactivate' mode='sync' ></call>
+ <set>
+ <parameter name='connection-attachment-topology-operation-input.sdnc-request-header.svc-action' value="activate" />
+ <parameter name='connection-attachment-topology-operation-input.request-information.request-action' value="ActivateSOTNAttachmentInstance" />
+ </set>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-activate' mode='sync' ></call>
+ </block>
+ </for>
+ <set>
+ <parameter name = 'service-data. ' value = "`$tmp.service-data.`"/>
+ </set>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file