summaryrefslogtreecommitdiffstats
path: root/platform-logic
diff options
context:
space:
mode:
Diffstat (limited to 'platform-logic')
-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_self-serve-generate-name.json2062
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json2006
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json922
-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_self-serve-generate-name.xml78
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml17
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml5
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml89
-rwxr-xr-xplatform-logic/lcm/src/main/json/LCM_distribute-traffic.json656
-rw-r--r--platform-logic/lcm/src/main/json/LCM_lock.json358
-rw-r--r--platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json656
-rw-r--r--platform-logic/lcm/src/main/json/LCM_resume-traffic.json656
-rw-r--r--platform-logic/lcm/src/main/json/LCM_snapshot.json358
-rw-r--r--platform-logic/lcm/src/main/json/LCM_unlock.json358
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-backup.json358
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json656
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json656
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-software.json656
-rwxr-xr-xplatform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml75
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml75
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml75
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_snapshot.xml2
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_unlock.xml6
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml6
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml75
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml75
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml75
-rw-r--r--platform-logic/restapi-templates/src/main/json/naming-ms-post-gen-name.json13
32 files changed, 8362 insertions, 5873 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_self-serve-generate-name.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name.json
index 34896b70..2d05912d 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name.json
@@ -1,20 +1,20 @@
[
{
- "id": "a0fcff67.f90228",
+ "id": "44384001.814478",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 87.14288330078125,
- "y": 81.42857360839844,
- "z": "719b1fb6.3a5b9",
+ "x": 112,
+ "y": 43,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "77ff7670.28ec1"
+ "7f8a6cfc.d713c4"
]
]
},
{
- "id": "77ff7670.28ec1",
+ "id": "7f8a6cfc.d713c4",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,2855 +22,2881 @@
"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": 352.2857360839844,
- "y": 81.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 359.1428527832031,
+ "y": 43.99999237060547,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "8198a596.8587a8"
+ "3e607973.034d6e"
]
]
},
{
- "id": "8198a596.8587a8",
+ "id": "3e607973.034d6e",
"type": "method",
"name": "self-serve-generate-name",
"xml": "<method rpc='self-serve-generate-name' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 657.2857360839844,
- "y": 81.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 664.1428527832031,
+ "y": 43.99999237060547,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "d1eee6c3.444198"
+ "3f9a35f8.8da52a"
]
]
},
{
- "id": "d1eee6c3.444198",
+ "id": "3f9a35f8.8da52a",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 156.28573608398438,
- "y": 167.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 163.14285278320312,
+ "y": 129.99999237060547,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "350eff4d.2e40a",
- "e1ffb57d.53823",
- "32827181.a6b956",
- "de00c7d5.b7368"
+ "7a632215.c0ac2c",
+ "7f9a3712.0790f",
+ "f841aff3.13a07",
+ "571f0673.b8518",
+ "2a352877.19cd9"
]
]
},
{
- "id": "a5d9b0a3.665e9",
+ "id": "bc633e83.bdfe98",
"type": "execute",
"name": "execute replace extra comma",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n <parameter name='outputPath' value='tmp.naming-data-payload' />\n <parameter name='source' value='`$tmp.naming-data-payload`' />\n <parameter name='target' value=',}' />\n <parameter name='replacement' value='}' />",
"comments": "",
"outputs": 1,
- "x": 1722.0000915527344,
- "y": 893.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1728.8572082519531,
+ "y": 856.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "350eff4d.2e40a",
+ "id": "7a632215.c0ac2c",
"type": "set",
"name": "set capability-name",
"xml": "<set>\n<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n",
"comments": "",
- "x": 355.2857360839844,
- "y": 168.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 362.1428527832031,
+ "y": 130.99999237060547,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "e1ffb57d.53823",
+ "id": "7f9a3712.0790f",
"type": "call",
"name": "call capability-param-resolution",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 393.2857360839844,
- "y": 233.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 391.1428527832031,
+ "y": 222,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "e6cffea2.05b508",
- "d29f4ed4.70282"
+ "f5bead73.e939c8",
+ "e210e97d.997518"
]
]
},
{
- "id": "c8ae8fb3.2b106",
+ "id": "f5e94169.5fc978",
"type": "for",
"name": "for vnf-parameters-data",
"xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1155.785888671875,
- "y": 524.8570861816406,
- "z": "719b1fb6.3a5b9",
+ "x": 1162.6430053710938,
+ "y": 487.4285125732422,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "29db996f.2f77fe"
+ "fa4257ae.9fd718"
]
]
},
{
- "id": "29db996f.2f77fe",
+ "id": "fa4257ae.9fd718",
"type": "switchNode",
"name": "switch capability-name",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1398.6429443359375,
- "y": 524.8570861816406,
- "z": "719b1fb6.3a5b9",
+ "x": 1405.5000610351562,
+ "y": 487.4285125732422,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "fa3c082e.e81b98"
+ "4a6ecd53.d56884"
]
]
},
{
- "id": "fa3c082e.e81b98",
+ "id": "4a6ecd53.d56884",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1579.3572998046875,
- "y": 524.8570709228516,
- "z": "719b1fb6.3a5b9",
+ "x": 1586.2144165039062,
+ "y": 487.4284973144531,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "ecb50e0c.b6f238"
+ "a7c641d6.1516b"
]
]
},
{
- "id": "9b45dec.f68242",
+ "id": "9750b026.40e79",
"type": "for",
"name": "for vnf-parameters-data",
"xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1691.5000915527344,
- "y": 694.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1698.3572082519531,
+ "y": 657.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "83953b14.cd3cc"
+ "6e26ff1a.e07b88"
]
]
},
{
- "id": "e6cffea2.05b508",
+ "id": "f5bead73.e939c8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 616.2857360839844,
- "y": 201.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 614.1428527832031,
+ "y": 190,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "3bec3c36.db162c"
+ "322435c8.51411a"
]
]
},
{
- "id": "d29f4ed4.70282",
+ "id": "e210e97d.997518",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 625.2857360839844,
- "y": 267.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 623.1428527832031,
+ "y": 256,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "3bec3c36.db162c"
+ "322435c8.51411a"
]
]
},
{
- "id": "3bec3c36.db162c",
+ "id": "322435c8.51411a",
"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 from capability-param-resolution\" />\n",
"comments": "",
- "x": 818.2857360839844,
- "y": 201.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 816.1428527832031,
+ "y": 190,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "d44e28a5.a5361",
+ "id": "11ec24e5.5f86b3",
"type": "set",
"name": "set payload data",
- "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>",
+ "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].name`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].value`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[0].element_length`\" value='`$j + 1`' />",
"comments": "",
- "x": 2294.0000915527344,
- "y": 692.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2300.857208251953,
+ "y": 655.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "561c14d8.97e21c",
+ "id": "bc87beaf.bad8a",
"type": "set",
"name": "set set payload data",
- "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
+ "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
"comments": "",
- "x": 1689.000244140625,
- "y": 620.4284362792969,
- "z": "719b1fb6.3a5b9",
+ "x": 1695.8573608398438,
+ "y": 582.9998626708984,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "755059e1.8e09a8",
+ "id": "3b24af37.62d288",
"type": "set",
"name": "set payload data",
"xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
"comments": "",
- "x": 1689.0000915527344,
- "y": 756.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1695.8572082519531,
+ "y": 719.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "bc43a903.45bae8",
+ "id": "a94779d8.6d99c",
"type": "set",
"name": "set close payload list",
"xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
"comments": "",
- "x": 1695.0000915527344,
- "y": 821.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1701.8572082519531,
+ "y": 784.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "d6e4c46a.7a8e5",
+ "id": "349803e.db927fc",
"type": "execute",
"name": "execute replace extra comma",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n <parameter name='outputPath' value='tmp.naming-data-payload' />\n <parameter name='source' value='`$tmp.naming-data-payload`' />\n <parameter name='target' value=',]' />\n <parameter name='replacement' value=']' />",
"comments": "",
"outputs": 1,
- "x": 1725.0000915527344,
- "y": 947.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1731.8572082519531,
+ "y": 910.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "87e249a7.d2d76",
- "type": "execute",
- "name": "execute NameGenerationNode-unassign",
- "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>\n <parameter name='payload' value='`$tmp.naming-data-payload`' />\n <parameter name=\"prifix\" value=\"nameGenResponse\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 1751.0000915527344,
- "y": 1004.5713424682617,
- "z": "719b1fb6.3a5b9",
- "wires": [
- [
- "e6a3bbe9.313368",
- "77d6fd82.74cf9c"
- ]
- ]
- },
- {
- "id": "e6a3bbe9.313368",
+ "id": "8af1d548.36ba08",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2026.0000915527344,
- "y": 954.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2097.857177734375,
+ "y": 932.1427612304688,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1105b68e.0b87b9"
+ "c7e4d145.feb3b8"
]
]
},
{
- "id": "6b43378b.4fca7",
+ "id": "91f543dc.e9a0c8",
"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 from NameGenerationNode Unassign\" />\n",
"comments": "",
- "x": 2391.0000915527344,
- "y": 1054.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2462.857177734375,
+ "y": 1032.1427612304688,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "77d6fd82.74cf9c",
+ "id": "6b5d2c36.36d07c",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 2031.0000915527344,
- "y": 1053.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2102.857177734375,
+ "y": 1031.1427612304688,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1105b68e.0b87b9"
+ "c7e4d145.feb3b8"
]
]
},
{
- "id": "1105b68e.0b87b9",
+ "id": "c7e4d145.feb3b8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2189.0000915527344,
- "y": 998.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2260.857177734375,
+ "y": 976.1427612304688,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "6d474a1e.25ac34",
- "6b43378b.4fca7"
+ "6effc421.de541c",
+ "91f543dc.e9a0c8"
]
]
},
{
- "id": "6d474a1e.25ac34",
+ "id": "6effc421.de541c",
"type": "set",
"name": "set status as FAILED",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />",
"comments": "",
- "x": 2405.0000915527344,
- "y": 945.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2476.857177734375,
+ "y": 923.1427612304688,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "d4160d84.70bb48",
+ "id": "4312cb34.d1fec4",
"type": "switchNode",
"name": "switch capability action assign",
"xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
"comments": "",
"outputs": 1,
- "x": 779.5238037109375,
- "y": 1652.1904296875,
- "z": "719b1fb6.3a5b9",
+ "x": 786.3809204101562,
+ "y": 1614.7618560791016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "bf3e09f4.dafff"
+ "c588e672.9457"
]
]
},
{
- "id": "bf3e09f4.dafff",
+ "id": "c588e672.9457",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1034.238037109375,
- "y": 1652.1904296875,
- "z": "719b1fb6.3a5b9",
+ "x": 1041.0951538085938,
+ "y": 1614.7618560791016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "6b713cfb.723974"
+ "96d8122d.bb415"
]
]
},
{
- "id": "9c664d90.9ee95",
+ "id": "f5ff6d86.dbc2a8",
"type": "for",
"name": "for vnf-parameters-data",
"xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1937.0000915527344,
- "y": 1249.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1943.8572082519531,
+ "y": 1212.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1476063f.6bab8a"
+ "9f1d9384.e4cf38"
]
]
},
{
- "id": "dbdeedbe.f41fd8",
+ "id": "e8412a7e.3847d8",
"type": "switchNode",
"name": "switch capability-name",
"xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 2140.0000915527344,
- "y": 1467.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2146.857208251953,
+ "y": 1430.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "79a3b021.b0b288"
+ "32086d42.08bf12"
]
]
},
{
- "id": "79a3b021.b0b288",
+ "id": "32086d42.08bf12",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2350.0000915527344,
- "y": 1467.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2356.857208251953,
+ "y": 1430.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "be0571f0.89d93"
+ "8dd8a7af.a18a58"
]
]
},
{
- "id": "be0571f0.89d93",
+ "id": "8dd8a7af.a18a58",
"type": "set",
"name": "set set payload data",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
"comments": "",
- "x": 2546.5000915527344,
- "y": 1468.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2553.357208251953,
+ "y": 1431.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "3456afaf.a73238",
+ "id": "7ce3d216.f2e854",
"type": "execute",
"name": "execute jsonStringToCtx",
- "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.response-payload\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 1706.0000915527344,
- "y": 1152.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1712.8572082519531,
+ "y": 1115.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "5e598157.0c9c38",
+ "id": "174f706f.eb1c4",
"type": "for",
"name": "for response elements",
"xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1699.0000915527344,
- "y": 1248.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1705.8572082519531,
+ "y": 1211.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "9c664d90.9ee95"
+ "f5ff6d86.dbc2a8"
]
]
},
{
- "id": "1476063f.6bab8a",
+ "id": "9f1d9384.e4cf38",
"type": "execute",
"name": "slistringUtils - check value for $",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`\" />\n <parameter name=\"target\" value=\"$\"/>\n \n",
"comments": "",
"outputs": 1,
- "x": 2241.0000915527344,
- "y": 1249.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2247.857208251953,
+ "y": 1212.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "61dff537.8d841c"
+ "ce97b583.de0eb"
]
]
},
{
- "id": "61dff537.8d841c",
+ "id": "ce97b583.de0eb",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2481.0000915527344,
- "y": 1248.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2487.857208251953,
+ "y": 1211.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1266c260.0a766e"
+ "2768322c.982d36"
]
]
},
{
- "id": "ee43f6d5.8d77f8",
+ "id": "edf18693.d94aa8",
"type": "execute",
"name": "split resource-resolution-data",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' />\n <parameter name='regex' value='\\$\\{' />\n",
"comments": "",
"outputs": 1,
- "x": 2148.0000915527344,
- "y": 1319.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2154.857208251953,
+ "y": 1282.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "aa6b38f9.769088",
+ "id": "ddf9d245.932de",
"type": "execute",
"name": "split resource-resolution-split-1",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='s2' />\n <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n <parameter name='regex' value='\\}' />\n",
"comments": "",
"outputs": 1,
- "x": 2163.0000915527344,
- "y": 1402.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2169.857208251953,
+ "y": 1365.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "1266c260.0a766e",
+ "id": "2768322c.982d36",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1932.0000915527344,
- "y": 1319.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1938.8572082519531,
+ "y": 1282.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "ee43f6d5.8d77f8",
- "aa6b38f9.769088",
- "dbdeedbe.f41fd8"
+ "edf18693.d94aa8",
+ "ddf9d245.932de",
+ "e8412a7e.3847d8"
]
]
},
{
- "id": "ecb50e0c.b6f238",
+ "id": "a7c641d6.1516b",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1482.0000915527344,
- "y": 620.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1488.8572082519531,
+ "y": 583.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "561c14d8.97e21c",
- "9b45dec.f68242",
- "755059e1.8e09a8",
- "bc43a903.45bae8",
- "a5d9b0a3.665e9",
- "87e249a7.d2d76",
- "3456afaf.a73238",
- "8b2dbcd4.32fa2",
- "5e598157.0c9c38",
- "d6e4c46a.7a8e5"
+ "bc87beaf.bad8a",
+ "9750b026.40e79",
+ "3b24af37.62d288",
+ "a94779d8.6d99c",
+ "bc633e83.bdfe98",
+ "7ce3d216.f2e854",
+ "dcc81210.7b3bb",
+ "174f706f.eb1c4",
+ "349803e.db927fc",
+ "f9afd12e.2d3128"
]
]
},
{
- "id": "8b2dbcd4.32fa2",
+ "id": "dcc81210.7b3bb",
"type": "set",
"name": "set status as DELETED",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='DELETED' />",
"comments": "",
- "x": 1704.0000915527344,
- "y": 1202.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1710.8572082519531,
+ "y": 1165.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "27e20f71.6cc548",
+ "id": "fff738e5.4d0ce",
"type": "execute",
"name": "execute replace extra comma",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n <parameter name='outputPath' value='tmp.naming-data-payload' />\n <parameter name='source' value='`$tmp.naming-data-payload`' />\n <parameter name='target' value=',}' />\n <parameter name='replacement' value='}' />",
"comments": "",
"outputs": 1,
- "x": 1620.66650390625,
- "y": 2137.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1627.5236206054688,
+ "y": 2099.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "10be84bb.581f9b",
+ "id": "16446b33.aaf505",
"type": "for",
"name": "for vnf-parameters-data",
"xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1728.16650390625,
- "y": 1953.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1735.0236206054688,
+ "y": 1915.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "8f7c2524.de50c"
+ "95c09049.cf0398"
]
]
},
{
- "id": "8f7c2524.de50c",
+ "id": "95c09049.cf0398",
"type": "set",
"name": "set payload data",
- "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>",
+ "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].name`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].value`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element_length`\" value='`$j + 1`' />",
"comments": "",
- "x": 1980.66650390625,
- "y": 1953.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1987.5236206054688,
+ "y": 1915.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "c15c85cd.ea9f2",
+ "id": "278f5611.2443c2",
"type": "set",
"name": "set payload data",
- "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
+ "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n",
"comments": "",
- "x": 1709.094970703125,
- "y": 1891.8093872070312,
- "z": "719b1fb6.3a5b9",
+ "x": 1715.9520874023438,
+ "y": 1854.3808135986328,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "463d12f4.b57d9c",
+ "id": "b557bbbd.9b02a",
"type": "set",
"name": "set payload data",
- "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
+ "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
"comments": "",
- "x": 1710.66650390625,
- "y": 2009.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1717.5236206054688,
+ "y": 1971.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "6a94f7b6.2e3e3",
+ "id": "88f11c7a.f31688",
"type": "set",
"name": "set close payload list",
"xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
"comments": "",
- "x": 1595.66650390625,
- "y": 2094.0949096679688,
- "z": "719b1fb6.3a5b9",
+ "x": 1602.5236206054688,
+ "y": 2056.6663360595703,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "9ffd6dac.5925a",
+ "id": "f398ae72.bb9338",
"type": "execute",
"name": "execute replace extra comma",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n <parameter name='outputPath' value='tmp.naming-data-payload' />\n <parameter name='source' value='`$tmp.naming-data-payload`' />\n <parameter name='target' value=',]' />\n <parameter name='replacement' value=']' />",
"comments": "",
"outputs": 1,
- "x": 1621.66650390625,
- "y": 2188.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1628.5236206054688,
+ "y": 2150.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "18ddf882.11fd17",
- "type": "execute",
- "name": "execute NameGenerationNode-assign",
- "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\n <parameter name='payload' value='`$tmp.naming-data-payload`' />\n <parameter name=\"prifix\" value=\"nameGenResponse\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 1654.66650390625,
- "y": 2245.094970703125,
- "z": "719b1fb6.3a5b9",
- "wires": [
- [
- "92a93214.de1db8",
- "b360f358.424cc8"
- ]
- ]
- },
- {
- "id": "92a93214.de1db8",
+ "id": "7136f5d4.61b024",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1929.66650390625,
- "y": 2195.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1969.523681640625,
+ "y": 2184.66650390625,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "177b20fb.1bc74f"
+ "cce60393.cfd56"
]
]
},
{
- "id": "3a3832be.f27146",
+ "id": "37abde73.8b06c2",
"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 from NameGenerationNode Assign\" />\n",
"comments": "",
- "x": 2294.66650390625,
- "y": 2295.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2334.523681640625,
+ "y": 2284.66650390625,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "b360f358.424cc8",
+ "id": "ef775b29.4a7b",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1934.66650390625,
- "y": 2294.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1974.523681640625,
+ "y": 2283.66650390625,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "177b20fb.1bc74f"
+ "cce60393.cfd56"
]
]
},
{
- "id": "177b20fb.1bc74f",
+ "id": "cce60393.cfd56",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2092.66650390625,
- "y": 2239.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2132.523681640625,
+ "y": 2228.66650390625,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "9799610d.ba099",
- "3a3832be.f27146"
+ "546fd473.2cd5dc",
+ "37abde73.8b06c2"
]
]
},
{
- "id": "9799610d.ba099",
+ "id": "546fd473.2cd5dc",
"type": "set",
"name": "set status as FAILED",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />",
"comments": "",
- "x": 2308.66650390625,
- "y": 2186.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2348.523681640625,
+ "y": 2175.66650390625,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "37785a2.d8ea0a6",
+ "id": "e2624cc8.4eb57",
"type": "for",
"name": "for vnf-parameters-data",
"xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1841.66650390625,
- "y": 2445.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1848.5236206054688,
+ "y": 2407.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "10461664.c280c2"
+ "be8a0258.a3d64"
]
]
},
{
- "id": "ddf9ee24.32721",
+ "id": "5380bfed.f4864",
"type": "switchNode",
"name": "switch capability-name",
"xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 2044.66650390625,
- "y": 2663.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2051.5236206054688,
+ "y": 2625.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "915c127.869707"
+ "94a6c10b.d1c6a"
]
]
},
{
- "id": "915c127.869707",
+ "id": "94a6c10b.d1c6a",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2254.66650390625,
- "y": 2663.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2261.5236206054688,
+ "y": 2625.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "3e3270b5.18b048"
+ "7afdb21d.b59cb4"
]
]
},
{
- "id": "3e3270b5.18b048",
+ "id": "7afdb21d.b59cb4",
"type": "set",
"name": "set set payload data",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
"comments": "",
- "x": 2451.16650390625,
- "y": 2664.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2458.0236206054688,
+ "y": 2626.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "a0734951.e43bb8",
+ "id": "6d5e56ed.17d75",
"type": "execute",
"name": "execute jsonStringToCtx",
- "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.response-payload\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 1602.66650390625,
- "y": 2347.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1609.5236206054688,
+ "y": 2309.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "9976393.8117548",
+ "id": "a133146c.f8d1c",
"type": "for",
"name": "for response elements",
"xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1594.66650390625,
- "y": 2444.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1601.5236206054688,
+ "y": 2406.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "37785a2.d8ea0a6"
+ "e2624cc8.4eb57"
]
]
},
{
- "id": "10461664.c280c2",
+ "id": "be8a0258.a3d64",
"type": "execute",
"name": "slistringUtils - check value for $",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`\" />\n <parameter name=\"target\" value=\"$\"/>\n \n",
"comments": "",
"outputs": 1,
- "x": 2145.66650390625,
- "y": 2445.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2152.5236206054688,
+ "y": 2407.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "41922990.8a02f"
+ "663752cc.bb14ac"
]
]
},
{
- "id": "41922990.8a02f",
+ "id": "663752cc.bb14ac",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2385.66650390625,
- "y": 2444.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2392.5236206054688,
+ "y": 2406.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "306d8cff.17a97c"
+ "5dfb8377.41af4c"
]
]
},
{
- "id": "82f3e171.12001",
+ "id": "f365dac0.f6fd5",
"type": "execute",
"name": "split resource-resolution-data",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' />\n <parameter name='regex' value='\\$\\{' />\n",
"comments": "",
"outputs": 1,
- "x": 2052.66650390625,
- "y": 2515.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2059.5236206054688,
+ "y": 2477.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "7a6ff351.59e66c",
+ "id": "f61ff7c0.095698",
"type": "execute",
"name": "split resource-resolution-split-1",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='s2' />\n <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n <parameter name='regex' value='\\}' />\n",
"comments": "",
"outputs": 1,
- "x": 2067.66650390625,
- "y": 2598.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2074.5236206054688,
+ "y": 2560.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "306d8cff.17a97c",
+ "id": "5dfb8377.41af4c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1836.66650390625,
- "y": 2515.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1843.5236206054688,
+ "y": 2477.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "82f3e171.12001",
- "7a6ff351.59e66c",
- "ddf9ee24.32721"
+ "f365dac0.f6fd5",
+ "f61ff7c0.095698",
+ "5380bfed.f4864"
]
]
},
{
- "id": "6ed8d498.9723f4",
+ "id": "4849f457.b71524",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1505.8095703125,
- "y": 1871.380615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1512.6666870117188,
+ "y": 1833.9520416259766,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "c15c85cd.ea9f2",
- "10be84bb.581f9b",
- "463d12f4.b57d9c"
+ "278f5611.2443c2",
+ "16446b33.aaf505",
+ "b557bbbd.9b02a"
]
]
},
{
- "id": "c0cd44d1.7422",
+ "id": "a0bc5db0.876ac8",
"type": "set",
"name": "set status as SUCCESS",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='SUCCESS' />",
"comments": "",
- "x": 1601.66650390625,
- "y": 2398.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1608.5236206054688,
+ "y": 2360.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "83953b14.cd3cc",
+ "id": "6e26ff1a.e07b88",
"type": "switchNode",
"name": "switch external-key",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1930.0000915527344,
- "y": 693.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 1936.8572082519531,
+ "y": 656.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "6b9e4dcc.d7de0c"
+ "983c7546.c67c28"
]
]
},
{
- "id": "6b9e4dcc.d7de0c",
+ "id": "983c7546.c67c28",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2114.0000915527344,
- "y": 693.5713424682617,
- "z": "719b1fb6.3a5b9",
+ "x": 2120.857208251953,
+ "y": 656.1427688598633,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "d44e28a5.a5361"
+ "11ec24e5.5f86b3"
]
]
},
{
- "id": "763cbc48.beee84",
+ "id": "d8da45ad.01a8a",
"type": "execute",
"name": "execute replace extra comma",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n <parameter name='outputPath' value='tmp.naming-data-payload' />\n <parameter name='source' value='`$tmp.naming-data-payload`' />\n <parameter name='target' value=',}' />\n <parameter name='replacement' value='}' />",
"comments": "",
"outputs": 1,
- "x": 1841.619140625,
- "y": 4107.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1848.4762573242188,
+ "y": 4070.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "f26ae3f9.58a6a8",
+ "id": "a3bde9b.3b85798",
"type": "for",
"name": "for vnf-parameters-data",
"xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1130.1190185546875,
- "y": 3719.761962890625,
- "z": "719b1fb6.3a5b9",
+ "x": 1136.9761352539062,
+ "y": 3682.3333892822266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "19fb9704.e19821"
+ "4c84b197.b55718"
]
]
},
{
- "id": "19fb9704.e19821",
+ "id": "4c84b197.b55718",
"type": "switchNode",
"name": "switch capability-name",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1410.1190185546875,
- "y": 3719.761962890625,
- "z": "719b1fb6.3a5b9",
+ "x": 1416.9761352539062,
+ "y": 3682.3333892822266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "3b748ba2.5ca9c4"
+ "8fbf4fc0.ccf628"
]
]
},
{
- "id": "3b748ba2.5ca9c4",
+ "id": "8fbf4fc0.ccf628",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1619.119140625,
- "y": 3719.761962890625,
- "z": "719b1fb6.3a5b9",
+ "x": 1625.9762573242188,
+ "y": 3682.3333892822266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "fe9fb952.03865"
+ "37468c59.dd2414"
]
]
},
{
- "id": "a3efff0f.aa4ec8",
+ "id": "97197bdb.a2cad8",
"type": "for",
"name": "for vf-module-parameters",
"xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1811.119140625,
- "y": 3908.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1817.9762573242188,
+ "y": 3871.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "411e99fd.a39438"
+ "3908bfeb.e84f"
]
]
},
{
- "id": "9abfe611.4545c8",
+ "id": "28d4f278.d4fa26",
"type": "set",
"name": "set payload data",
- "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>",
+ "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].name`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].value`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[0].element_length`\" value='`$j + 1`' />",
"comments": "",
- "x": 2413.619140625,
- "y": 3906.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2420.4762573242188,
+ "y": 3869.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "ed0277b1.5970a",
+ "id": "73a75422.d8850c",
"type": "set",
"name": "set set payload data",
- "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
+ "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
"comments": "",
- "x": 1808.619140625,
- "y": 3831.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1815.4762573242188,
+ "y": 3794.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "8bbcc0bf.293ef8",
+ "id": "46fb189c.966838",
"type": "set",
"name": "set payload data",
"xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
"comments": "",
- "x": 1808.619140625,
- "y": 3970.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1815.4762573242188,
+ "y": 3933.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "d5dd6ae4.c76cb8",
+ "id": "be439e05.fe7ff8",
"type": "set",
"name": "set close payload list",
"xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
"comments": "",
- "x": 1814.619140625,
- "y": 4035.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1821.4762573242188,
+ "y": 3998.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "a8bf6cef.175b98",
+ "id": "a84918b5.b82848",
"type": "execute",
"name": "execute replace extra comma",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n <parameter name='outputPath' value='tmp.naming-data-payload' />\n <parameter name='source' value='`$tmp.naming-data-payload`' />\n <parameter name='target' value=',]' />\n <parameter name='replacement' value=']' />",
"comments": "",
"outputs": 1,
- "x": 1844.619140625,
- "y": 4161.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1851.4762573242188,
+ "y": 4124.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "452bff82.4ad42",
- "type": "execute",
- "name": "execute NameGenerationNode-unassign",
- "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>\n <parameter name='payload' value='`$tmp.naming-data-payload`' />\n <parameter name=\"prifix\" value=\"nameGenResponse\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 1870.619140625,
- "y": 4218.761474609375,
- "z": "719b1fb6.3a5b9",
- "wires": [
- [
- "12b87141.01ce77",
- "da1a35af.b4fb48"
- ]
- ]
- },
- {
- "id": "12b87141.01ce77",
+ "id": "e6db3fc2.418c7",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2145.619140625,
- "y": 4168.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2181.476318359375,
+ "y": 4146.3330078125,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "d6576013.79b6e"
+ "c89f9697.3bcd9"
]
]
},
{
- "id": "8bddd10d.aa37",
+ "id": "54902e1f.a23738",
"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 from NameGenerationNode Unassign\" />\n",
"comments": "",
- "x": 2510.619140625,
- "y": 4268.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2546.476318359375,
+ "y": 4246.3330078125,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "da1a35af.b4fb48",
+ "id": "add1de2.24bbda",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 2150.619140625,
- "y": 4267.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2186.476318359375,
+ "y": 4245.3330078125,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "d6576013.79b6e"
+ "c89f9697.3bcd9"
]
]
},
{
- "id": "d6576013.79b6e",
+ "id": "c89f9697.3bcd9",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2308.619140625,
- "y": 4212.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2344.476318359375,
+ "y": 4190.3330078125,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "d5fbd703.684a6",
- "8bddd10d.aa37"
+ "ed1d207b.66697",
+ "54902e1f.a23738"
]
]
},
{
- "id": "d5fbd703.684a6",
+ "id": "ed1d207b.66697",
"type": "set",
"name": "set status as FAILED",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='FAILED' />",
"comments": "",
- "x": 2524.619140625,
- "y": 4159.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2560.476318359375,
+ "y": 4137.3330078125,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "979f7afd.afba98",
+ "id": "712165ae.c8b134",
"type": "for",
"name": "for vf-module-parameters",
"xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 2056.619140625,
- "y": 4463.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2063.4762573242188,
+ "y": 4426.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "648836d6.70a21"
+ "a8831bf.0add2e8"
]
]
},
{
- "id": "8ff2df62.ffbde",
+ "id": "c4d874bf.c84648",
"type": "switchNode",
"name": "switch capability-name",
"xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 2259.619140625,
- "y": 4681.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2266.4762573242188,
+ "y": 4644.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "78ff017c.17864"
+ "6c8538a0.f116f8"
]
]
},
{
- "id": "78ff017c.17864",
+ "id": "6c8538a0.f116f8",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2469.619140625,
- "y": 4681.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2476.4762573242188,
+ "y": 4644.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1462085a.8135a"
+ "4ab33b35.a84a54"
]
]
},
{
- "id": "1462085a.8135a",
+ "id": "4ab33b35.a84a54",
"type": "set",
"name": "set set payload data",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
"comments": "",
- "x": 2666.119140625,
- "y": 4682.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2672.9762573242188,
+ "y": 4645.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "5bd4041e.5eb064",
+ "id": "2bae3b0b.919654",
"type": "execute",
"name": "execute jsonStringToCtx",
- "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.response-payload\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 1825.619140625,
- "y": 4366.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1832.4762573242188,
+ "y": 4329.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "d49e444f.57b07",
+ "id": "bd0c0aec.c12ba",
"type": "for",
"name": "for response elements",
"xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1818.619140625,
- "y": 4462.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1825.4762573242188,
+ "y": 4425.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "979f7afd.afba98"
+ "712165ae.c8b134"
]
]
},
{
- "id": "648836d6.70a21",
+ "id": "a8831bf.0add2e8",
"type": "execute",
"name": "slistringUtils - check value for $",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].value`\" />\n <parameter name=\"target\" value=\"$\"/>\n \n",
"comments": "",
"outputs": 1,
- "x": 2360.619140625,
- "y": 4463.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2367.4762573242188,
+ "y": 4426.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "7a9d7c8a.3c0bc4"
+ "b4bafecc.dbd1d8"
]
]
},
{
- "id": "7a9d7c8a.3c0bc4",
+ "id": "b4bafecc.dbd1d8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2600.619140625,
- "y": 4462.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2607.4762573242188,
+ "y": 4425.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "2051ec8a.8af274"
+ "37f99340.6371ac"
]
]
},
{
- "id": "999690dc.8426f8",
+ "id": "c6f61ac6.058e2",
"type": "execute",
"name": "split resource-resolution-data",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].value`' />\n <parameter name='regex' value='\\$\\{' />\n",
"comments": "",
"outputs": 1,
- "x": 2267.619140625,
- "y": 4533.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2274.4762573242188,
+ "y": 4496.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "5bc42c8c.88381c",
+ "id": "7b6510ed.263a5",
"type": "execute",
"name": "split resource-resolution-split-1",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='s2' />\n <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n <parameter name='regex' value='\\}' />\n",
"comments": "",
"outputs": 1,
- "x": 2282.619140625,
- "y": 4616.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2289.4762573242188,
+ "y": 4579.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "2051ec8a.8af274",
+ "id": "37f99340.6371ac",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2051.619140625,
- "y": 4533.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2058.4762573242188,
+ "y": 4496.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "999690dc.8426f8",
- "5bc42c8c.88381c",
- "8ff2df62.ffbde"
+ "c6f61ac6.058e2",
+ "7b6510ed.263a5",
+ "c4d874bf.c84648"
]
]
},
{
- "id": "fe9fb952.03865",
+ "id": "37468c59.dd2414",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1601.619140625,
- "y": 3834.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1608.4762573242188,
+ "y": 3797.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "ed0277b1.5970a",
- "a3efff0f.aa4ec8",
- "8bbcc0bf.293ef8",
- "d5dd6ae4.c76cb8",
- "763cbc48.beee84",
- "452bff82.4ad42",
- "5bd4041e.5eb064",
- "9a62d212.fe282",
- "d49e444f.57b07",
- "a8bf6cef.175b98"
+ "73a75422.d8850c",
+ "97197bdb.a2cad8",
+ "46fb189c.966838",
+ "be439e05.fe7ff8",
+ "d8da45ad.01a8a",
+ "2bae3b0b.919654",
+ "6650d50f.f2a194",
+ "bd0c0aec.c12ba",
+ "a84918b5.b82848",
+ "99585b38.25a06"
]
]
},
{
- "id": "9a62d212.fe282",
+ "id": "6650d50f.f2a194",
"type": "set",
"name": "set status as DELETED",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='DELETED' />",
"comments": "",
- "x": 1823.619140625,
- "y": 4416.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 1830.4762573242188,
+ "y": 4379.332901000977,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "411e99fd.a39438",
+ "id": "3908bfeb.e84f",
"type": "switchNode",
"name": "switch external-key",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2049.619140625,
- "y": 3907.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2056.4762573242188,
+ "y": 3870.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "73c6b2a8.a3b054"
+ "5a34ee8b.f9c61"
]
]
},
{
- "id": "73c6b2a8.a3b054",
+ "id": "5a34ee8b.f9c61",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2233.619140625,
- "y": 3907.761474609375,
- "z": "719b1fb6.3a5b9",
+ "x": 2240.4762573242188,
+ "y": 3870.3329010009766,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "9abfe611.4545c8"
+ "28d4f278.d4fa26"
]
]
},
{
- "id": "32827181.a6b956",
+ "id": "f841aff3.13a07",
"type": "switchNode",
"name": "switch capability-type. vnf",
"xml": "<switch test=\"`$ss.capability-type == 'vnf'`\">\n",
"comments": "",
"outputs": 1,
- "x": 365.2857360839844,
- "y": 338.4285659790039,
- "z": "719b1fb6.3a5b9",
+ "x": 372.1428527832031,
+ "y": 300.99999237060547,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "524e830f.6470c4"
+ "58dd98ce.eb99f"
]
]
},
{
- "id": "524e830f.6470c4",
+ "id": "58dd98ce.eb99f",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 568.7142944335938,
- "y": 337.71429443359375,
- "z": "719b1fb6.3a5b9",
+ "x": 575.5714111328125,
+ "y": 300.2857208251953,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "ef52847b.ff229"
+ "7b0e8ad8.f3802c"
]
]
},
{
- "id": "de00c7d5.b7368",
+ "id": "571f0673.b8518",
"type": "switchNode",
"name": "switch capability-type vf-module",
"xml": "<switch test=\"`$ss.capability-type == 'vf-module'`\">\n",
"comments": "",
"outputs": 1,
- "x": 494.61907958984375,
- "y": 3501.7619018554688,
- "z": "719b1fb6.3a5b9",
+ "x": 501.4761962890625,
+ "y": 3464.3333282470703,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1ded1ea.e9121e1"
+ "48a38bbd.e8a77c"
]
]
},
{
- "id": "1ded1ea.e9121e1",
+ "id": "48a38bbd.e8a77c",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 713.6190795898438,
- "y": 3502.761962890625,
- "z": "719b1fb6.3a5b9",
+ "x": 720.4761962890625,
+ "y": 3465.3333892822266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "c14ba9b4.7c8ad8"
+ "750bfd10.899924"
]
]
},
{
- "id": "36603013.bbb4f8",
+ "id": "a6e4bc7d.20b678",
"type": "for",
"name": "for vnf-parameters data",
"xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1606.66650390625,
- "y": 2624.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1613.5236206054688,
+ "y": 2586.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "a6ad8f3a.9c7f8"
+ "ffc03440.e917d"
]
]
},
{
- "id": "a6ad8f3a.9c7f8",
+ "id": "ffc03440.e917d",
"type": "execute",
"name": "slistringUtils - check value for $",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`\" />\n <parameter name=\"target\" value=\"$\"/>\n \n",
"comments": "",
"outputs": 1,
- "x": 1732.3331298828125,
- "y": 2755.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1739.1902465820312,
+ "y": 2717.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "77a82966.ec0b48"
+ "1af41882.7a6b4f"
]
]
},
{
- "id": "77a82966.ec0b48",
+ "id": "1af41882.7a6b4f",
"type": "failure",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1994.3331298828125,
- "y": 2811.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2001.1902465820312,
+ "y": 2773.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "f33d0266.cea3"
+ "fcd660c4.530c58"
]
]
},
{
- "id": "f33d0266.cea3",
+ "id": "fcd660c4.530c58",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2210.3331298828125,
- "y": 2811.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2217.1902465820312,
+ "y": 2773.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "bd9f5006.39331",
- "1847b82e.cbd13"
+ "236c01c7.bf3206",
+ "bd4596a.19984e8"
]
]
},
{
- "id": "bd9f5006.39331",
+ "id": "236c01c7.bf3206",
"type": "set",
"name": "set capability name",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.capability-name`' value='INPUT' />",
"comments": "",
- "x": 2430.3331298828125,
- "y": 2749.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2437.1902465820312,
+ "y": 2711.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "1847b82e.cbd13",
+ "id": "bd4596a.19984e8",
"type": "set",
"name": "set status SUCCESS",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />\n",
"comments": "",
- "x": 2440.3331298828125,
- "y": 2857.094970703125,
- "z": "719b1fb6.3a5b9",
+ "x": 2447.1902465820312,
+ "y": 2819.6663970947266,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "bc970fe5.a522f8",
+ "id": "4bd2a625.600b48",
"type": "switchNode",
"name": "switch capability action unassign",
"xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
"comments": "",
"outputs": 1,
- "x": 822.8571166992188,
- "y": 428.5714416503906,
- "z": "719b1fb6.3a5b9",
+ "x": 829.7142333984375,
+ "y": 391.1428680419922,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "e1f81f5d.07ca4"
+ "f5867b52.e6b6c"
]
]
},
{
- "id": "e1f81f5d.07ca4",
+ "id": "f5867b52.e6b6c",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1108.5714111328125,
- "y": 427.1428527832031,
- "z": "719b1fb6.3a5b9",
+ "x": 1115.4285278320312,
+ "y": 389.7142791748047,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "c8ae8fb3.2b106"
+ "f5e94169.5fc978"
]
]
},
{
- "id": "ef52847b.ff229",
+ "id": "7b0e8ad8.f3802c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 572.857177734375,
- "y": 402.857177734375,
- "z": "719b1fb6.3a5b9",
+ "x": 579.7142944335938,
+ "y": 365.42860412597656,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "bc970fe5.a522f8",
- "d4160d84.70bb48"
+ "4bd2a625.600b48",
+ "4312cb34.d1fec4"
]
]
},
{
- "id": "80902f6b.f3783",
+ "id": "acaab3ca.702c88",
"type": "for",
"name": "for vnf-parameters-data",
"xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1047.2144775390625,
- "y": 1814.5953369140625,
- "z": "719b1fb6.3a5b9",
+ "x": 1054.0715942382812,
+ "y": 1777.166763305664,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "504c0e8f.4cc8a"
+ "ae04112f.bd2d08"
]
]
},
{
- "id": "504c0e8f.4cc8a",
+ "id": "ae04112f.bd2d08",
"type": "switchNode",
"name": "switch capability-name",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1288.821533203125,
- "y": 1814.5953369140625,
- "z": "719b1fb6.3a5b9",
+ "x": 1295.6786499023438,
+ "y": 1777.166763305664,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "98b667d2.9e63f8"
+ "1e81a1ec.bd42f6"
]
]
},
{
- "id": "98b667d2.9e63f8",
+ "id": "1e81a1ec.bd42f6",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1469.535888671875,
- "y": 1814.5953369140625,
- "z": "719b1fb6.3a5b9",
+ "x": 1476.3930053710938,
+ "y": 1777.166763305664,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "6ed8d498.9723f4"
+ "4849f457.b71524"
]
]
},
{
- "id": "10288042.9afdc",
+ "id": "d951a688.ea8908",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1202.0001220703125,
- "y": 3631,
- "z": "719b1fb6.3a5b9",
+ "x": 1208.8572387695312,
+ "y": 3593.5714263916016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "f26ae3f9.58a6a8"
+ "a3bde9b.3b85798"
]
]
},
{
- "id": "ae383e92.c64418",
+ "id": "90ab2ac1.82262",
"type": "switchNode",
"name": "switch capability action unassign",
"xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
"comments": "",
"outputs": 1,
- "x": 960.9998779296875,
- "y": 3631,
- "z": "719b1fb6.3a5b9",
+ "x": 967.8569946289062,
+ "y": 3593.5714263916016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "10288042.9afdc"
+ "d951a688.ea8908"
]
]
},
{
- "id": "c14ba9b4.7c8ad8",
+ "id": "750bfd10.899924",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 718,
- "y": 3568,
- "z": "719b1fb6.3a5b9",
+ "x": 724.8571166992188,
+ "y": 3530.5714263916016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "ae383e92.c64418",
- "b1d4f02b.074b08"
+ "90ab2ac1.82262",
+ "876d4c7d.f86a88"
]
]
},
{
- "id": "b1d4f02b.074b08",
+ "id": "876d4c7d.f86a88",
"type": "switchNode",
"name": "switch capability action assign",
"xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
"comments": "",
"outputs": 1,
- "x": 937.9525146484375,
- "y": 5238.7626953125,
- "z": "719b1fb6.3a5b9",
+ "x": 944.8096313476562,
+ "y": 5201.334121704102,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "5f3175ef.b2e644"
+ "97b1b31a.f402b"
]
]
},
{
- "id": "5f3175ef.b2e644",
+ "id": "97b1b31a.f402b",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1166.9525146484375,
- "y": 5238.7626953125,
- "z": "719b1fb6.3a5b9",
+ "x": 1173.8096313476562,
+ "y": 5201.334121704102,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "7f8df3af.553754"
+ "bf89c636.30aac8"
]
]
},
{
- "id": "b52f5f26.c98fb",
+ "id": "c54c6f8e.b8ff58",
"type": "execute",
"name": "execute replace extra comma",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n <parameter name='outputPath' value='tmp.naming-data-payload' />\n <parameter name='source' value='`$tmp.naming-data-payload`' />\n <parameter name='target' value=',}' />\n <parameter name='replacement' value='}' />",
"comments": "",
"outputs": 1,
- "x": 1715.452392578125,
- "y": 5709.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1722.3095092773438,
+ "y": 5671.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "21cc2c07.2e17cc",
+ "id": "b361600c.eb049",
"type": "for",
"name": "for vf-module-parameters",
"xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 2033.702392578125,
- "y": 5516.7626953125,
- "z": "719b1fb6.3a5b9",
+ "x": 2040.5595092773438,
+ "y": 5479.334121704102,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "d6c21c77.670988"
+ "b5cdeaa7.6f11d"
]
]
},
{
- "id": "d6c21c77.670988",
+ "id": "b5cdeaa7.6f11d",
"type": "set",
"name": "set payload data",
- "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>",
+ "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].name`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].value`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element_length`\" value='`$j + 1`' />",
"comments": "",
- "x": 2290.202392578125,
- "y": 5516.7626953125,
- "z": "719b1fb6.3a5b9",
+ "x": 2297.0595092773438,
+ "y": 5479.334121704102,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "b09f0c88.a8dd8",
+ "id": "8bb2899.7eabb78",
"type": "set",
"name": "set set payload data",
"xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
"comments": "",
- "x": 2016.202392578125,
- "y": 5462.7626953125,
- "z": "719b1fb6.3a5b9",
+ "x": 2023.0595092773438,
+ "y": 5425.334121704102,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "16aca9a0.b085ce",
+ "id": "feb610d7.764ab",
"type": "set",
"name": "set payload data",
- "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
+ "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
"comments": "",
- "x": 2022.202392578125,
- "y": 5578.7626953125,
- "z": "719b1fb6.3a5b9",
+ "x": 2029.0595092773438,
+ "y": 5541.334121704102,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "1fd7b0ea.d78def",
+ "id": "aba737c8.b673a",
"type": "set",
"name": "set close payload list",
"xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
"comments": "",
- "x": 1685.452392578125,
- "y": 5658.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1692.3095092773438,
+ "y": 5620.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "382244f1.84c314",
+ "id": "e94ef6dd.a37908",
"type": "execute",
"name": "execute replace extra comma",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n <parameter name='outputPath' value='tmp.naming-data-payload' />\n <parameter name='source' value='`$tmp.naming-data-payload`' />\n <parameter name='target' value=',]' />\n <parameter name='replacement' value=']' />",
"comments": "",
"outputs": 1,
- "x": 1718.452392578125,
- "y": 5763.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1725.3095092773438,
+ "y": 5725.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "b1e358e4.0f1af8",
- "type": "execute",
- "name": "execute NameGenerationNode-assign",
- "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\n <parameter name='payload' value='`$tmp.naming-data-payload`' />\n <parameter name=\"prifix\" value=\"nameGenResponse\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 1744.452392578125,
- "y": 5820.0130615234375,
- "z": "719b1fb6.3a5b9",
- "wires": [
- [
- "1e42490a.0702a7",
- "1ec1c7ac.f1fe98"
- ]
- ]
- },
- {
- "id": "1e42490a.0702a7",
+ "id": "1ec3d3c3.85586c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2019.452392578125,
- "y": 5770.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2028.3095703125,
+ "y": 5739.58447265625,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1dc6c6ec.4b2119"
+ "21b0f329.fc401c"
]
]
},
{
- "id": "c05d5782.207da8",
+ "id": "7a611dc7.f16d14",
"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 from NameGenerationNode Assign\" />\n",
"comments": "",
- "x": 2384.452392578125,
- "y": 5870.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2393.3095703125,
+ "y": 5839.58447265625,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "1ec1c7ac.f1fe98",
+ "id": "80386656.f0d7d",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 2024.452392578125,
- "y": 5869.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2033.3095703125,
+ "y": 5838.58447265625,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1dc6c6ec.4b2119"
+ "21b0f329.fc401c"
]
]
},
{
- "id": "1dc6c6ec.4b2119",
+ "id": "21b0f329.fc401c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2182.452392578125,
- "y": 5814.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2191.3095703125,
+ "y": 5783.58447265625,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "c05d5782.207da8",
- "e913f4eb.f584"
+ "7a611dc7.f16d14",
+ "399dfaf7.a00f2e"
]
]
},
{
- "id": "e913f4eb.f584",
+ "id": "399dfaf7.a00f2e",
"type": "set",
"name": "set status as FAILED",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='FAILED' />",
"comments": "",
- "x": 2398.452392578125,
- "y": 5761.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2407.3095703125,
+ "y": 5730.58447265625,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "3d332c56.43f43c",
+ "id": "8744b72d.e0422",
"type": "for",
"name": "for vf-module-parameters",
"xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1996.452392578125,
- "y": 6353.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2003.3095092773438,
+ "y": 6315.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "5f0db49f.fd8454"
+ "26376a44.3bf3e6"
]
]
},
{
- "id": "d9f8a4b0.d2e5c",
+ "id": "c8297614.5665c8",
"type": "switchNode",
"name": "switch capability-name",
"xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 2167.452392578125,
- "y": 6511.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2174.3095092773438,
+ "y": 6473.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "f6bd7605.4d5f48"
+ "5c1866b1.7ab59"
]
]
},
{
- "id": "f6bd7605.4d5f48",
+ "id": "5c1866b1.7ab59",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2371.452392578125,
- "y": 6509.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2378.3095092773438,
+ "y": 6471.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "74b43ff2.601cb"
+ "8068dba1.b90f38"
]
]
},
{
- "id": "74b43ff2.601cb",
+ "id": "8068dba1.b90f38",
"type": "set",
"name": "set set payload data",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
"comments": "",
- "x": 2565.952392578125,
- "y": 6442.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2572.8095092773438,
+ "y": 6404.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "8f868b5c.16e278",
+ "id": "cbc78ec6.7ff248",
"type": "execute",
"name": "execute jsonStringToCtx",
- "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.response-payload\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 1699.452392578125,
- "y": 5876.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1706.3095092773438,
+ "y": 5838.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "20e95425.2ec68c",
+ "id": "1e5d91b7.f1cac6",
"type": "for",
"name": "for response elements",
"xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1728.452392578125,
- "y": 6354.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1735.3095092773438,
+ "y": 6316.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "3d332c56.43f43c"
+ "8744b72d.e0422"
]
]
},
{
- "id": "5f0db49f.fd8454",
+ "id": "26376a44.3bf3e6",
"type": "execute",
"name": "slistringUtils - check value for $",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].value`\" />\n <parameter name=\"target\" value=\"$\"/>\n \n",
"comments": "",
"outputs": 1,
- "x": 2280.452392578125,
- "y": 6357.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2287.3095092773438,
+ "y": 6319.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "e81d08ce.9ec57"
+ "6638dc1c.c0f774"
]
]
},
{
- "id": "e81d08ce.9ec57",
+ "id": "6638dc1c.c0f774",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2508.452392578125,
- "y": 6354.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2515.3095092773438,
+ "y": 6316.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "4dc60b03.30474c"
+ "49c6c4cb.ae35f4"
]
]
},
{
- "id": "d9a4aa95.7b85",
+ "id": "614640d1.2410b",
"type": "execute",
"name": "split resource-resolution-data",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].value`' />\n <parameter name='regex' value='\\$\\{' />\n",
"comments": "",
"outputs": 1,
- "x": 2175.452392578125,
- "y": 6407.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2182.3095092773438,
+ "y": 6369.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "7ebcca07.69da94",
+ "id": "f159cc8b.de17d",
"type": "execute",
"name": "split resource-resolution-split-1",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name='ctx_memory_result_key' value='s2' />\n <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n <parameter name='regex' value='\\}' />\n",
"comments": "",
"outputs": 1,
- "x": 2188.452392578125,
- "y": 6466.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2195.3095092773438,
+ "y": 6428.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[]
]
},
{
- "id": "4dc60b03.30474c",
+ "id": "49c6c4cb.ae35f4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1935.452392578125,
- "y": 6433.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1942.3095092773438,
+ "y": 6395.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "d9f8a4b0.d2e5c",
- "d9a4aa95.7b85",
- "7ebcca07.69da94"
+ "c8297614.5665c8",
+ "614640d1.2410b",
+ "f159cc8b.de17d"
]
]
},
{
- "id": "d4e4d3cb.8e365",
+ "id": "80097c84.1bbc38",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1809.202392578125,
- "y": 5465.7626953125,
- "z": "719b1fb6.3a5b9",
+ "x": 1816.0595092773438,
+ "y": 5428.334121704102,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "21cc2c07.2e17cc",
- "b09f0c88.a8dd8",
- "16aca9a0.b085ce"
+ "b361600c.eb049",
+ "8bb2899.7eabb78",
+ "feb610d7.764ab"
]
]
},
{
- "id": "c761a7c.6b8ed58",
+ "id": "d085846f.259da",
"type": "set",
"name": "set status as SUCCESS",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.status`' value='SUCCESS' />",
"comments": "",
- "x": 1701.452392578125,
- "y": 5928.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1708.3095092773438,
+ "y": 5890.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "64f6b871.04fb28",
+ "id": "2d4ee971.9f5306",
"type": "for",
"name": "for vnf parameters data",
"xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1723.452392578125,
- "y": 6576.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1730.3095092773438,
+ "y": 6538.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "74477622.de12d"
+ "968d7f58.752fa8"
]
]
},
{
- "id": "74477622.de12d",
+ "id": "968d7f58.752fa8",
"type": "execute",
"name": "slistringUtils - check value for $",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].value`\" />\n <parameter name=\"target\" value=\"$\"/>\n \n",
"comments": "",
"outputs": 1,
- "x": 2029.452392578125,
- "y": 6574.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2036.3095092773438,
+ "y": 6536.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "59f6f125.780478"
+ "b316390f.c223e"
]
]
},
{
- "id": "59f6f125.780478",
+ "id": "b316390f.c223e",
"type": "failure",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 2267.452392578125,
- "y": 6574.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2274.3095092773438,
+ "y": 6536.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "f3d21584.7ce7b8"
+ "523d1dc3.a4cfdc"
]
]
},
{
- "id": "f3d21584.7ce7b8",
+ "id": "523d1dc3.a4cfdc",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2429.452392578125,
- "y": 6568.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2436.3095092773438,
+ "y": 6530.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "2c8c0702.854ee8",
- "fa294e63.602d08"
+ "196036c5.88ba19",
+ "a33c55dc.d6268"
]
]
},
{
- "id": "2c8c0702.854ee8",
+ "id": "196036c5.88ba19",
"type": "set",
"name": "set capability name",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].resource-resolution-data.capability-name`' value='INPUT' />\n",
"comments": "",
- "x": 2653.452392578125,
- "y": 6534.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2660.3095092773438,
+ "y": 6496.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "fa294e63.602d08",
+ "id": "a33c55dc.d6268",
"type": "set",
"name": "set status SUCCESS",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$l].resource-resolution-data.status`' value='SUCCESS' />\n\t",
"comments": "",
- "x": 2641.452392578125,
- "y": 6634.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2648.3095092773438,
+ "y": 6596.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "4bd004e3.7dd99c",
+ "id": "af0954c0.0ed2a8",
"type": "for",
"name": "for vnf-parameters data",
"xml": "<for index='cn' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1711.452392578125,
- "y": 6034.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1718.3095092773438,
+ "y": 5996.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "85c7441c.53c08"
+ "fcdfe07c.36982"
]
]
},
{
- "id": "85c7441c.53c08",
+ "id": "fcdfe07c.36982",
"type": "switchNode",
"name": "switch param[] name",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].name == 'vnfc-name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1964.952392578125,
- "y": 6035.013427734375,
- "z": "719b1fb6.3a5b9",
+ "x": 1971.8095092773438,
+ "y": 5997.584854125977,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "b4e69f12.2126f8"
+ "ecb5c713.928a5"
]
]
},
{
- "id": "b4e69f12.2126f8",
+ "id": "ecb5c713.928a5",
"type": "success",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2157.952392578125,
- "y": 6035.5133056640625,
- "z": "719b1fb6.3a5b9",
+ "x": 2164.8095092773438,
+ "y": 5998.084732055664,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1fdd7e1e.c75b82"
+ "a271047.93a13f8"
]
]
},
{
- "id": "1fdd7e1e.c75b82",
+ "id": "a271047.93a13f8",
"type": "for",
"name": "for j in resource key",
"xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1799.452392578125,
- "y": 6150.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 1806.3095092773438,
+ "y": 6112.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "e34d6504.04ef68"
+ "a54bbb54.f3ff88"
]
]
},
{
- "id": "e34d6504.04ef68",
+ "id": "a54bbb54.f3ff88",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2071.452392578125,
- "y": 6146.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2078.3095092773438,
+ "y": 6108.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "8427815.e49c28",
- "7720c796.cf51d",
- "14b77c36.339774",
- "db75ea42.1350d",
- "6061ffc.9494f",
- "15f23c59.7c19e4",
- "e7c83d46.a2ef48"
+ "7a50c097.1fd508",
+ "bae1a795.c95818",
+ "6cb03d6a.b426e4",
+ "fdef5f45.af46b8",
+ "d977a0bb.d25038",
+ "d4543380.8a8648",
+ "80d478e2.ca4f3"
]
]
},
{
- "id": "7720c796.cf51d",
+ "id": "bae1a795.c95818",
"type": "switchNode",
"name": "switch model-invariant-uuid",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].name == 'model-invariant-uuid'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2509.452392578125,
- "y": 6022.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2516.3095092773438,
+ "y": 5984.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "6857d48.2b9c62c"
+ "e21bbc33.3bd9b8"
]
]
},
{
- "id": "14b77c36.339774",
+ "id": "6cb03d6a.b426e4",
"type": "switchNode",
"name": "switch model-customization-uuid",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].name == 'model-customization-uuid'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2477.452392578125,
- "y": 6080.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2484.3095092773438,
+ "y": 6042.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "36c572f8.11887e"
+ "26752abf.e0f87e"
]
]
},
{
- "id": "db75ea42.1350d",
+ "id": "fdef5f45.af46b8",
"type": "switchNode",
"name": "switch model-uuid",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].name == 'model-uuid'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2475.452392578125,
- "y": 6142.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2482.3095092773438,
+ "y": 6104.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "992d2ec6.0f6bf8"
+ "99545f4f.9552"
]
]
},
{
- "id": "6061ffc.9494f",
+ "id": "d977a0bb.d25038",
"type": "switchNode",
"name": "switch model-version",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].name == 'model-version'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2483.452392578125,
- "y": 6204.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2490.3095092773438,
+ "y": 6166.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "ddbe5eba.fbf8d8"
+ "d332c105.d01b6"
]
]
},
{
- "id": "8427815.e49c28",
+ "id": "7a50c097.1fd508",
"type": "switchNode",
"name": "switch vm-type",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].name == 'vm-type'`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 2499.452392578125,
- "y": 5950.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2506.3095092773438,
+ "y": 5912.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "481f3b2.962dd44"
+ "343730f6.0bde"
]
]
},
{
- "id": "481f3b2.962dd44",
+ "id": "343730f6.0bde",
"type": "success",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2703.452392578125,
- "y": 5946.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2710.3095092773438,
+ "y": 5908.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "9d2fa840.0363b"
+ "10dcd678.f75eb2"
]
]
},
{
- "id": "6857d48.2b9c62c",
+ "id": "e21bbc33.3bd9b8",
"type": "success",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2703.452392578125,
- "y": 6020.2630615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2710.3095092773438,
+ "y": 5982.834487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1fb07fdb.0d632"
+ "ba46d15f.84fe98"
]
]
},
{
- "id": "36c572f8.11887e",
+ "id": "26752abf.e0f87e",
"type": "success",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2709.452392578125,
- "y": 6076.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2716.3095092773438,
+ "y": 6038.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "a0d68506.3f9068"
+ "ec7f1ff2.18d6b8"
]
]
},
{
- "id": "992d2ec6.0f6bf8",
+ "id": "99545f4f.9552",
"type": "success",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2713.452392578125,
- "y": 6134.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2720.3095092773438,
+ "y": 6096.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "5459f399.0fb614"
+ "9cb30ad2.947f6"
]
]
},
{
- "id": "ddbe5eba.fbf8d8",
+ "id": "d332c105.d01b6",
"type": "success",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2719.452392578125,
- "y": 6200.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2726.3095092773438,
+ "y": 6162.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "29fd0e8b.8c7952"
+ "78957203.1f8534"
]
]
},
{
- "id": "9d2fa840.0363b",
+ "id": "10dcd678.f75eb2",
"type": "set",
"name": "set vm-type",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[0].vm-type`' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
"comments": "",
- "x": 2867.452392578125,
- "y": 5948.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2874.3095092773438,
+ "y": 5910.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "1fb07fdb.0d632",
+ "id": "ba46d15f.84fe98",
"type": "set",
"name": "set model-invariant-uuid",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[0].onap-model-information.model-invariant-uuid`' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
"comments": "",
- "x": 2913.452392578125,
- "y": 6014.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2920.3095092773438,
+ "y": 5976.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "a0d68506.3f9068",
+ "id": "ec7f1ff2.18d6b8",
"type": "set",
"name": "set model-customization-uuid",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[0].onap-model-information.model-customization-uuid`' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
"comments": "",
- "x": 2957.452392578125,
- "y": 6078.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2964.3095092773438,
+ "y": 6040.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "5459f399.0fb614",
+ "id": "9cb30ad2.947f6",
"type": "set",
"name": "set model-uuid",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[0].onap-model-information.model-uuid`' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
"comments": "",
- "x": 2933.452392578125,
- "y": 6132.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2940.3095092773438,
+ "y": 6094.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "29fd0e8b.8c7952",
+ "id": "78957203.1f8534",
"type": "set",
"name": "set model-version",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[0].onap-model-information.model-version`' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[j].value`' />\n",
"comments": "",
- "x": 2879.452392578125,
- "y": 6198.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2886.3095092773438,
+ "y": 6160.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "68fa786b.6c6688",
+ "id": "72d6e55e.c52994",
"type": "set",
"name": "set model-name",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[0].onap-model-information.model-name`' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
"comments": "",
- "x": 2885.452392578125,
- "y": 6254.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2892.3095092773438,
+ "y": 6216.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "caf48f2a.9458a",
+ "id": "f9bda76a.6618c8",
"type": "set",
"name": "set vnfc-name",
"xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[0].vm-names.vnfc-names[0].vnfc-name`' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
"comments": "",
- "x": 2903.452392578125,
- "y": 6310.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2910.3095092773438,
+ "y": 6272.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "15f23c59.7c19e4",
+ "id": "d4543380.8a8648",
"type": "switchNode",
"name": "switch model-name",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].name == 'model-name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2483.452392578125,
- "y": 6256.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2490.3095092773438,
+ "y": 6218.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "8525cf9e.edea6"
+ "ebf87fd3.da0e28"
]
]
},
{
- "id": "e7c83d46.a2ef48",
+ "id": "80d478e2.ca4f3",
"type": "switchNode",
"name": "switch vnfc-name",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].name == 'vnfc-name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 2481.452392578125,
- "y": 6310.0130615234375,
- "z": "719b1fb6.3a5b9",
+ "x": 2488.3095092773438,
+ "y": 6272.584487915039,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "ef06dde5.e03b88"
+ "e0094cf6.191bc"
]
]
},
{
- "id": "8525cf9e.edea6",
+ "id": "ebf87fd3.da0e28",
"type": "success",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2717.452392578125,
- "y": 6254.013061523437,
- "z": "719b1fb6.3a5b9",
+ "x": 2724.3095092773438,
+ "y": 6216.584487915038,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "68fa786b.6c6688"
+ "72d6e55e.c52994"
]
]
},
{
- "id": "ef06dde5.e03b88",
+ "id": "e0094cf6.191bc",
"type": "success",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2711.452392578125,
- "y": 6308.013061523437,
- "z": "719b1fb6.3a5b9",
+ "x": 2718.3095092773438,
+ "y": 6270.584487915038,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "caf48f2a.9458a"
+ "f9bda76a.6618c8"
]
]
},
{
- "id": "48f13d71.542c54",
+ "id": "c88ce4fa.2e3558",
"type": "for",
"name": "for vnf-parameters-data",
"xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1252,
- "y": 5412.000244140625,
- "z": "719b1fb6.3a5b9",
+ "x": 1258.8571166992188,
+ "y": 5374.571670532227,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "5e336da6.0d601c"
+ "5a20be5b.b3a028"
]
]
},
{
- "id": "5e336da6.0d601c",
+ "id": "5a20be5b.b3a028",
"type": "switchNode",
"name": "switch capability-name",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1532,
- "y": 5412.000244140625,
- "z": "719b1fb6.3a5b9",
+ "x": 1538.8571166992188,
+ "y": 5374.571670532227,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "9ea4a345.b9cf7"
+ "deb0eb20.bf079"
]
]
},
{
- "id": "9ea4a345.b9cf7",
+ "id": "deb0eb20.bf079",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1741.0001220703125,
- "y": 5412.000244140625,
- "z": "719b1fb6.3a5b9",
+ "x": 1747.8572387695312,
+ "y": 5374.571670532227,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "d4e4d3cb.8e365"
+ "80097c84.1bbc38"
]
]
},
{
- "id": "6b713cfb.723974",
+ "id": "96d8122d.bb415",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 826.25,
- "y": 1755,
- "z": "719b1fb6.3a5b9",
+ "x": 833.1071166992188,
+ "y": 1717.5714263916016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "80902f6b.f3783",
- "84fcdd32.ae8a78",
- "a887b563.1d77e"
+ "acaab3ca.702c88",
+ "6764646d.7a6754",
+ "e7afeea8.32592"
]
]
},
{
- "id": "84fcdd32.ae8a78",
+ "id": "6764646d.7a6754",
"type": "set",
"name": "set payload data",
- "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='' />",
+ "xml": "<set>\n\t<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n\t<parameter name='tmp.gen-name_length' value='0' />",
"comments": "",
- "x": 1034,
- "y": 1756,
- "z": "719b1fb6.3a5b9",
+ "x": 1040.8571166992188,
+ "y": 1718.5714263916016,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "a887b563.1d77e",
+ "id": "e7afeea8.32592",
"type": "switchNode",
"name": "switch tmp.naming-data-payload is null",
"xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
"comments": "",
"outputs": 1,
- "x": 1082,
- "y": 2035,
- "z": "719b1fb6.3a5b9",
+ "x": 1088.8571166992188,
+ "y": 1997.5714263916016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "a826576f.08cdb8"
+ "b86e6a12.7ee33"
]
]
},
{
- "id": "a826576f.08cdb8",
+ "id": "b86e6a12.7ee33",
"type": "not-found",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1319,
- "y": 2036,
- "z": "719b1fb6.3a5b9",
+ "x": 1325.8571166992188,
+ "y": 1998.5714263916016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "af5562cb.12735"
+ "6e3664a9.34079c"
]
]
},
{
- "id": "af5562cb.12735",
+ "id": "6e3664a9.34079c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1357,
- "y": 2094,
- "z": "719b1fb6.3a5b9",
+ "x": 1363.8571166992188,
+ "y": 2056.5714263916016,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "6a94f7b6.2e3e3",
- "27e20f71.6cc548",
- "9ffd6dac.5925a",
- "18ddf882.11fd17",
- "a0734951.e43bb8",
- "c0cd44d1.7422",
- "9976393.8117548",
- "36603013.bbb4f8"
+ "88f11c7a.f31688",
+ "fff738e5.4d0ce",
+ "f398ae72.bb9338",
+ "6d5e56ed.17d75",
+ "a0bc5db0.876ac8",
+ "a133146c.f8d1c",
+ "a6e4bc7d.20b678",
+ "93dc5615.04a418"
]
]
},
{
- "id": "7f8df3af.553754",
+ "id": "bf89c636.30aac8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1003,
- "y": 5345,
- "z": "719b1fb6.3a5b9",
+ "x": 1009.8571166992188,
+ "y": 5307.571426391602,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "9bc5841e.944e18",
- "48f13d71.542c54",
- "4e9878a6.bcb88"
+ "86e86da4.4fe67",
+ "c88ce4fa.2e3558",
+ "b36f7e94.174be"
]
]
},
{
- "id": "9bc5841e.944e18",
+ "id": "86e86da4.4fe67",
"type": "set",
"name": "set set payload data",
- "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='' />",
+ "xml": "<set>\n\t<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n\t<parameter name='tmp.gen-name_length' value='0' />",
"comments": "",
- "x": 1240,
- "y": 5344,
- "z": "719b1fb6.3a5b9",
+ "x": 1246.8571166992188,
+ "y": 5306.571426391602,
+ "z": "b88526e.24a7ad8",
"wires": []
},
{
- "id": "4e9878a6.bcb88",
+ "id": "b36f7e94.174be",
"type": "switchNode",
"name": "switch tmp.naming-data-payload is null",
"xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
"comments": "",
"outputs": 1,
- "x": 1282.2500305175781,
- "y": 5534.5001220703125,
- "z": "719b1fb6.3a5b9",
+ "x": 1289.1071472167969,
+ "y": 5497.071548461914,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "c1f0c66b.befbd"
+ "1f8cfbc.8ebb904"
]
]
},
{
- "id": "c1f0c66b.befbd",
+ "id": "1f8cfbc.8ebb904",
"type": "not-found",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1516.0000610351562,
- "y": 5534.2498779296875,
- "z": "719b1fb6.3a5b9",
+ "x": 1522.857177734375,
+ "y": 5496.821304321289,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "c6b57b94.c8c07"
+ "d5e5468.2a80438"
]
]
},
{
- "id": "c6b57b94.c8c07",
+ "id": "d5e5468.2a80438",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1503.7500610351562,
- "y": 5611.500244140625,
- "z": "719b1fb6.3a5b9",
+ "x": 1510.607177734375,
+ "y": 5574.071670532227,
+ "z": "b88526e.24a7ad8",
"wires": [
[
- "1fd7b0ea.d78def",
- "b52f5f26.c98fb",
- "382244f1.84c314",
- "b1e358e4.0f1af8",
- "8f868b5c.16e278",
- "c761a7c.6b8ed58",
- "4bd004e3.7dd99c",
- "20e95425.2ec68c",
- "64f6b871.04fb28"
+ "aba737c8.b673a",
+ "c54c6f8e.b8ff58",
+ "e94ef6dd.a37908",
+ "cbc78ec6.7ff248",
+ "d085846f.259da",
+ "af0954c0.0ed2a8",
+ "1e5d91b7.f1cac6",
+ "2d4ee971.9f5306",
+ "d6d7c682.438ef8"
]
]
+ },
+ {
+ "id": "2a352877.19cd9",
+ "type": "execute",
+ "name": "execute readProperties",
+ "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": 375,
+ "y": 176,
+ "z": "b88526e.24a7ad8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "d6d7c682.438ef8",
+ "type": "execute",
+ "name": "execute RestApiCallNode - POST gen-name",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > \n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1771,
+ "y": 5787,
+ "z": "b88526e.24a7ad8",
+ "wires": [
+ [
+ "1ec3d3c3.85586c",
+ "80386656.f0d7d"
+ ]
+ ]
+ },
+ {
+ "id": "93dc5615.04a418",
+ "type": "execute",
+ "name": "execute RestApiCallNode - POST gen-name",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > \n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1674,
+ "y": 2229,
+ "z": "b88526e.24a7ad8",
+ "wires": [
+ [
+ "7136f5d4.61b024",
+ "ef775b29.4a7b"
+ ]
+ ]
+ },
+ {
+ "id": "99585b38.25a06",
+ "type": "execute",
+ "name": "execute RestApiCallNode - DELETE gen-name",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > \n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1891,
+ "y": 4194,
+ "z": "b88526e.24a7ad8",
+ "wires": [
+ [
+ "e6db3fc2.418c7",
+ "add1de2.24bbda"
+ ]
+ ]
+ },
+ {
+ "id": "f9afd12e.2d3128",
+ "type": "execute",
+ "name": "execute RestApiCallNode - DELETE gen-name",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > \n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1784,
+ "y": 979,
+ "z": "b88526e.24a7ad8",
+ "wires": [
+ [
+ "8af1d548.36ba08",
+ "6b5d2c36.36d07c"
+ ]
+ ]
+ },
+ {
+ "id": "63a7432d.46f304",
+ "type": "comment",
+ "name": "For Generate Name DG Capability ",
+ "info": "Support Bulk assign and single delete\nAlso calls Naming gen mS for assign/un-assign\n\nAdded by Ajay Singh(as396y)",
+ "comments": "",
+ "x": 838,
+ "y": 106,
+ "z": "b88526e.24a7ad8",
+ "wires": []
}
] \ No newline at end of file
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 47601af5..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": "cbe4a9ee.16a0f8",
+ "id": "f1032bbd.b31d28",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 129.00390625,
- "y": 47.00390625,
- "z": "886e5ee7.da286",
+ "x": 85,
+ "y": 38,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e13e73c3.adb19"
+ "ded6a886.414a98"
]
]
},
{
- "id": "e13e73c3.adb19",
+ "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": 341.00391006469727,
- "y": 119.0039234161377,
- "z": "886e5ee7.da286",
+ "x": 297.00000381469727,
+ "y": 110.0000171661377,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5fa2576a.526658"
+ "a2425e96.87088"
]
]
},
{
- "id": "5fa2576a.526658",
+ "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": 329.0040283203125,
- "y": 207.00390625,
- "z": "886e5ee7.da286",
+ "x": 285.0001220703125,
+ "y": 198,
+ "z": "cbb28df7.1359",
"wires": [
[
- "91f5fd5b.cb45c"
+ "e7f36c41.5e57f"
]
]
},
{
- "id": "91f5fd5b.cb45c",
+ "id": "e7f36c41.5e57f",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 345.0040283203125,
- "y": 762.0041508674622,
- "z": "886e5ee7.da286",
+ "x": 301.0001220703125,
+ "y": 753.0002446174622,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f796ddaa.da23c",
- "d7cfeb18.ac7528",
- "b6393afd.3cacd8",
- "81c5733e.5f25d",
- "1053c083.232fef",
- "42a877ee.39df08",
- "d3f500c4.1bfb3",
- "aa223239.c5978",
- "44848e46.5ebac",
- "b29f5799.241a78",
- "3637e175.005c6e",
- "295602b3.df648e",
- "6a3ffb44.1e9004",
- "6bb92832.c7ba68",
- "1605273a.149319",
- "93c61c2f.6bcfd",
- "eba0b0a5.90799",
- "e1d773b9.aec52",
- "8f7266fc.c45038",
- "5e07c169.5398c"
+ "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": "f796ddaa.da23c",
+ "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": 741.9974670410156,
- "y": 160.9973931312561,
- "z": "886e5ee7.da286",
+ "x": 697.9935607910156,
+ "y": 151.9934868812561,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "84a283be.00d5",
+ "id": "afb2368f.9bd8f8",
"type": "comment",
"name": "set tmp ar-id to fetch resource from MDSAL",
"info": "",
"comments": "",
- "x": 770.9577789306641,
- "y": 125.02918910980225,
- "z": "886e5ee7.da286",
+ "x": 726.9538726806641,
+ "y": 116.02528285980225,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d7cfeb18.ac7528",
+ "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": 695.9974060058594,
- "y": 253.99739837646484,
- "z": "886e5ee7.da286",
+ "x": 651.9934997558594,
+ "y": 244.99349212646484,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "1053c083.232fef",
+ "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": 702.2592964172363,
- "y": 341.6641273498535,
- "z": "886e5ee7.da286",
+ "x": 658.2553901672363,
+ "y": 332.6602210998535,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "b6393afd.3cacd8",
+ "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": 749.2593536376953,
- "y": 429.6641311645508,
- "z": "886e5ee7.da286",
+ "x": 705.2554473876953,
+ "y": 420.6602249145508,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "611b176c.616988",
+ "id": "452cf8b8.86cc88",
"type": "comment",
"name": "GET connection-attachment-allotted-resource from mdsal",
"info": "",
"comments": "",
- "x": 795.8122863769531,
- "y": 560.5425653457642,
- "z": "886e5ee7.da286",
+ "x": 751.8083801269531,
+ "y": 551.5386590957642,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "eec7a472.d0ac68",
+ "id": "12f54fa3.aaff3",
"type": "comment",
"name": "Used for setting output to API Handler",
"info": "",
"comments": "",
- "x": 749.9974365234375,
- "y": 220.997407913208,
- "z": "886e5ee7.da286",
+ "x": 705.9935302734375,
+ "y": 211.993501663208,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "5ba07193.a939c",
+ "id": "926a67a.4a82498",
"type": "comment",
"name": "Obtain different URL, template location etc",
"info": "For saving resource information to MDSAL & for AAI",
"comments": "",
- "x": 767.9974021911621,
- "y": 306.8862886428833,
- "z": "886e5ee7.da286",
+ "x": 723.9934959411621,
+ "y": 297.8823823928833,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "25108569.01c11a",
+ "id": "f41dfc4.f4cda",
"type": "comment",
"name": "Used to Get AR by id to MDSAL, same as self-link",
"info": "",
"comments": "",
- "x": 793.9974212646484,
- "y": 393.8862476348877,
- "z": "886e5ee7.da286",
+ "x": 749.9935150146484,
+ "y": 384.8823413848877,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "5268ad10.1fbc94",
+ "id": "a1fbf2bd.6b2d9",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1255.6706981658936,
- "y": 578.0038909912109,
- "z": "886e5ee7.da286",
+ "x": 1211.6667919158936,
+ "y": 568.9999847412109,
+ "z": "cbb28df7.1359",
"wires": [
[
- "1b9b3a1f.4ecdd6"
+ "9cd08c09.1d068"
]
]
},
{
- "id": "1b9b3a1f.4ecdd6",
+ "id": "9cd08c09.1d068",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1399.6707763671875,
- "y": 535.5038089752197,
- "z": "886e5ee7.da286",
+ "x": 1355.6668701171875,
+ "y": 526.4999027252197,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b1843433.376208"
+ "33641e94.7a0b72"
]
]
},
{
- "id": "b1843433.376208",
+ "id": "33641e94.7a0b72",
"type": "switchNode",
"name": "switch cr length",
"xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1568.5282001495361,
- "y": 533.1229801177979,
- "z": "886e5ee7.da286",
+ "x": 1524.5242938995361,
+ "y": 524.1190738677979,
+ "z": "cbb28df7.1359",
"wires": [
[
- "72d20a43.d9be64",
- "eb9d8f14.be82"
+ "affca4cd.d977a8",
+ "c376fca7.816d6"
]
]
},
{
- "id": "72d20a43.d9be64",
+ "id": "affca4cd.d977a8",
"type": "other",
"name": "outcome 1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1723.8613357543945,
- "y": 505.1228952407837,
- "z": "886e5ee7.da286",
+ "x": 1679.8574295043945,
+ "y": 496.1189889907837,
+ "z": "cbb28df7.1359",
"wires": [
[
- "bb2299d5.286418"
+ "53c06015.6266b"
]
]
},
{
- "id": "bb2299d5.286418",
+ "id": "53c06015.6266b",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic='true'>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1882.385139465332,
- "y": 503.02774238586426,
- "z": "886e5ee7.da286",
+ "x": 1838.381233215332,
+ "y": 494.02383613586426,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5775f1db.84903",
- "246f7da0.0df1c2",
- "af0aec90.73323"
+ "7ac858c4.60b0b8",
+ "dad8eb30.a0d438",
+ "c39c89e4.ebe398"
]
]
},
{
- "id": "5facd3b6.9153ec",
+ "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": 1822.5230712890625,
- "y": 610.0699768066406,
- "z": "886e5ee7.da286",
+ "x": 1778.5191650390625,
+ "y": 601.0660705566406,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "ffb50ed4.11c7e",
+ "id": "97f58790.fbe988",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1247.5225009918213,
- "y": 613.0699758529663,
- "z": "886e5ee7.da286",
+ "x": 1203.5185947418213,
+ "y": 604.0660696029663,
+ "z": "cbb28df7.1359",
"wires": [
[
- "8996743b.6d4188"
+ "e6b498e7.ee1fb8"
]
]
},
{
- "id": "8996743b.6d4188",
+ "id": "e6b498e7.ee1fb8",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1427.5224514007568,
- "y": 613.7365264892578,
- "z": "886e5ee7.da286",
+ "x": 1383.5185451507568,
+ "y": 604.7326202392578,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5facd3b6.9153ec"
+ "27d51102.19665e"
]
]
},
{
- "id": "eb9d8f14.be82",
+ "id": "c376fca7.816d6",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1715.189338684082,
- "y": 564.4032697677612,
- "z": "886e5ee7.da286",
+ "x": 1671.185432434082,
+ "y": 555.3993635177612,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5facd3b6.9153ec"
+ "27d51102.19665e"
]
]
},
{
- "id": "5775f1db.84903",
+ "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": 2129.4485931396484,
- "y": 476.00399446487427,
- "z": "886e5ee7.da286",
+ "x": 2085.4446868896484,
+ "y": 467.00008821487427,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "af0aec90.73323",
+ "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": 2063.4486236572266,
- "y": 549.4324970245361,
- "z": "886e5ee7.da286",
+ "x": 2019.4447174072266,
+ "y": 540.4285907745361,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "246f7da0.0df1c2",
+ "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": 2073.448402404785,
- "y": 515.0039310455322,
- "z": "886e5ee7.da286",
+ "x": 2029.4444961547852,
+ "y": 506.0000247955322,
+ "z": "cbb28df7.1359",
"wires": [
[
- "9948e837.465828",
- "ac517970.6daf78"
+ "cc20c996.8c9528",
+ "d77bf1ee.049a3",
+ "453143a6.32929c"
]
]
},
{
- "id": "9948e837.465828",
+ "id": "cc20c996.8c9528",
"type": "outcome",
"name": "outcome Created",
"xml": "<outcome value='Created'>\n",
"comments": "",
"outputs": 1,
- "x": 2309.048484802246,
- "y": 509.0039620399475,
- "z": "886e5ee7.da286",
+ "x": 2265.044578552246,
+ "y": 500.0000557899475,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d4094486.c3a6e8"
+ "3a4bc81f.b971d8"
]
]
},
{
- "id": "ac517970.6daf78",
+ "id": "d77bf1ee.049a3",
"type": "outcome",
"name": "outcome Other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2302.762924194336,
- "y": 548.4325699806213,
- "z": "886e5ee7.da286",
+ "x": 2258.759078979492,
+ "y": 580.4286904335022,
+ "z": "cbb28df7.1359",
"wires": [
[
- "757a486d.390608"
+ "f8e833ae.2c3a5"
]
]
},
{
- "id": "d4094486.c3a6e8",
+ "id": "3a4bc81f.b971d8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2467.519157409668,
- "y": 509.37961769104004,
- "z": "886e5ee7.da286",
+ "x": 2423.515251159668,
+ "y": 500.37571144104004,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "757a486d.390608",
+ "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": 2478.670738220215,
- "y": 547.0039691925049,
- "z": "886e5ee7.da286",
+ "x": 2434.666893005371,
+ "y": 579.0000896453857,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d09e7753.a74cd8",
+ "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": 966.306957244873,
- "y": 660.4975109100342,
- "z": "886e5ee7.da286",
+ "x": 922.303050994873,
+ "y": 651.4936046600342,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "42a877ee.39df08",
+ "id": "c02fb64d.81dcb8",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 660.3130569458008,
- "y": 661.5038814544678,
- "z": "886e5ee7.da286",
+ "x": 616.3091506958008,
+ "y": 652.4999752044678,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d09e7753.a74cd8"
+ "a031723a.72d45"
]
]
},
{
- "id": "e91124de.b8d7d8",
+ "id": "8474372c.daa338",
"type": "comment",
"name": "GET parent-service-data from mdsal to check existence of other End point",
"info": "",
"comments": "",
- "x": 848.00439453125,
- "y": 706.5356588363647,
- "z": "886e5ee7.da286",
+ "x": 804.00048828125,
+ "y": 697.5317525863647,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "cfe58f57.1b13e",
+ "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": 1739.1891021728516,
- "y": 859.0081362724304,
- "z": "886e5ee7.da286",
+ "x": 1695.1851959228516,
+ "y": 850.0042300224304,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b90499b4.5bff18"
+ "69bb7e37.5502b"
]
]
},
{
- "id": "81c5733e.5f25d",
+ "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": 823.1881256103516,
- "y": 966.7221727371216,
- "z": "886e5ee7.da286",
+ "x": 779.1842193603516,
+ "y": 957.7182664871216,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2b5852f4.1574ce",
- "8b23ecf0.b4c98",
- "2dc5a41e.bad62c"
+ "e5034add.dc7ee8",
+ "ea87fbba.a1ee38",
+ "37719ae7.6e63d6"
]
]
},
{
- "id": "2b5852f4.1574ce",
+ "id": "e5034add.dc7ee8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1151.3311462402344,
- "y": 1039.5794467926025,
- "z": "886e5ee7.da286",
+ "x": 1107.3272399902344,
+ "y": 1030.5755405426025,
+ "z": "cbb28df7.1359",
"wires": [
[
- "4362d0c4.f5cb7"
+ "882cb355.05a04"
]
]
},
{
- "id": "3bb83710.9a5ab8",
+ "id": "4d6165bb.ea8a7c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1335.458408355713,
- "y": 898.7054557800293,
- "z": "886e5ee7.da286",
+ "x": 1291.454502105713,
+ "y": 889.7015495300293,
+ "z": "cbb28df7.1359",
"wires": [
[
- "cfe58f57.1b13e",
- "44aafa72.840b94"
+ "dfd9ac30.4d327",
+ "3a395b7f.25dd64"
]
]
},
{
- "id": "b90499b4.5bff18",
+ "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": 2179.3004302978516,
- "y": 856.0079383850098,
- "z": "886e5ee7.da286",
+ "x": 2135.2965240478516,
+ "y": 847.0040321350098,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d9f6094c.60f3c8",
- "cb859d5.2b35e6"
+ "cc363d65.ffc05",
+ "15afd920.4feac7"
]
]
},
{
- "id": "d9f6094c.60f3c8",
+ "id": "cc363d65.ffc05",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2352.1106452941895,
- "y": 827.4725532531738,
- "z": "886e5ee7.da286",
+ "x": 2308.1067390441895,
+ "y": 818.4686470031738,
+ "z": "cbb28df7.1359",
"wires": [
[
- "8ae27c1b.bd8dc"
+ "1c47a88e.29f817"
]
]
},
{
- "id": "303a5029.c6676",
+ "id": "8ff402e2.b14b9",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2500.8711166381836,
- "y": 884.3296403884888,
- "z": "886e5ee7.da286",
+ "x": 2456.8672103881836,
+ "y": 875.3257341384888,
+ "z": "cbb28df7.1359",
"wires": [
[
- "da88cefe.fe269"
+ "42b3d0fe.09e55"
]
]
},
{
- "id": "da88cefe.fe269",
+ "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": 2735.728542327881,
- "y": 882.9011726379395,
- "z": "886e5ee7.da286",
+ "x": 2691.724636077881,
+ "y": 873.8972663879395,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "eb542676.9f39a8",
+ "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": 770.9665641784668,
- "y": 871.8968677520752,
- "z": "886e5ee7.da286",
+ "x": 726.9626579284668,
+ "y": 862.8929615020752,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "8b23ecf0.b4c98",
+ "id": "ea87fbba.a1ee38",
"type": "other",
"name": "outcome 1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1165.9836158752441,
- "y": 978.6811304092407,
- "z": "886e5ee7.da286",
+ "x": 1121.9797096252441,
+ "y": 969.6772241592407,
+ "z": "cbb28df7.1359",
"wires": [
[
- "eb826fe2.5c753"
+ "c0453fc3.0e237"
]
]
},
{
- "id": "4362d0c4.f5cb7",
+ "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": 1310.9834938049316,
- "y": 1038.68137550354,
- "z": "886e5ee7.da286",
+ "x": 1266.9795875549316,
+ "y": 1029.67746925354,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "2dc5a41e.bad62c",
+ "id": "37719ae7.6e63d6",
"type": "other",
"name": "outcome 2",
"xml": "<outcome value='2'>\n",
"comments": "",
"outputs": 1,
- "x": 1160.9834289550781,
- "y": 899.6811561584473,
- "z": "886e5ee7.da286",
+ "x": 1116.9795227050781,
+ "y": 890.6772499084473,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3bb83710.9a5ab8"
+ "4d6165bb.ea8a7c"
]
]
},
{
- "id": "8ae27c1b.bd8dc",
+ "id": "1c47a88e.29f817",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2510.0948600769043,
- "y": 826.6812963485718,
- "z": "886e5ee7.da286",
+ "x": 2466.0909538269043,
+ "y": 817.6773900985718,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "cb859d5.2b35e6",
+ "id": "15afd920.4feac7",
"type": "outcomeTrue",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 2359.0945014953613,
- "y": 883.6811561584473,
- "z": "886e5ee7.da286",
+ "x": 2315.0905952453613,
+ "y": 874.6772499084473,
+ "z": "cbb28df7.1359",
"wires": [
[
- "303a5029.c6676"
+ "8ff402e2.b14b9"
]
]
},
{
- "id": "44aafa72.840b94",
+ "id": "3a395b7f.25dd64",
"type": "switchNode",
"name": "switch tmp.found-in-ar",
"xml": "<switch test='`$tmp.found-in-ar`'>\n\n",
"comments": "",
"outputs": 1,
- "x": 1547.9834060668945,
- "y": 952.4589738845825,
- "z": "886e5ee7.da286",
+ "x": 1503.9794998168945,
+ "y": 943.4550676345825,
+ "z": "cbb28df7.1359",
"wires": [
[
- "753da27d.40afec"
+ "620a8680.ec1638"
]
]
},
{
- "id": "753da27d.40afec",
+ "id": "620a8680.ec1638",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1718.98344039917,
- "y": 953.5701951980591,
- "z": "886e5ee7.da286",
+ "x": 1674.97953414917,
+ "y": 944.5662889480591,
+ "z": "cbb28df7.1359",
"wires": [
[
- "15dd4c54.90cd64"
+ "54a50118.05977"
]
]
},
{
- "id": "15dd4c54.90cd64",
+ "id": "54a50118.05977",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1867.9835357666016,
- "y": 953.5701942443848,
- "z": "886e5ee7.da286",
+ "x": 1823.9796295166016,
+ "y": 944.5662879943848,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2865c930.441376",
- "36209682.cdfdca"
+ "2fbf3350.d69d7c",
+ "51067155.cb254"
]
]
},
{
- "id": "2877490b.8d1876",
+ "id": "7d7dc112.d678b",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2614.101360321045,
- "y": 969.7990484237671,
- "z": "886e5ee7.da286",
+ "x": 2570.097454071045,
+ "y": 960.7951421737671,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2c4d90a6.77e83"
+ "94f95621.9a2ea8"
]
]
},
{
- "id": "bf4a739d.0a26c",
+ "id": "79425b66.b91424",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2605.9531631469727,
- "y": 1004.8651332855225,
- "z": "886e5ee7.da286",
+ "x": 2561.9492568969727,
+ "y": 995.8612270355225,
+ "z": "cbb28df7.1359",
"wires": [
[
- "7b79fb1a.832b54"
+ "3ebc390b.802eb6"
]
]
},
{
- "id": "24a003e8.d381ac",
+ "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": 1611.316909790039,
- "y": 1053.903814315796,
- "z": "886e5ee7.da286",
+ "x": 1567.313003540039,
+ "y": 1044.899908065796,
+ "z": "cbb28df7.1359",
"wires": [
[
- "1aeaa906.662367",
- "d808e760.0f46c8"
+ "b54c4867.028668",
+ "73000cce.d47514"
]
]
},
{
- "id": "d808e760.0f46c8",
+ "id": "73000cce.d47514",
"type": "other",
"name": "outcome 1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1875.3167572021484,
- "y": 1033.7925605773926,
- "z": "886e5ee7.da286",
+ "x": 1831.3128509521484,
+ "y": 1024.7886543273926,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e18d77e0.ca5578"
+ "d471d131.1144d"
]
]
},
{
- "id": "1aeaa906.662367",
+ "id": "b54c4867.028668",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1865.3168182373047,
- "y": 1081.792531967163,
- "z": "886e5ee7.da286",
+ "x": 1821.3129119873047,
+ "y": 1072.788625717163,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d8d07b23.4c08f8"
+ "5f3379.2755bc88"
]
]
},
{
- "id": "d8d07b23.4c08f8",
+ "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": 2003.9691619873047,
- "y": 1083.894292831421,
- "z": "886e5ee7.da286",
+ "x": 1959.9652557373047,
+ "y": 1074.890386581421,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "3516f8ea.4360d8",
+ "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": 2236.761615753174,
- "y": 1034.792730331421,
- "z": "886e5ee7.da286",
+ "x": 2192.757709503174,
+ "y": 1025.788824081421,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "eb826fe2.5c753",
+ "id": "c0453fc3.0e237",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1333.4279251098633,
- "y": 977.7923974990845,
- "z": "886e5ee7.da286",
+ "x": 1289.4240188598633,
+ "y": 968.7884912490845,
+ "z": "cbb28df7.1359",
"wires": [
[
- "24a003e8.d381ac"
+ "90be4eb6.fdc8c"
]
]
},
{
- "id": "e18d77e0.ca5578",
+ "id": "d471d131.1144d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 2034.0945281982422,
- "y": 1036.7923946380615,
- "z": "886e5ee7.da286",
+ "x": 1990.0906219482422,
+ "y": 1027.7884883880615,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3516f8ea.4360d8",
- "fa997652.5fc978"
+ "d6222ed2.2e3d3",
+ "ce58bf5a.0189d"
]
]
},
{
- "id": "fa997652.5fc978",
+ "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": 2397.094566345215,
- "y": 1082.7925491333008,
- "z": "886e5ee7.da286",
+ "x": 2353.090660095215,
+ "y": 1073.7886428833008,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f89cda47.d902a8"
+ "a4f1258e.f8f7e8"
]
]
},
{
- "id": "f89cda47.d902a8",
+ "id": "a4f1258e.f8f7e8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2443.650634765625,
- "y": 1313.7923583984375,
- "z": "886e5ee7.da286",
+ "x": 2399.646728515625,
+ "y": 1304.7884521484375,
+ "z": "cbb28df7.1359",
"wires": [
[
- "eff80839.760f28",
- "81242a80.6995e8",
- "a9774cfd.8e266",
- "1742a4f9.42112b",
- "e032978.6936268",
- "b04f73ae.32d85",
- "3f331e86.57efa2",
- "d4d17449.0a3768",
- "b369fa7c.e07e38",
- "642263f7.dd00fc"
+ "ce9cca12.4f0af8",
+ "d379e536.6a0348",
+ "63d37889.57ca38",
+ "ff3897ba.b2c938",
+ "410b060d.0c2948",
+ "805eddea.23b52",
+ "623ff136.8ac42",
+ "3055227f.6b6a0e",
+ "830a582f.f084d8",
+ "f77b8935.e0ba38"
]
]
},
{
- "id": "eff80839.760f28",
+ "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": 2720.1608505249023,
- "y": 1155.8031058311462,
- "z": "886e5ee7.da286",
+ "x": 2676.1569442749023,
+ "y": 1146.7991995811462,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3c2bf5ae.ea0f1a"
+ "c66b2919.5cf5d8"
]
]
},
{
- "id": "3c2bf5ae.ea0f1a",
+ "id": "c66b2919.5cf5d8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2909.1604766845703,
- "y": 1157.8029704093933,
- "z": "886e5ee7.da286",
+ "x": 2865.1565704345703,
+ "y": 1148.7990641593933,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ff19cd9d.b44a2"
+ "f9c2cbff.de99a8"
]
]
},
{
- "id": "ff19cd9d.b44a2",
+ "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": 3162.1606521606445,
- "y": 1157.4030165672302,
- "z": "886e5ee7.da286",
+ "x": 3118.1567459106445,
+ "y": 1148.3991103172302,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "81242a80.6995e8",
+ "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": 2694.150302886963,
- "y": 1529.7923970222473,
- "z": "886e5ee7.da286",
+ "x": 2650.146396636963,
+ "y": 1520.7884907722473,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "295602b3.df648e",
+ "id": "dad7cff3.85c1b",
"type": "switchNode",
"name": "switch tmp.ep-available",
"xml": "<switch test='`$tmp.ep-available`'>\n",
"comments": "",
"outputs": 1,
- "x": 686.3167266845703,
- "y": 1162.236707687378,
- "z": "886e5ee7.da286",
+ "x": 642.3128204345703,
+ "y": 1153.232801437378,
+ "z": "cbb28df7.1359",
"wires": [
[
- "49e6bbf9.737be4",
- "71f6c993.d973c8"
+ "6ca6c936.2c3768",
+ "eac664c0.e13b08"
]
]
},
{
- "id": "71f6c993.d973c8",
+ "id": "eac664c0.e13b08",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 904.9834461212158,
- "y": 1211.5700645446777,
- "z": "886e5ee7.da286",
+ "x": 860.9795398712158,
+ "y": 1202.5661582946777,
+ "z": "cbb28df7.1359",
"wires": [
[
- "71103f59.0e808"
+ "750588ef.b99fe8"
]
]
},
{
- "id": "49e6bbf9.737be4",
+ "id": "6ca6c936.2c3768",
"type": "outcomeTrue",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 909.8722476959229,
- "y": 1120.570125579834,
- "z": "886e5ee7.da286",
+ "x": 865.8683414459229,
+ "y": 1111.566219329834,
+ "z": "cbb28df7.1359",
"wires": [
[
- "20d8c152.565e0e"
+ "749ef9db.5d3a08"
]
]
},
{
- "id": "20d8c152.565e0e",
+ "id": "749ef9db.5d3a08",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1056.8722438812256,
- "y": 1122.4589385986328,
- "z": "886e5ee7.da286",
+ "x": 1012.8683376312256,
+ "y": 1113.4550323486328,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "71103f59.0e808",
+ "id": "750588ef.b99fe8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1075.094533920288,
- "y": 1209.5700225830078,
- "z": "886e5ee7.da286",
+ "x": 1031.090627670288,
+ "y": 1200.5661163330078,
+ "z": "cbb28df7.1359",
"wires": [
[
- "44959453.f2ce1c",
- "8bc2c84.596c538",
- "431946d9.2130a8"
+ "fceb9616.eb61b8",
+ "7c3f1ab0.926054",
+ "d86d0f7e.bebac"
]
]
},
{
- "id": "44959453.f2ce1c",
+ "id": "fceb9616.eb61b8",
"type": "switchNode",
"name": "switch tmp.found-in-ar",
"xml": "<switch test='`$tmp.found-in-ar`'>\n",
"comments": "",
"outputs": 1,
- "x": 1301.2055473327637,
- "y": 1176.5700225830078,
- "z": "886e5ee7.da286",
+ "x": 1257.2016410827637,
+ "y": 1167.5661163330078,
+ "z": "cbb28df7.1359",
"wires": [
[
- "37b8c945.c963b6",
- "bce04597.421bd8"
+ "c8457f81.3c93c",
+ "ce69f5f5.7107f8"
]
]
},
{
- "id": "37b8c945.c963b6",
+ "id": "c8457f81.3c93c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1496.6499938964844,
- "y": 1154.570083618164,
- "z": "886e5ee7.da286",
+ "x": 1452.6460876464844,
+ "y": 1145.566177368164,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2970ed54.87cac2"
+ "7996be51.f87bd"
]
]
},
{
- "id": "bce04597.421bd8",
+ "id": "ce69f5f5.7107f8",
"type": "outcomeTrue",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1493.64990234375,
- "y": 1202.570068359375,
- "z": "886e5ee7.da286",
+ "x": 1449.64599609375,
+ "y": 1193.566162109375,
+ "z": "cbb28df7.1359",
"wires": [
[
- "a5084037.7afaf"
+ "1e79b4e5.a1cc3b"
]
]
},
{
- "id": "2970ed54.87cac2",
+ "id": "7996be51.f87bd",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1684.2056579589844,
- "y": 1151.570083618164,
- "z": "886e5ee7.da286",
+ "x": 1640.2017517089844,
+ "y": 1142.566177368164,
+ "z": "cbb28df7.1359",
"wires": [
[
- "c697bcdd.29bcd"
+ "2b6b416f.53780e"
]
]
},
{
- "id": "a5084037.7afaf",
+ "id": "1e79b4e5.a1cc3b",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1681.20556640625,
- "y": 1201.570068359375,
- "z": "886e5ee7.da286",
+ "x": 1637.20166015625,
+ "y": 1192.566162109375,
+ "z": "cbb28df7.1359",
"wires": [
[
- "10ed7f5b.5c00f1"
+ "1a9c7979.469227"
]
]
},
{
- "id": "3b7ac17e.0f823e",
+ "id": "add86bf3.f17608",
"type": "comment",
"name": "GET connection-attachment-ar to store AR data from mdsal",
"info": "",
"comments": "",
- "x": 2193.4767417907715,
- "y": 438.50785398483276,
- "z": "886e5ee7.da286",
+ "x": 2149.4728355407715,
+ "y": 429.50394773483276,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "71841c48.209304",
+ "id": "652dad92.494ca4",
"type": "comment",
"name": "Set source end point",
"info": "",
"comments": "",
- "x": 682.9766387939453,
- "y": 527.2578740119934,
- "z": "886e5ee7.da286",
+ "x": 638.9727325439453,
+ "y": 518.2539677619934,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d3f500c4.1bfb3",
+ "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": 733.9727325439453,
- "y": 736.0039968490601,
- "z": "886e5ee7.da286",
+ "x": 689.9688262939453,
+ "y": 727.0000905990601,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "7ecc4648.197a88",
+ "id": "76dc332e.fe177c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1093.972885131836,
- "y": 807.0039834976196,
- "z": "886e5ee7.da286",
+ "x": 1049.968978881836,
+ "y": 798.0000772476196,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2393b2c8.86b16e"
+ "9d0d7b21.e0ad98"
]
]
},
{
- "id": "dfe397a0.b9ba28",
+ "id": "cbf3f4e6.00aa98",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1085.8246879577637,
- "y": 842.070068359375,
- "z": "886e5ee7.da286",
+ "x": 1041.8207817077637,
+ "y": 833.066162109375,
+ "z": "cbb28df7.1359",
"wires": [
[
- "1a3d638c.318b9c"
+ "d8b072f9.d7c21"
]
]
},
{
- "id": "1a3d638c.318b9c",
+ "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": 1231.9734687805176,
- "y": 841.3374795913696,
- "z": "886e5ee7.da286",
+ "x": 1187.9695625305176,
+ "y": 832.3335733413696,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "2393b2c8.86b16e",
+ "id": "9d0d7b21.e0ad98",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1224.9729804992676,
- "y": 807.0040445327759,
- "z": "886e5ee7.da286",
+ "x": 1180.9690742492676,
+ "y": 798.0001382827759,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "7b79fb1a.832b54",
+ "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": 2755.973213195801,
- "y": 1005.00417137146,
- "z": "886e5ee7.da286",
+ "x": 2711.969306945801,
+ "y": 996.00026512146,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "2c4d90a6.77e83",
+ "id": "94f95621.9a2ea8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 2740.9733352661133,
- "y": 972.0041561126709,
- "z": "886e5ee7.da286",
+ "x": 2696.9694290161133,
+ "y": 963.0002498626709,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "aa223239.c5978",
+ "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": 819.9726715087891,
- "y": 909.0039710998535,
- "z": "886e5ee7.da286",
+ "x": 775.9687652587891,
+ "y": 900.0000648498535,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "3eb9877e.29bda8",
+ "id": "336df829.2ff8b8",
"type": "comment",
"name": "If other EP exists set destination end point",
"info": "Check if other allotted resource is available.",
"comments": "",
- "x": 736.9726715087891,
- "y": 1087.0039196014404,
- "z": "886e5ee7.da286",
+ "x": 692.9687652587891,
+ "y": 1078.0000133514404,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "6bea5b5c.cc56a4",
+ "id": "917d1ab.d2608e8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1476.9727935791016,
- "y": 1414.0042009353638,
- "z": "886e5ee7.da286",
+ "x": 1432.9688873291016,
+ "y": 1405.0002946853638,
+ "z": "cbb28df7.1359",
"wires": [
[
- "873a1eb1.c2b41",
- "ec2f2c59.85a72",
- "4344ccac.0cc2d4",
- "3e861847.acb138",
- "dbce043e.c1b088",
- "6cf22112.6f2ff",
- "447be204.cdf4fc",
- "3722b20a.c8338e"
+ "a62deca7.bcade",
+ "81802c0b.6f8f",
+ "11a25f88.82eed",
+ "47a81553.315d4c",
+ "ee81a378.a7601",
+ "b4347cf5.49bc8",
+ "5c76f693.8395f8",
+ "59d53676.123ac8"
]
]
},
{
- "id": "873a1eb1.c2b41",
+ "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": 1719.4830951690674,
- "y": 1284.014597415924,
- "z": "886e5ee7.da286",
+ "x": 1675.4791889190674,
+ "y": 1275.010691165924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e78fa7d0.0dc8a8"
+ "fe688e94.da33b"
]
]
},
{
- "id": "ec2f2c59.85a72",
+ "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": 1692.4730472564697,
- "y": 1589.0045609474182,
- "z": "886e5ee7.da286",
+ "x": 1648.4691410064697,
+ "y": 1580.0006546974182,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "4344ccac.0cc2d4",
+ "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": 1710.9729251861572,
- "y": 1327.7821288108826,
- "z": "886e5ee7.da286",
+ "x": 1666.9690189361572,
+ "y": 1318.7782225608826,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e0447eeb.b4df4"
+ "c02ee204.0e0d9"
]
]
},
{
- "id": "3e861847.acb138",
+ "id": "47a81553.315d4c",
"type": "switchNode",
"name": "switch clientSignal",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`\">",
"comments": "",
"outputs": 1,
- "x": 1704.9729633331299,
- "y": 1373.782175540924,
- "z": "886e5ee7.da286",
+ "x": 1660.9690570831299,
+ "y": 1364.778269290924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "851a1f33.b90d6"
+ "54c81360.7adb5c"
]
]
},
{
- "id": "dbce043e.c1b088",
+ "id": "ee81a378.a7601",
"type": "switchNode",
"name": "switch cVLAN",
"xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`\">",
"comments": "",
"outputs": 1,
- "x": 1688.9624652862549,
- "y": 1412.771677494049,
- "z": "886e5ee7.da286",
+ "x": 1644.9585590362549,
+ "y": 1403.767771244049,
+ "z": "cbb28df7.1359",
"wires": [
[
- "cde9b854.f3d7e8"
+ "99167636.bd39c8"
]
]
},
{
- "id": "e78fa7d0.0dc8a8",
+ "id": "fe688e94.da33b",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1897.1950092315674,
- "y": 1284.6709694862366,
- "z": "886e5ee7.da286",
+ "x": 1853.1911029815674,
+ "y": 1275.6670632362366,
+ "z": "cbb28df7.1359",
"wires": [
[
- "bfb532e5.03a1a"
+ "ba53eaa4.9c9d68"
]
]
},
{
- "id": "bfb532e5.03a1a",
+ "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": 2072.1950092315674,
- "y": 1284.270944595337,
- "z": "886e5ee7.da286",
+ "x": 2028.1911029815674,
+ "y": 1275.267038345337,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "e0447eeb.b4df4",
+ "id": "c02ee204.0e0d9",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1892.6848773956299,
- "y": 1327.438425540924,
- "z": "886e5ee7.da286",
+ "x": 1848.6809711456299,
+ "y": 1318.434519290924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b05efaae.c42928"
+ "d114cdd9.cd628"
]
]
},
{
- "id": "851a1f33.b90d6",
+ "id": "54c81360.7adb5c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1892.6848773956299,
- "y": 1373.438425540924,
- "z": "886e5ee7.da286",
+ "x": 1848.6809711456299,
+ "y": 1364.434519290924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "24c05af2.8faa76"
+ "b311a80c.06bd18"
]
]
},
{
- "id": "cde9b854.f3d7e8",
+ "id": "99167636.bd39c8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1892.6743793487549,
- "y": 1412.4280495643616,
- "z": "886e5ee7.da286",
+ "x": 1848.6704730987549,
+ "y": 1403.4241433143616,
+ "z": "cbb28df7.1359",
"wires": [
[
- "27931eaa.157cb2"
+ "9a953c6c.d3922"
]
]
},
{
- "id": "8bc2c84.596c538",
+ "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": 1329.97265625,
- "y": 1302.00390625,
- "z": "886e5ee7.da286",
+ "x": 1285.96875,
+ "y": 1293,
+ "z": "cbb28df7.1359",
"wires": [
[
- "6bea5b5c.cc56a4"
+ "917d1ab.d2608e8"
]
]
},
{
- "id": "c697bcdd.29bcd",
+ "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": 1895.9727115631104,
- "y": 1151.0039806365967,
- "z": "886e5ee7.da286",
+ "x": 1851.9688053131104,
+ "y": 1142.0000743865967,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "10ed7f5b.5c00f1",
+ "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": 1892.972620010376,
- "y": 1197.0039653778076,
- "z": "886e5ee7.da286",
+ "x": 1848.968713760376,
+ "y": 1188.0000591278076,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "b05efaae.c42928",
+ "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": 2069.9728412628174,
- "y": 1327.0042214393616,
- "z": "886e5ee7.da286",
+ "x": 2025.9689350128174,
+ "y": 1318.0003151893616,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "24c05af2.8faa76",
+ "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": 2063.9728412628174,
- "y": 1371.0042214393616,
- "z": "886e5ee7.da286",
+ "x": 2019.9689350128174,
+ "y": 1362.0003151893616,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "27931eaa.157cb2",
+ "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": 2054.9728412628174,
- "y": 1410.0042214393616,
- "z": "886e5ee7.da286",
+ "x": 2010.9689350128174,
+ "y": 1401.0003151893616,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "1eb5604c.140ea",
+ "id": "41e007bc.b49c58",
"type": "comment",
"name": "Get controller info and send request",
"info": "",
"comments": "",
- "x": 1936.972713470459,
- "y": 1881.004059791565,
- "z": "886e5ee7.da286",
+ "x": 1892.968807220459,
+ "y": 1872.000153541565,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "4c07dee.6ce442",
+ "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`\" />",
+ "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": 1989.97314453125,
- "y": 2024.0048599243164,
- "z": "886e5ee7.da286",
+ "x": 1945.96923828125,
+ "y": 2015.0009536743164,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ebb13c18.63d5b",
- "27ef146.5170fec"
+ "163df924.1c4a27",
+ "eec75b28.8ba118"
]
]
},
{
- "id": "ebb13c18.63d5b",
+ "id": "163df924.1c4a27",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2255.972869873047,
- "y": 2053.004982948303,
- "z": "886e5ee7.da286",
+ "x": 2211.968963623047,
+ "y": 2044.0010766983032,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3abdd3d8.70de3c"
+ "638866f6.2498c8"
]
]
},
{
- "id": "3abdd3d8.70de3c",
+ "id": "638866f6.2498c8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 2403.972869873047,
- "y": 2051.0048608779907,
- "z": "886e5ee7.da286",
+ "x": 2359.968963623047,
+ "y": 2042.0009546279907,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "252b7082.c5a2b",
+ "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": 2385.972900390625,
- "y": 1998.0049209594727,
- "z": "886e5ee7.da286",
+ "x": 2341.968994140625,
+ "y": 1989.0010147094727,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "27ef146.5170fec",
+ "id": "eec75b28.8ba118",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2246.9728088378906,
- "y": 1998.0049209594727,
- "z": "886e5ee7.da286",
+ "x": 2202.9689025878906,
+ "y": 1989.0010147094727,
+ "z": "cbb28df7.1359",
"wires": [
[
- "252b7082.c5a2b"
+ "bb864308.fd063"
]
]
},
{
- "id": "b6a98854.3d7a58",
+ "id": "4cd33402.f5bedc",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 908.7350807189941,
- "y": 2104.9576148986816,
- "z": "886e5ee7.da286",
+ "x": 864.7311744689941,
+ "y": 2095.9537086486816,
+ "z": "cbb28df7.1359",
"wires": [
[
- "35924502.aff77a"
+ "ed40bf1a.07a59"
]
]
},
{
- "id": "35924502.aff77a",
+ "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": 1075.2589015960693,
- "y": 2131.5766220092773,
- "z": "886e5ee7.da286",
+ "x": 1031.2549953460693,
+ "y": 2122.5727157592773,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "89209832.9697d8",
+ "id": "589b918b.e1a7",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 910.8303089141846,
- "y": 2152.719457626343,
- "z": "886e5ee7.da286",
+ "x": 866.8264026641846,
+ "y": 2143.715551376343,
+ "z": "cbb28df7.1359",
"wires": [
[
- "35924502.aff77a"
+ "ed40bf1a.07a59"
]
]
},
{
- "id": "48f4ae61.b756e",
+ "id": "489a8dba.917834",
"type": "comment",
"name": "Save Resource to AAI",
"info": "",
"comments": "",
- "x": 682.7827243804932,
- "y": 2093.3067779541016,
- "z": "886e5ee7.da286",
+ "x": 638.7788181304932,
+ "y": 2084.3028717041016,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "e1d773b9.aec52",
+ "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": 697.5504207611084,
- "y": 2014.8322591781616,
- "z": "886e5ee7.da286",
+ "x": 653.5465145111084,
+ "y": 2005.8283529281616,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "5e07c169.5398c",
+ "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": 657.9635925292969,
- "y": 2200.4480476379395,
- "z": "886e5ee7.da286",
+ "x": 613.9596862792969,
+ "y": 2191.4441413879395,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "eba0b0a5.90799",
+ "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": 750.2825031280518,
- "y": 1939.4731121063232,
- "z": "886e5ee7.da286",
+ "x": 706.2785968780518,
+ "y": 1930.4692058563232,
+ "z": "cbb28df7.1359",
"wires": [
[
- "88c5e9d5.563c18",
- "ade401d9.d9d7d",
- "c5f54133.a8e19"
+ "e695cbc9.963178",
+ "c00494c2.3f5b48",
+ "2e65b760.7a5738"
]
]
},
{
- "id": "88c5e9d5.563c18",
+ "id": "e695cbc9.963178",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1004.9239253997803,
- "y": 1983.8045063018799,
- "z": "886e5ee7.da286",
+ "x": 960.9200191497803,
+ "y": 1974.8006000518799,
+ "z": "cbb28df7.1359",
"wires": [
[
- "effa0e45.a8e79"
+ "c996b950.fcda58"
]
]
},
{
- "id": "ade401d9.d9d7d",
+ "id": "c00494c2.3f5b48",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1006.9239482879639,
- "y": 1942.3044704422355,
- "z": "886e5ee7.da286",
+ "x": 962.9200420379639,
+ "y": 1933.3005641922355,
+ "z": "cbb28df7.1359",
"wires": [
[
- "effa0e45.a8e79"
+ "c996b950.fcda58"
]
]
},
{
- "id": "c5f54133.a8e19",
+ "id": "2e65b760.7a5738",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1010.6740322113037,
- "y": 1893.6616230010986,
- "z": "886e5ee7.da286",
+ "x": 966.6701259613037,
+ "y": 1884.6577167510986,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f45f0673.a366c8"
+ "fe27e5ca.7550c8"
]
]
},
{
- "id": "effa0e45.a8e79",
+ "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": 1165.67405128479,
- "y": 1962.054536819458,
- "z": "886e5ee7.da286",
+ "x": 1121.67014503479,
+ "y": 1953.050630569458,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "f45f0673.a366c8",
+ "id": "fe27e5ca.7550c8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1138.3299770355225,
- "y": 1895.8537912368774,
- "z": "886e5ee7.da286",
+ "x": 1094.3260707855225,
+ "y": 1886.8498849868774,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "6a3ffb44.1e9004",
+ "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": 652.4961185455322,
- "y": 1773.8540132045746,
- "z": "886e5ee7.da286",
+ "x": 608.4922122955322,
+ "y": 1764.8501069545746,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "1605273a.149319",
+ "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": 669.78196144104,
- "y": 1846.4736108779907,
- "z": "886e5ee7.da286",
+ "x": 625.77805519104,
+ "y": 1837.4697046279907,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "93c61c2f.6bcfd",
+ "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": 719.7690410614014,
- "y": 1883.4246912002563,
- "z": "886e5ee7.da286",
+ "x": 675.7651348114014,
+ "y": 1874.4207849502563,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "6bb92832.c7ba68",
+ "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": 666.3376598358154,
- "y": 1813.028663635254,
- "z": "886e5ee7.da286",
+ "x": 622.3337535858154,
+ "y": 1804.024757385254,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "4d71f89f.b7cd18",
+ "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": 779.67112159729,
- "y": 1734.0286157131195,
- "z": "886e5ee7.da286",
+ "x": 735.66721534729,
+ "y": 1725.0247094631195,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "5c1a3e33.04e12",
+ "id": "e5584499.737208",
"type": "comment",
"name": "Add to allotted-resources in mdsal",
"info": "",
"comments": "",
- "x": 721.2509479522705,
- "y": 1701.4419174194336,
- "z": "886e5ee7.da286",
+ "x": 677.2470417022705,
+ "y": 1692.4380111694336,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "8f7266fc.c45038",
+ "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",
+ "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": 709.2270030975342,
- "y": 2130.7589206695557,
- "z": "886e5ee7.da286",
+ "x": 665.2230968475342,
+ "y": 2121.7550144195557,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b6a98854.3d7a58",
- "89209832.9697d8"
+ "4cd33402.f5bedc",
+ "589b918b.e1a7"
]
]
},
{
- "id": "f51b8e7a.4294a",
+ "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=\"`$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": 1517.976963043213,
- "y": 1693.2585725784302,
- "z": "886e5ee7.da286",
+ "x": 1473.973056793213,
+ "y": 1684.2546663284302,
+ "z": "cbb28df7.1359",
"wires": [
[
- "475ee246.c4d58c",
- "951a0e07.b45a7"
+ "5746b590.8e789c",
+ "dfadca6b.0a2088"
]
]
},
{
- "id": "475ee246.c4d58c",
+ "id": "5746b590.8e789c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1757.9771041870117,
- "y": 1717.258542060852,
- "z": "886e5ee7.da286",
+ "x": 1713.9731979370117,
+ "y": 1708.254635810852,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2cebb233.b139be"
+ "6ae16eae.42967"
]
]
},
{
- "id": "dfc21d27.a29bd",
+ "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": 1896.977138519287,
- "y": 1666.2586336135864,
- "z": "886e5ee7.da286",
+ "x": 1852.973232269287,
+ "y": 1657.2547273635864,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "951a0e07.b45a7",
+ "id": "dfadca6b.0a2088",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1756.9768905639648,
- "y": 1666.258632659912,
- "z": "886e5ee7.da286",
+ "x": 1712.9729843139648,
+ "y": 1657.254726409912,
+ "z": "cbb28df7.1359",
"wires": [
[
- "dfc21d27.a29bd"
+ "882eddea.960c4"
]
]
},
{
- "id": "d7025fc8.34b0f",
+ "id": "4ef28c1a.417b14",
"type": "comment",
"name": "Get VPNs from OOF",
"info": "",
"comments": "",
- "x": 1503.980884552002,
- "y": 1660.2625722885132,
- "z": "886e5ee7.da286",
+ "x": 1459.976978302002,
+ "y": 1651.2586660385132,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "7306bfe1.33065",
+ "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": 1470.9766845703125,
- "y": 1798.50830078125,
- "z": "886e5ee7.da286",
+ "x": 1413.972900390625,
+ "y": 1766.50439453125,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3edaf3bd.0b304c"
+ "1e38af3f.f6ce71"
]
]
},
{
- "id": "9a8b6203.49db4",
+ "id": "3e61c92c.93c8a6",
"type": "comment",
"name": "Loop through VPN and configure them",
"info": "",
"comments": "",
- "x": 1500.977138519287,
- "y": 1761.0086650848389,
- "z": "886e5ee7.da286",
+ "x": 1459.9733505249023,
+ "y": 1901.0047721862793,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "a9774cfd.8e266",
+ "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": 2697.760986328125,
- "y": 1247.125732421875,
- "z": "886e5ee7.da286",
+ "x": 2653.757080078125,
+ "y": 1238.121826171875,
+ "z": "cbb28df7.1359",
"wires": [
[
- "a313d119.ec211"
+ "bead713d.d0c48"
]
]
},
{
- "id": "a313d119.ec211",
+ "id": "bead713d.d0c48",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2886.760955810547,
- "y": 1247.125717639923,
- "z": "886e5ee7.da286",
+ "x": 2842.757049560547,
+ "y": 1238.121811389923,
+ "z": "cbb28df7.1359",
"wires": [
[
- "3a640881.1aa1d8"
+ "e5afa8f6.b33978"
]
]
},
{
- "id": "3a640881.1aa1d8",
+ "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": 3127.76127243042,
- "y": 1246.7257723808289,
- "z": "886e5ee7.da286",
+ "x": 3083.75736618042,
+ "y": 1237.7218661308289,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "1742a4f9.42112b",
+ "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": 2710.6008644104004,
- "y": 1282.1258273124695,
- "z": "886e5ee7.da286",
+ "x": 2666.5969581604004,
+ "y": 1273.1219210624695,
+ "z": "cbb28df7.1359",
"wires": [
[
- "26c6398e.ae40a6"
+ "7e0c933d.418d0c"
]
]
},
{
- "id": "26c6398e.ae40a6",
+ "id": "7e0c933d.418d0c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2885.600929260254,
- "y": 1284.1258130073547,
- "z": "886e5ee7.da286",
+ "x": 2841.597023010254,
+ "y": 1275.1219067573547,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ec7ec9cc.624b18"
+ "3819c097.d5b38"
]
]
},
{
- "id": "ec7ec9cc.624b18",
+ "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": 3041.9342460632324,
- "y": 1281.5868878364563,
- "z": "886e5ee7.da286",
+ "x": 2997.9303398132324,
+ "y": 1272.5829815864563,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "e032978.6936268",
+ "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": 2705.983127593994,
- "y": 1315.4592175483704,
- "z": "886e5ee7.da286",
+ "x": 2661.979221343994,
+ "y": 1306.4553112983704,
+ "z": "cbb28df7.1359",
"wires": [
[
- "a0536f01.8cf66"
+ "2df9d1b1.36383e"
]
]
},
{
- "id": "a0536f01.8cf66",
+ "id": "2df9d1b1.36383e",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2883.9831314086914,
- "y": 1319.4590954780579,
- "z": "886e5ee7.da286",
+ "x": 2839.9792251586914,
+ "y": 1310.4551892280579,
+ "z": "cbb28df7.1359",
"wires": [
[
- "a1009c69.a8fed"
+ "357ff876.835a78"
]
]
},
{
- "id": "a1009c69.a8fed",
+ "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": 3021.9833183288574,
- "y": 1316.0590710639954,
- "z": "886e5ee7.da286",
+ "x": 2977.9794120788574,
+ "y": 1307.0551648139954,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "3f331e86.57efa2",
+ "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": 2688.822727203369,
- "y": 1388.4591727256775,
- "z": "886e5ee7.da286",
+ "x": 2644.818820953369,
+ "y": 1379.4552664756775,
+ "z": "cbb28df7.1359",
"wires": [
[
- "937bdc12.dc2f3"
+ "a057011b.3d0e6"
]
]
},
{
- "id": "937bdc12.dc2f3",
+ "id": "a057011b.3d0e6",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2883.8227920532227,
- "y": 1389.4591727256775,
- "z": "886e5ee7.da286",
+ "x": 2839.8188858032227,
+ "y": 1380.4552664756775,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5cef9c18.c1e3e4"
+ "25f349b7.7cabf6"
]
]
},
{
- "id": "5cef9c18.c1e3e4",
+ "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": 3008.15629196167,
- "y": 1387.920247554779,
- "z": "886e5ee7.da286",
+ "x": 2964.15238571167,
+ "y": 1378.916341304779,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "b04f73ae.32d85",
+ "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": 2703.131015777588,
- "y": 1351.236882686615,
- "z": "886e5ee7.da286",
+ "x": 2659.127109527588,
+ "y": 1342.232976436615,
+ "z": "cbb28df7.1359",
"wires": [
[
- "56ebc42c.8ac03c"
+ "f566b2bd.002c1"
]
]
},
{
- "id": "56ebc42c.8ac03c",
+ "id": "f566b2bd.002c1",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2885.131202697754,
- "y": 1354.236867427826,
- "z": "886e5ee7.da286",
+ "x": 2841.127296447754,
+ "y": 1345.232961177826,
+ "z": "cbb28df7.1359",
"wires": [
[
- "74808c5.5744174"
+ "69079e30.4f1f7"
]
]
},
{
- "id": "74808c5.5744174",
+ "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": 3021.464946746826,
- "y": 1350.6981091499329,
- "z": "886e5ee7.da286",
+ "x": 2977.461040496826,
+ "y": 1341.6942028999329,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d4d17449.0a3768",
+ "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": 2684.1130714416504,
- "y": 1422.1570801734924,
- "z": "886e5ee7.da286",
+ "x": 2640.1091651916504,
+ "y": 1413.1531739234924,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f8a0cc6a.69a85"
+ "2ee770d4.d5299"
]
]
},
{
- "id": "f8a0cc6a.69a85",
+ "id": "2ee770d4.d5299",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2884.1133193969727,
- "y": 1425.1570191383362,
- "z": "886e5ee7.da286",
+ "x": 2840.1094131469727,
+ "y": 1416.1531128883362,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f369a42b.d52e88"
+ "b9ec2386.9ae27"
]
]
},
{
- "id": "f369a42b.d52e88",
+ "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": 3007.4469413757324,
- "y": 1424.6180787086487,
- "z": "886e5ee7.da286",
+ "x": 2963.4430351257324,
+ "y": 1415.6141724586487,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "b369fa7c.e07e38",
+ "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": 2709.113681793213,
- "y": 1456.1569590568542,
- "z": "886e5ee7.da286",
+ "x": 2665.109775543213,
+ "y": 1447.1530528068542,
+ "z": "cbb28df7.1359",
"wires": [
[
- "6206f9dc.040438"
+ "e42ebbc6.466e88"
]
]
},
{
- "id": "6206f9dc.040438",
+ "id": "e42ebbc6.466e88",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2880.1135025024414,
- "y": 1462.1568975448608,
- "z": "886e5ee7.da286",
+ "x": 2836.1095962524414,
+ "y": 1453.1529912948608,
+ "z": "cbb28df7.1359",
"wires": [
[
- "be68a268.af6ac"
+ "6fd3f45c.5fea2c"
]
]
},
{
- "id": "be68a268.af6ac",
+ "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": 3028.44681930542,
- "y": 1462.6181101799011,
- "z": "886e5ee7.da286",
+ "x": 2984.44291305542,
+ "y": 1453.6142039299011,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "642263f7.dd00fc",
+ "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": 2711.1136207580566,
- "y": 1492.1570210456848,
- "z": "886e5ee7.da286",
+ "x": 2667.1097145080566,
+ "y": 1483.1531147956848,
+ "z": "cbb28df7.1359",
"wires": [
[
- "fa5db057.82465"
+ "66020844.5e3b48"
]
]
},
{
- "id": "fa5db057.82465",
+ "id": "66020844.5e3b48",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2883.1135025024414,
- "y": 1501.1569905281067,
- "z": "886e5ee7.da286",
+ "x": 2839.1095962524414,
+ "y": 1492.1530842781067,
+ "z": "cbb28df7.1359",
"wires": [
[
- "6df9a5ad.64aebc"
+ "74a5b014.5554d"
]
]
},
{
- "id": "6df9a5ad.64aebc",
+ "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": 3036.44681930542,
- "y": 1501.6181111335754,
- "z": "886e5ee7.da286",
+ "x": 2992.44291305542,
+ "y": 1492.6142048835754,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "dcfbfca6.40021",
+ "id": "4bea378a.ee8c98",
"type": "comment",
"name": "Check if other EP exists in SOTNConnectionResource",
"info": "",
"comments": "",
- "x": 2842.316650390625,
- "y": 1110.7923583984375,
- "z": "886e5ee7.da286",
+ "x": 2798.312744140625,
+ "y": 1101.7884521484375,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "d09beabc.c794f8",
+ "id": "c5b17466.a418c8",
"type": "comment",
"name": "Get other global parameters from network",
"info": "",
"comments": "",
- "x": 2778.31640625,
- "y": 1196.7923583984375,
- "z": "886e5ee7.da286",
+ "x": 2734.3125,
+ "y": 1187.7884521484375,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "6cf22112.6f2ff",
+ "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": 1726.5387592315674,
- "y": 1458.2368874549866,
- "z": "886e5ee7.da286",
+ "x": 1682.5348529815674,
+ "y": 1449.2329812049866,
+ "z": "cbb28df7.1359",
"wires": [
[
- "c84add66.981c8"
+ "1b940064.8ad79"
]
]
},
{
- "id": "c84add66.981c8",
+ "id": "1b940064.8ad79",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1913.5387592315674,
- "y": 1454.2368874549866,
- "z": "886e5ee7.da286",
+ "x": 1869.5348529815674,
+ "y": 1445.2329812049866,
+ "z": "cbb28df7.1359",
"wires": [
[
- "d4a1069.e5c08f8"
+ "427c462c.3a8218"
]
]
},
{
- "id": "d4a1069.e5c08f8",
+ "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": 2081.5387592315674,
- "y": 1454.8368935585022,
- "z": "886e5ee7.da286",
+ "x": 2037.5348529815674,
+ "y": 1445.8329873085022,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "447be204.cdf4fc",
+ "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": 1717.5387744903564,
- "y": 1501.2473359107971,
- "z": "886e5ee7.da286",
+ "x": 1673.5348682403564,
+ "y": 1492.2434296607971,
+ "z": "cbb28df7.1359",
"wires": [
[
- "ced037b4.e37178"
+ "8078ffd1.06781"
]
]
},
{
- "id": "ced037b4.e37178",
+ "id": "8078ffd1.06781",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1904.5387744903564,
- "y": 1497.2473359107971,
- "z": "886e5ee7.da286",
+ "x": 1860.5348682403564,
+ "y": 1488.2434296607971,
+ "z": "cbb28df7.1359",
"wires": [
[
- "f03bab32.57be38"
+ "ee89727e.012f2"
]
]
},
{
- "id": "f03bab32.57be38",
+ "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": 2072.5387744903564,
- "y": 1497.8473420143127,
- "z": "886e5ee7.da286",
+ "x": 2028.5348682403564,
+ "y": 1488.8434357643127,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "3722b20a.c8338e",
+ "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": 1730.538719177246,
- "y": 1543.2473669052124,
- "z": "886e5ee7.da286",
+ "x": 1686.534812927246,
+ "y": 1534.2434606552124,
+ "z": "cbb28df7.1359",
"wires": [
[
- "b6a6f2db.60fe6"
+ "ad434cbd.d2efc"
]
]
},
{
- "id": "b6a6f2db.60fe6",
+ "id": "ad434cbd.d2efc",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1917.538719177246,
- "y": 1539.2473669052124,
- "z": "886e5ee7.da286",
+ "x": 1873.534812927246,
+ "y": 1530.2434606552124,
+ "z": "cbb28df7.1359",
"wires": [
[
- "e9af1870.fc5978"
+ "2b625bb5.d8dfe4"
]
]
},
{
- "id": "e9af1870.fc5978",
+ "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": 2085.538719177246,
- "y": 1539.847373008728,
- "z": "886e5ee7.da286",
+ "x": 2041.534812927246,
+ "y": 1530.843466758728,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "3edaf3bd.0b304c",
+ "id": "1e38af3f.f6ce71",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1676.0940551757812,
- "y": 1796.3482403755188,
- "z": "886e5ee7.da286",
+ "x": 1637.090217590332,
+ "y": 1803.3444538116455,
+ "z": "cbb28df7.1359",
"wires": [
[
- "13419eef.5a7671",
- "ab382a71.e012a8",
- "518651aa.2aca3",
- "24337100.d599a",
- "12ceff59.6da431",
- "d86cc1ce.6085e",
- "30cf4858.64e188",
- "fa2339a4.1d6f28",
- "f8b8212e.de624",
- "4c07dee.6ce442"
+ "25129de9.186342",
+ "bf4d6589.d6b308",
+ "2c248924.320b46",
+ "97ef93ae.8225c",
+ "71bec3b2.6b692c",
+ "803aa791.a5b668",
+ "55ed92f3.9f37ac",
+ "b5e33c1e.9cd83",
+ "ce79c05a.55781",
+ "23370a9.5aed5f6"
]
]
},
{
- "id": "9cf5ad87.06886",
+ "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": 2322.538787841797,
- "y": 1876.6815524101257,
- "z": "886e5ee7.da286",
+ "x": 2278.534881591797,
+ "y": 1867.6776461601257,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "f8b8212e.de624",
+ "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": 1939.0386962890625,
- "y": 1913.6814918518066,
- "z": "886e5ee7.da286",
+ "x": 1895.0347900390625,
+ "y": 1904.6775856018066,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2a73c293.cee82e",
- "cd5e3cf0.7e544",
- "e221ac88.e3abb"
+ "f21a66d9.8077a8",
+ "63593a58.c04864",
+ "7c8fedda.36f2d4"
]
]
},
{
- "id": "2a73c293.cee82e",
+ "id": "f21a66d9.8077a8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2159.038631439209,
- "y": 1877.6814608573914,
- "z": "886e5ee7.da286",
+ "x": 2115.034725189209,
+ "y": 1868.6775546073914,
+ "z": "cbb28df7.1359",
"wires": [
[
- "9cf5ad87.06886"
+ "a8cc5d14.06bf4"
]
]
},
{
- "id": "cd5e3cf0.7e544",
+ "id": "63593a58.c04864",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 2168.529571533203,
- "y": 1918.2554669380188,
- "z": "886e5ee7.da286",
+ "x": 2124.525665283203,
+ "y": 1909.2515606880188,
+ "z": "cbb28df7.1359",
"wires": [
[
- "73ddc8d7.9cef28"
+ "ba7a24b5.83e278"
]
]
},
{
- "id": "e221ac88.e3abb",
+ "id": "7c8fedda.36f2d4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2163.862548828125,
- "y": 1954.5887799263,
- "z": "886e5ee7.da286",
+ "x": 2119.858642578125,
+ "y": 1945.5848736763,
+ "z": "cbb28df7.1359",
"wires": [
[
- "9cd2e5f3.c77dc8"
+ "9d46cc37.6bebe"
]
]
},
{
- "id": "73ddc8d7.9cef28",
+ "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": 2315.1009216308594,
- "y": 1914.5412936210632,
- "z": "886e5ee7.da286",
+ "x": 2271.0970153808594,
+ "y": 1905.5373873710632,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "9cd2e5f3.c77dc8",
+ "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": 2318.6351928710938,
- "y": 1956.0279278755188,
- "z": "886e5ee7.da286",
+ "x": 2274.6312866210938,
+ "y": 1947.0240216255188,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "fa2339a4.1d6f28",
+ "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=\"network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id \n\t\tAND pnf.pnf-name = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n pfx='tmp.aai.pnf' local-only='false' >\n\n\n",
+ "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": 1884.538589477539,
- "y": 1822.6811356544495,
- "z": "886e5ee7.da286",
+ "x": 1840.534683227539,
+ "y": 1813.6772294044495,
+ "z": "cbb28df7.1359",
"wires": [
[
- "346b021b.bac82e",
- "fe6ca97c.41f258",
- "fc66139b.853a"
+ "4c302da.addb0d4",
+ "5d24a360.057f4c",
+ "41a13e1a.fbbb1"
]
]
},
{
- "id": "346b021b.bac82e",
+ "id": "4c302da.addb0d4",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2066.5386352539062,
- "y": 1767.681245803833,
- "z": "886e5ee7.da286",
+ "x": 2022.5347290039062,
+ "y": 1758.677339553833,
+ "z": "cbb28df7.1359",
"wires": [
[
- "edadbcd1.1307c"
+ "5347e72e.2bfef8"
]
]
},
{
- "id": "fe6ca97c.41f258",
+ "id": "5d24a360.057f4c",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 2067.0295372009277,
- "y": 1805.2553424835205,
- "z": "886e5ee7.da286",
+ "x": 2023.0256309509277,
+ "y": 1796.2514362335205,
+ "z": "cbb28df7.1359",
"wires": [
[
- "df86be3c.187cb"
+ "30e7544d.83010c"
]
]
},
{
- "id": "fc66139b.853a",
+ "id": "41a13e1a.fbbb1",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2058.362548828125,
- "y": 1838.5887174606323,
- "z": "886e5ee7.da286",
+ "x": 2014.358642578125,
+ "y": 1829.5848112106323,
+ "z": "cbb28df7.1359",
"wires": [
[
- "589f379c.3c1008"
+ "2ea2fe84.d1da82"
]
]
},
{
- "id": "df86be3c.187cb",
+ "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": 2214.601161956787,
- "y": 1804.5412311553955,
- "z": "886e5ee7.da286",
+ "x": 2170.597255706787,
+ "y": 1795.5373249053955,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "589f379c.3c1008",
+ "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": 2212.1351928710938,
- "y": 1838.027865409851,
- "z": "886e5ee7.da286",
+ "x": 2168.1312866210938,
+ "y": 1829.023959159851,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "edadbcd1.1307c",
+ "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": 2251.5386352539062,
- "y": 1766.6813678741455,
- "z": "886e5ee7.da286",
+ "x": 2207.5347290039062,
+ "y": 1757.6774616241455,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "ca8d7a27.974a78",
+ "id": "d0963e5.17cefc",
"type": "comment",
"name": "get domain controller information",
"info": "",
"comments": "",
- "x": 1935.0425033569336,
- "y": 1789.6850910186768,
- "z": "886e5ee7.da286",
+ "x": 1891.0385971069336,
+ "y": 1780.6811847686768,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "30cf4858.64e188",
+ "id": "23370a9.5aed5f6",
"type": "set",
"name": "set oof.vpn",
"xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />",
"comments": "",
- "x": 1896.538589477539,
- "y": 1743.7922191619873,
- "z": "886e5ee7.da286",
+ "x": 1852.534683227539,
+ "y": 1734.7883129119873,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "ab382a71.e012a8",
+ "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": 1915.004005432129,
- "y": 2160.7546215057373,
- "z": "886e5ee7.da286",
+ "x": 1871.000099182129,
+ "y": 2151.7507152557373,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "518651aa.2aca3",
+ "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": 1891.504005432129,
- "y": 2113.2543182373047,
- "z": "886e5ee7.da286",
+ "x": 1847.500099182129,
+ "y": 2104.2504119873047,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "24337100.d599a",
+ "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": 1950.004005432129,
- "y": 2205.7543773651123,
- "z": "886e5ee7.da286",
+ "x": 1906.000099182129,
+ "y": 2196.7504711151123,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "abe0f3b4.f562f",
+ "id": "cc0d73cc.20adc",
"type": "comment",
"name": "save vpn and its relation to AAI",
"info": "",
"comments": "",
- "x": 1933.0042037963867,
- "y": 2074.754587173462,
- "z": "886e5ee7.da286",
+ "x": 1889.0002975463867,
+ "y": 2065.750680923462,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "13419eef.5a7671",
+ "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": 1902.004035949707,
- "y": 2245.754497528076,
- "z": "886e5ee7.da286",
+ "x": 1858.000129699707,
+ "y": 2236.750591278076,
+ "z": "cbb28df7.1359",
"wires": []
},
{
- "id": "12ceff59.6da431",
+ "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/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/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",
+ "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": 1936.0039825439453,
- "y": 2285.5043773651123,
- "z": "886e5ee7.da286",
+ "x": 1892.0003814697266,
+ "y": 2276.5008001327515,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "d86cc1ce.6085e",
+ "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/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/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`\" />",
+ "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": 1934.0039863586426,
- "y": 2331.2543773651123,
- "z": "886e5ee7.da286",
+ "x": 1890.0002136230469,
+ "y": 2322.250638961792,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "44848e46.5ebac",
+ "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": 876.0078430175781,
- "y": 596.0078182220459,
- "z": "886e5ee7.da286",
+ "x": 832.0039367675781,
+ "y": 587.0039119720459,
+ "z": "cbb28df7.1359",
"wires": [
[
- "5268ad10.1fbc94",
- "ffb50ed4.11c7e"
+ "a1fbf2bd.6b2d9",
+ "97f58790.fbe988"
]
]
},
{
- "id": "b29f5799.241a78",
+ "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": 803.0079956054688,
- "y": 823.007981300354,
- "z": "886e5ee7.da286",
+ "x": 759.0040893554688,
+ "y": 814.004075050354,
+ "z": "cbb28df7.1359",
"wires": [
[
- "7ecc4648.197a88",
- "dfe397a0.b9ba28"
+ "76dc332e.fe177c",
+ "cbf3f4e6.00aa98"
]
]
},
{
- "id": "3637e175.005c6e",
+ "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": 703.0079040527344,
- "y": 786.0078144073486,
- "z": "886e5ee7.da286",
+ "x": 659.0039978027344,
+ "y": 777.0039081573486,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "2865c930.441376",
+ "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": 2117.0042572021484,
- "y": 942.3373756408691,
- "z": "886e5ee7.da286",
+ "x": 2073.0003509521484,
+ "y": 933.3334693908691,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "36209682.cdfdca",
+ "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": 2254.004898071289,
- "y": 984.8372402191162,
- "z": "886e5ee7.da286",
+ "x": 2210.000991821289,
+ "y": 975.8333339691162,
+ "z": "cbb28df7.1359",
"wires": [
[
- "2877490b.8d1876",
- "bf4a739d.0a26c"
+ "7d7dc112.d678b",
+ "79425b66.b91424"
]
]
},
{
- "id": "2cebb233.b139be",
+ "id": "6ae16eae.42967",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1879.0041770935059,
- "y": 1708.0040254592896,
- "z": "886e5ee7.da286",
+ "x": 1835.0002708435059,
+ "y": 1699.0001192092896,
+ "z": "cbb28df7.1359",
"wires": [
[]
]
},
{
- "id": "431946d9.2130a8",
+ "id": "d86d0f7e.bebac",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1255.9727897644043,
- "y": 1733.0042095184326,
- "z": "886e5ee7.da286",
+ "x": 1211.9688835144043,
+ "y": 1724.0003032684326,
+ "z": "cbb28df7.1359",
"wires": [
[
- "7306bfe1.33065",
- "f51b8e7a.4294a"
+ "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-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
index b785bc4a..0992fa6d 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
@@ -1,20 +1,20 @@
[
{
- "id": "c96eae79.08813",
+ "id": "e71077a5.449178",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 100,
- "y": 40,
- "z": "307cdf1d.539fd",
+ "x": 94.00001907348633,
+ "y": 67.0000991821289,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "2bbd4a2b.66a236"
+ "e230874f.1ced38"
]
]
},
{
- "id": "2bbd4a2b.66a236",
+ "id": "e230874f.1ced38",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1299 +22,1311 @@
"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": 275.00000381469727,
- "y": 112.0000171661377,
- "z": "307cdf1d.539fd",
+ "x": 269.0000228881836,
+ "y": 139.0001163482666,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "7de06dac.f33994"
+ "fda28de9.a9688"
]
]
},
{
- "id": "7de06dac.f33994",
+ "id": "fda28de9.a9688",
"type": "method",
"name": "sotn-attachment-topology-operation-create",
"xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 263.0001220703125,
- "y": 200,
- "z": "307cdf1d.539fd",
+ "x": 257.0001411437988,
+ "y": 227.0000991821289,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "8a29d369.0bab4"
+ "8e26551b.7dfe18"
]
]
},
{
- "id": "8a29d369.0bab4",
+ "id": "8e26551b.7dfe18",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 183.00005340576172,
- "y": 949.0002479553223,
- "z": "307cdf1d.539fd",
+ "x": 177.00007247924805,
+ "y": 976.0003471374512,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "51f31211.8f114c",
- "a2a65745.852438",
- "f3044df1.6f232",
- "5ba82df.f35b0d4",
- "2da52da7.95c362",
- "dc7e1c21.4599e",
- "7bdd95f3.db24ac",
- "371cf69b.dabcaa",
- "c34405e1.82d938",
- "46e15a07.ae9ba4",
- "cd08d99a.10abb8",
- "c56a158b.169088",
- "3292b995.f13186",
- "71214832.584f28",
- "23b7a6d1.9a369a",
- "4ebfff40.f0aa5",
- "cb431e44.1b2d7",
- "6c73a0d6.045f8",
- "1f74500.b2f7fb",
- "6d4b764b.a8a308",
- "6e7b925f.51d77c",
- "92f874df.f4a158",
- "ea8d2a7c.dc1c98",
- "5a956e5b.11a09"
+ "c93c04d7.3e5348",
+ "9950e65d.3636a8",
+ "1ae547a2.eaba88",
+ "65f23dcc.6522b4",
+ "3e30e763.22be28",
+ "aa28416d.6d08a",
+ "15ca2e29.9a7dd2",
+ "9b1a0521.5c3978",
+ "f24b78b1.fdc468",
+ "a64f1b8.759c3e8",
+ "ab5d9313.ad157",
+ "6c39c83c.d7b048",
+ "8b5e7723.d59fc8",
+ "6b976d2c.2711d4",
+ "c9e7bba5.2bcb28",
+ "5aa40ff8.faf21",
+ "46cb4068.e43d3",
+ "8bddffb6.5284",
+ "abedf313.5d507",
+ "fac542dd.1d112",
+ "b07d75d2.a2b088",
+ "26fdc495.60ac0c",
+ "a63f9a77.c174a8",
+ "e02c5c21.82a2",
+ "bde5bdf6.37338"
]
]
},
{
- "id": "dceaac22.2856",
+ "id": "c90f1d50.24dc",
"type": "comment",
"name": "Set allotted resource id if not sent by SO",
"info": "",
"comments": "",
- "x": 667.0767517089844,
- "y": 109.4339189529419,
- "z": "307cdf1d.539fd",
+ "x": 661.0767707824707,
+ "y": 136.4340181350708,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "51f31211.8f114c",
+ "id": "c93c04d7.3e5348",
"type": "switchNode",
"name": "switch allotted-resource-id",
"xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 613.0000305175781,
- "y": 164.99999237060547,
- "z": "307cdf1d.539fd",
+ "x": 607.0000495910645,
+ "y": 192.00009155273438,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "5d06a5f3.384e7c",
- "a9453642.a0afc8"
+ "213269bc.4275f6",
+ "6419db5e.a2c0c4"
]
]
},
{
- "id": "5d06a5f3.384e7c",
+ "id": "213269bc.4275f6",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 811.0001182556152,
- "y": 134.99998092651367,
- "z": "307cdf1d.539fd",
+ "x": 805.0001373291016,
+ "y": 162.00008010864258,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "b367b4cb.81eda8"
+ "eccd2036.554d7"
]
]
},
{
- "id": "a9453642.a0afc8",
+ "id": "6419db5e.a2c0c4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 810.0000267028809,
- "y": 171.99999141693115,
- "z": "307cdf1d.539fd",
+ "x": 804.0000457763672,
+ "y": 199.00009059906006,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "b2cd00b8.57706"
+ "4ab8dc05.8f0984"
]
]
},
{
- "id": "b2cd00b8.57706",
+ "id": "4ab8dc05.8f0984",
"type": "set",
"name": "set tmp.ar.allotted-resource-id",
"xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n",
"comments": "",
- "x": 1008.0000152587891,
- "y": 169.00001049041748,
- "z": "307cdf1d.539fd",
+ "x": 1002.0000343322754,
+ "y": 196.0001096725464,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "a2a65745.852438",
+ "id": "9950e65d.3636a8",
"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": 580.9999542236328,
- "y": 386.0000991821289,
- "z": "307cdf1d.539fd",
+ "x": 574.9999732971191,
+ "y": 413.0001983642578,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "f3044df1.6f232",
+ "id": "1ae547a2.eaba88",
"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": 581.2618713378906,
- "y": 467.66678047180176,
- "z": "307cdf1d.539fd",
+ "x": 575.261890411377,
+ "y": 494.66687965393066,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "5ba82df.f35b0d4",
+ "id": "65f23dcc.6522b4",
"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": 634.2619323730469,
- "y": 554.6666984558105,
- "z": "307cdf1d.539fd",
+ "x": 628.2619514465332,
+ "y": 581.6667976379395,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "b367b4cb.81eda8",
+ "id": "eccd2036.554d7",
"type": "execute",
"name": "execute tmp.ar.allotted-resource-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1026.0000953674316,
- "y": 135.99998664855957,
- "z": "307cdf1d.539fd",
+ "x": 1020.000114440918,
+ "y": 163.00008583068848,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "a3bb33e3.15368"
+ "90c2cdec.e7c9c"
]
]
},
{
- "id": "a3bb33e3.15368",
+ "id": "90c2cdec.e7c9c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1244.0001373291016,
- "y": 135.99995040893555,
- "z": "307cdf1d.539fd",
+ "x": 1238.000156402588,
+ "y": 163.00004959106445,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "1a685e2d.8d4cc2"
+ "a192b9fd.7610f8"
]
]
},
{
- "id": "1a685e2d.8d4cc2",
+ "id": "a192b9fd.7610f8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
"comments": "",
- "x": 1410.0000915527344,
- "y": 135.9999647140503,
- "z": "307cdf1d.539fd",
+ "x": 1404.0001106262207,
+ "y": 163.0000638961792,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "8b5477db.c5c9d8",
+ "id": "66a512c5.0faacc",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1140.0002307891846,
- "y": 626.777871131897,
- "z": "307cdf1d.539fd",
+ "x": 1134.000249862671,
+ "y": 653.7779703140259,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "5b1e701f.600c"
+ "19566392.15832c"
]
]
},
{
- "id": "cc9f7f26.8914e",
+ "id": "2a3354d7.ee765c",
"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: Existing connection attachment allotted resource\" />\n \n",
"comments": "",
- "x": 1873.5186100006104,
- "y": 627.8439426422119,
- "z": "307cdf1d.539fd",
+ "x": 1867.5186290740967,
+ "y": 654.8440418243408,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "65a2f2cb.5edd4c",
+ "id": "70da4f2f.1d3ca",
"type": "comment",
"name": "Check for non existence of allotted resource",
"info": "",
"comments": "",
- "x": 996.0001525878906,
- "y": 560.7779378890991,
- "z": "307cdf1d.539fd",
+ "x": 990.000171661377,
+ "y": 587.778037071228,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "2eaa291f.8f6b46",
+ "id": "66ac283c.bd2348",
"type": "for",
"name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
"xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1516.6666984558105,
- "y": 771.0000503063202,
- "z": "307cdf1d.539fd",
+ "x": 1510.6667175292969,
+ "y": 798.0001494884491,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "1bef4b2b.0d1235"
+ "c03dacc1.547db"
]
]
},
{
- "id": "dc7e1c21.4599e",
+ "id": "aa28416d.6d08a",
"type": "switchNode",
"name": "switch service-data.consumed-allotted-resources_length",
"xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 698.6660232543945,
- "y": 747.7140827178955,
- "z": "307cdf1d.539fd",
+ "x": 692.6660423278809,
+ "y": 774.7141819000244,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "f0ad968c.edb0a8",
- "6ec4508a.edb8"
+ "ae723a2a.13be98",
+ "1678938e.1bfafc"
]
]
},
{
- "id": "f0ad968c.edb0a8",
+ "id": "ae723a2a.13be98",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1002.8089218139648,
- "y": 716.5715198516846,
- "z": "307cdf1d.539fd",
+ "x": 996.8089408874512,
+ "y": 743.5716190338135,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "1bdd00e8.bfe58f"
+ "9ff14f9b.0b3b"
]
]
},
{
- "id": "6ec4508a.edb8",
+ "id": "1678938e.1bfafc",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 979.8089714050293,
- "y": 777.5714750289917,
- "z": "307cdf1d.539fd",
+ "x": 973.8089904785156,
+ "y": 804.5715742111206,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "db245e97.27431"
+ "79d1a933.7fd6a8"
]
]
},
{
- "id": "db245e97.27431",
+ "id": "79d1a933.7fd6a8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1139.9360618591309,
- "y": 775.6974515914917,
- "z": "307cdf1d.539fd",
+ "x": 1133.9360809326172,
+ "y": 802.6975507736206,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "2eaa291f.8f6b46",
- "493dd1d2.fc196",
- "23139ea3.633f22"
+ "66ac283c.bd2348",
+ "3b659fae.e519",
+ "a32862a8.8af3d"
]
]
},
{
- "id": "1bdd00e8.bfe58f",
+ "id": "9ff14f9b.0b3b",
"type": "set",
"name": "set cidx",
"xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n",
"comments": "",
- "x": 1152.6659049987793,
- "y": 714.2855701446533,
- "z": "307cdf1d.539fd",
+ "x": 1146.6659240722656,
+ "y": 741.2856693267822,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "7bdd95f3.db24ac",
+ "id": "15ca2e29.9a7dd2",
"type": "set",
"name": "set consumed allotted resources",
"xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n",
"comments": "",
- "x": 627.5233154296875,
- "y": 851.285647392273,
- "z": "307cdf1d.539fd",
+ "x": 621.5233345031738,
+ "y": 878.2857465744019,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "493dd1d2.fc196",
+ "id": "3b659fae.e519",
"type": "switchNode",
"name": "switch tmp.found-cidx",
"xml": "<switch test='`$tmp.found-cidx`'>\n",
"comments": "",
"outputs": 1,
- "x": 1329.0511093139648,
- "y": 807.7089743614197,
- "z": "307cdf1d.539fd",
+ "x": 1323.0511283874512,
+ "y": 834.7090735435486,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "2ccff848.6a8838"
+ "966db31a.47786"
]
]
},
{
- "id": "2ccff848.6a8838",
+ "id": "966db31a.47786",
"type": "outcomeTrue",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1519.0510635375977,
- "y": 807.7089114189148,
- "z": "307cdf1d.539fd",
+ "x": 1513.051082611084,
+ "y": 834.7090106010437,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "d5d85369.7e688"
+ "b95410b0.660fd"
]
]
},
{
- "id": "d5d85369.7e688",
+ "id": "b95410b0.660fd",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1685.0510635375977,
- "y": 807.7089114189148,
- "z": "307cdf1d.539fd",
+ "x": 1679.051082611084,
+ "y": 834.7090106010437,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "fa8e9142.85d7d"
+ "2ab57899.a130b8"
]
]
},
{
- "id": "1bef4b2b.0d1235",
+ "id": "c03dacc1.547db",
"type": "switchNode",
"name": "switch allotted-resource-id",
"xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1933.7783279418945,
- "y": 768.0000772476196,
- "z": "307cdf1d.539fd",
+ "x": 1927.7783470153809,
+ "y": 795.0001764297485,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "39a011f4.26c90e"
+ "ba9ad589.8abb58"
]
]
},
{
- "id": "39a011f4.26c90e",
+ "id": "ba9ad589.8abb58",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2115.587902069092,
- "y": 768.464524269104,
- "z": "307cdf1d.539fd",
+ "x": 2109.587921142578,
+ "y": 795.4646234512329,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "3bd67468.05082c"
+ "ef75ff36.6e6a8"
]
]
},
{
- "id": "fa8e9142.85d7d",
+ "id": "2ab57899.a130b8",
"type": "set",
"name": "set tmp.cidx",
"xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n",
"comments": "",
- "x": 1846.924446105957,
- "y": 807.2206125259399,
- "z": "307cdf1d.539fd",
+ "x": 1840.9244651794434,
+ "y": 834.2207117080688,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "45f09705.29f058",
+ "id": "e6f158d3.3c83a8",
"type": "comment",
"name": "Add to consumed service consumed-allotted-resources in mdsal",
"info": "Prepare data and add to service-data",
"comments": "",
- "x": 719.667236328125,
- "y": 678.0000467300415,
- "z": "307cdf1d.539fd",
+ "x": 713.6672554016113,
+ "y": 705.0001459121704,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "7472ca93.259114",
+ "id": "464592d5.7d3adc",
"type": "comment",
"name": "This set resource will be added to MDSAL by provider code",
"info": "Below we add to service-data.consumed-allotted-resource at last index",
"comments": "",
- "x": 707.0001525878906,
- "y": 816.7781391143799,
- "z": "307cdf1d.539fd",
+ "x": 701.000171661377,
+ "y": 843.7782382965088,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "ea8d2a7c.dc1c98",
+ "id": "a63f9a77.c174a8",
"type": "update",
"name": "save AAI allotted-resource",
"xml": "<save 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 <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\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=\"Created\" />\n",
"comments": "",
"outputs": 1,
- "x": 612.6908721923828,
- "y": 1866.5318479537964,
- "z": "307cdf1d.539fd",
+ "x": 577.6909523010254,
+ "y": 1914.5320167541504,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "951bf335.bca52",
- "3aff12ef.b5135e"
+ "8865c331.63809",
+ "3795c6dc.0749ba"
]
]
},
{
- "id": "951bf335.bca52",
+ "id": "8865c331.63809",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 807.4527854919434,
- "y": 1857.4844913482666,
- "z": "307cdf1d.539fd",
+ "x": 801.4528045654297,
+ "y": 1884.4845905303955,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "5683eb13.db5c34"
+ "4e95350f.9bd78c"
]
]
},
{
- "id": "5683eb13.db5c34",
+ "id": "4e95350f.9bd78c",
"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": 973.9766654968262,
- "y": 1869.1035623550415,
- "z": "307cdf1d.539fd",
+ "x": 967.9766845703125,
+ "y": 1896.1036615371704,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "3aff12ef.b5135e",
+ "id": "3795c6dc.0749ba",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 814.5480728149414,
- "y": 1890.2464590072632,
- "z": "307cdf1d.539fd",
+ "x": 808.5480918884277,
+ "y": 1917.246558189392,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "5683eb13.db5c34"
+ "4e95350f.9bd78c"
]
]
},
{
- "id": "9b778367.8c46a",
+ "id": "e8bcac4.3e63b5",
"type": "comment",
"name": "Save Resource to AAI",
"info": "",
"comments": "",
- "x": 589.50048828125,
- "y": 1809.8338623046875,
- "z": "307cdf1d.539fd",
+ "x": 583.5005073547363,
+ "y": 1836.8339614868164,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "9719bb6e.70a358",
+ "id": "9ada057d.8d0ed8",
"type": "comment",
"name": "Set allotted resource type if not sent by SO",
"info": "",
"comments": "",
- "x": 653,
- "y": 218,
- "z": "307cdf1d.539fd",
+ "x": 647.0000190734863,
+ "y": 245.0000991821289,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "2da52da7.95c362",
+ "id": "3e30e763.22be28",
"type": "switchNode",
"name": "switch allotted-resource-type",
"xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n",
"comments": "",
"outputs": 1,
- "x": 614.9233093261719,
- "y": 258.5660562515259,
- "z": "307cdf1d.539fd",
+ "x": 608.9233283996582,
+ "y": 285.5661554336548,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "684d8da4.b880e4",
- "7ce6426e.522ebc"
+ "1b1ef42.aa2a50c",
+ "5b1a6ad6.d32444"
]
]
},
{
- "id": "684d8da4.b880e4",
+ "id": "1b1ef42.aa2a50c",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 817.9234619140625,
- "y": 243.56605911254883,
- "z": "307cdf1d.539fd",
+ "x": 811.9234809875488,
+ "y": 270.56615829467773,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "63c4923.3c3426c"
+ "23a0059d.3f004a"
]
]
},
{
- "id": "7ce6426e.522ebc",
+ "id": "5b1a6ad6.d32444",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 810.9232902526855,
- "y": 283.5660791397095,
- "z": "307cdf1d.539fd",
+ "x": 804.9233093261719,
+ "y": 310.5661783218384,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "bca9b7c7.73b158"
+ "e101a8fa.94ec78"
]
]
},
{
- "id": "bca9b7c7.73b158",
+ "id": "e101a8fa.94ec78",
"type": "set",
"name": "set tmp.ar.allotted-resource-type",
"xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n",
"comments": "",
- "x": 1042.9232749938965,
- "y": 283.56608390808105,
- "z": "307cdf1d.539fd",
+ "x": 1036.9232940673828,
+ "y": 310.56618309020996,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "4c5ae3e7.94b54c",
+ "id": "535c3465.db6a5c",
"type": "comment",
"name": "For storage in AAI connection-attachment-topology",
"info": "",
"comments": "",
- "x": 677.9999618530273,
- "y": 353,
- "z": "307cdf1d.539fd",
+ "x": 671.9999809265137,
+ "y": 380.0000991821289,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "566d8977.bdc218",
+ "id": "7158b402.34b20c",
"type": "comment",
"name": "Obtain different URL, template location etc",
"info": "For saving resource information to MDSAL & for AAI",
"comments": "",
- "x": 652.9999465942383,
- "y": 434.8889093399048,
- "z": "307cdf1d.539fd",
+ "x": 646.9999656677246,
+ "y": 461.8890085220337,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "eba557cf.66dec8",
+ "id": "8b7046e5.63a738",
"type": "comment",
"name": "Used for Put AR by id to MDSAL",
"info": "",
"comments": "",
- "x": 619.0000305175781,
- "y": 523.8889265060425,
- "z": "307cdf1d.539fd",
+ "x": 613.0000495910645,
+ "y": 550.8890256881714,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "6d67020a.67de0c",
+ "id": "41e867cd.171798",
"type": "comment",
"name": "Obtain the last index in services",
"info": "ServiceData is added by Provider code",
"comments": "",
- "x": 620.4444732666016,
- "y": 709.8888711929321,
- "z": "307cdf1d.539fd",
+ "x": 614.4444923400879,
+ "y": 736.888970375061,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "1f74500.b2f7fb",
+ "id": "abedf313.5d507",
"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": 598.2681350708008,
- "y": 1773.3591890335083,
- "z": "307cdf1d.539fd",
+ "x": 592.2681541442871,
+ "y": 1800.3592882156372,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "6d4b764b.a8a308",
+ "id": "fac542dd.1d112",
"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": 566.6812324523926,
- "y": 1977.9749908447266,
- "z": "307cdf1d.539fd",
+ "x": 536.6813507080078,
+ "y": 2033.975341796875,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "63c4923.3c3426c",
+ "id": "23a0059d.3f004a",
"type": "set",
"name": "set tmp.ar.allotted-resource-type",
"xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n",
"comments": "",
- "x": 1057.0001487731934,
- "y": 243.99998569488525,
- "z": "307cdf1d.539fd",
+ "x": 1051.0001678466797,
+ "y": 271.00008487701416,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "e855335b.71b3c",
+ "id": "77c2c758.5059b8",
"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": 899.9941558837891,
- "y": 1622.4937295913696,
- "z": "307cdf1d.539fd",
+ "x": 893.9941749572754,
+ "y": 1649.4938287734985,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "6c73a0d6.045f8",
+ "id": "8bddffb6.5284",
"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": 649.0002670288086,
- "y": 1707.0001182556152,
- "z": "307cdf1d.539fd",
+ "x": 643.0002861022949,
+ "y": 1734.0002174377441,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "17f1151d.06a5ab",
- "ccace23a.27702",
- "325329b.e9052d6"
+ "d13a7894.7c9648",
+ "a17ed53e.8a7c48",
+ "2a45ba4f.903ad6"
]
]
},
{
- "id": "17f1151d.06a5ab",
+ "id": "d13a7894.7c9648",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 898.6416206359863,
- "y": 1745.3314485549927,
- "z": "307cdf1d.539fd",
+ "x": 892.6416397094727,
+ "y": 1772.3315477371216,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "503ba1c3.ce81b"
+ "2a58bb37.857ca4"
]
]
},
{
- "id": "ccace23a.27702",
+ "id": "a17ed53e.8a7c48",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 889.6416702270508,
- "y": 1713.8314743041992,
- "z": "307cdf1d.539fd",
+ "x": 883.6416893005371,
+ "y": 1740.8315734863281,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "503ba1c3.ce81b"
+ "2a58bb37.857ca4"
]
]
},
{
- "id": "325329b.e9052d6",
+ "id": "2a45ba4f.903ad6",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 893.3917083740234,
- "y": 1684.1885791793466,
- "z": "307cdf1d.539fd",
+ "x": 887.3917274475098,
+ "y": 1711.1886783614755,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "565609af.5fb058"
+ "4b685690.de2cf8"
]
]
},
{
- "id": "503ba1c3.ce81b",
+ "id": "2a58bb37.857ca4",
"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": 1059.3917083740234,
- "y": 1714.5814981460571,
- "z": "307cdf1d.539fd",
+ "x": 1053.3917274475098,
+ "y": 1741.581597328186,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "565609af.5fb058",
+ "id": "4b685690.de2cf8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1035.0476760864258,
- "y": 1680.3807483687997,
- "z": "307cdf1d.539fd",
+ "x": 1029.047695159912,
+ "y": 1707.3808475509286,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "cd08d99a.10abb8",
+ "id": "ab5d9313.ad157",
"type": "execute",
"name": "execute RestApiCallNode - Update parent provided service AR",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-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=\"parent\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 718.9999542236328,
- "y": 1133.0001649856567,
- "z": "307cdf1d.539fd",
+ "x": 712.9999732971191,
+ "y": 1160.0002641677856,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "ef2f7f10.9941b",
- "b03054a4.69fc18",
- "8aa9a171.e089b"
+ "9094ff9e.53d26",
+ "43bc3599.27bffc",
+ "fc9fd873.a374e8"
]
]
},
{
- "id": "ef2f7f10.9941b",
+ "id": "9094ff9e.53d26",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1027.3080139160156,
- "y": 1164.9984407424927,
- "z": "307cdf1d.539fd",
+ "x": 1021.308032989502,
+ "y": 1191.9985399246216,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "65c0c4d1.41acbc"
+ "421ec30a.485b8c"
]
]
},
{
- "id": "b03054a4.69fc18",
+ "id": "43bc3599.27bffc",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1018.3080635070801,
- "y": 1133.4984664916992,
- "z": "307cdf1d.539fd",
+ "x": 1012.3080825805664,
+ "y": 1160.4985656738281,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "65c0c4d1.41acbc"
+ "421ec30a.485b8c"
]
]
},
{
- "id": "8aa9a171.e089b",
+ "id": "fc9fd873.a374e8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1022.0581016540527,
- "y": 1103.8555713668466,
- "z": "307cdf1d.539fd",
+ "x": 1016.0581207275391,
+ "y": 1130.8556705489755,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "c70fcaaf.55a4c8"
+ "c6163b00.f85308"
]
]
},
{
- "id": "65c0c4d1.41acbc",
+ "id": "421ec30a.485b8c",
"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": 1188.0581016540527,
- "y": 1134.2484903335571,
- "z": "307cdf1d.539fd",
+ "x": 1182.058120727539,
+ "y": 1161.248589515686,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "c70fcaaf.55a4c8",
+ "id": "c6163b00.f85308",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1163.714069366455,
- "y": 1100.0477405562997,
- "z": "307cdf1d.539fd",
+ "x": 1157.7140884399414,
+ "y": 1127.0478397384286,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "4609b233.9d833c",
+ "id": "f91628dc.a22298",
"type": "comment",
"name": "Put the parent allotted resource in mdsal",
"info": "",
"comments": "",
- "x": 647.9999008178711,
- "y": 1095.0000715255737,
- "z": "307cdf1d.539fd",
+ "x": 641.9999198913574,
+ "y": 1122.0001707077026,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "3292b995.f13186",
+ "id": "8b5e7723.d59fc8",
"type": "set",
"name": "set connection-attachment-ar-identifiers",
"xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
"comments": "",
- "x": 644.3570861816406,
- "y": 1297.5716905593872,
- "z": "307cdf1d.539fd",
+ "x": 638.357105255127,
+ "y": 1324.571789741516,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "c56a158b.169088",
+ "id": "6c39c83c.d7b048",
"type": "set",
"name": "set ar-data",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\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.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />",
"comments": "",
- "x": 558.2138671875,
- "y": 1265.3810472488403,
- "z": "307cdf1d.539fd",
+ "x": 552.2138862609863,
+ "y": 1292.3811464309692,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "71214832.584f28",
+ "id": "6b976d2c.2711d4",
"type": "set",
"name": "set identifiers in overall structure",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n",
"comments": "",
- "x": 623.1668853759766,
- "y": 1331.6668758392334,
- "z": "307cdf1d.539fd",
+ "x": 617.1669044494629,
+ "y": 1358.6669750213623,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "23b7a6d1.9a369a",
+ "id": "c9e7bba5.2bcb28",
"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": 575.4997253417969,
- "y": 1405.0004034042358,
- "z": "307cdf1d.539fd",
+ "x": 569.4997444152832,
+ "y": 1432.0005025863647,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "4ebfff40.f0aa5",
+ "id": "5aa40ff8.faf21",
"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='Created' />\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": 626.4867630004883,
- "y": 1460.951636314392,
- "z": "307cdf1d.539fd",
+ "x": 620.4867820739746,
+ "y": 1487.951735496521,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "cb431e44.1b2d7",
+ "id": "46cb4068.e43d3",
"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": 571.0553817749023,
- "y": 1366.5557613372803,
- "z": "307cdf1d.539fd",
+ "x": 565.0554008483887,
+ "y": 1393.5558605194092,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "10171c26.195644",
+ "id": "b1148074.b83dc",
"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": 688.3888702392578,
- "y": 1231.5556077957153,
- "z": "307cdf1d.539fd",
+ "x": 682.3888893127441,
+ "y": 1258.5557069778442,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "46e15a07.ae9ba4",
+ "id": "a64f1b8.759c3e8",
"type": "execute",
"name": "generate parent-ar url - replace allotted-resource-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-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": 683.5000152587891,
- "y": 1059.0000104904175,
- "z": "307cdf1d.539fd",
+ "x": 677.5000343322754,
+ "y": 1086.0001096725464,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "c34405e1.82d938",
+ "id": "f24b78b1.fdc468",
"type": "execute",
"name": "generate parent-ar url - replace service-instance-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 679.4999389648438,
- "y": 1016.0001468658447,
- "z": "307cdf1d.539fd",
+ "x": 673.4999580383301,
+ "y": 1043.0002460479736,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "a521acad.d004d",
+ "id": "5c890ede.9091d",
"type": "comment",
"name": "Prepare Parent AR URL",
"info": "Preparation to set provided-allotted-resource in parent service instance",
"comments": "",
- "x": 597.5003967285156,
- "y": 945.0001001358032,
- "z": "307cdf1d.539fd",
+ "x": 591.500415802002,
+ "y": 972.0001993179321,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "371cf69b.dabcaa",
+ "id": "9b1a0521.5c3978",
"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": 636.5001907348633,
- "y": 978.5000395774841,
- "z": "307cdf1d.539fd",
+ "x": 630.5002098083496,
+ "y": 1005.500138759613,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "471a396d.b72ac8",
+ "id": "1dce57cb.3a2f28",
"type": "comment",
"name": "Required for filling template values",
"info": "This is done because connection-attachment is generic resource and doesn't have specific parameters",
"comments": "",
- "x": 826.000358581543,
- "y": 1585.4998025894165,
- "z": "307cdf1d.539fd",
+ "x": 820.0003776550293,
+ "y": 1612.4999017715454,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "3bd67468.05082c",
+ "id": "ef75ff36.6e6a8",
"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 as cosumed allotted resource already exists.\" />\n",
"comments": "",
- "x": 2193.7569732666016,
- "y": 816.6458292007446,
- "z": "307cdf1d.539fd",
+ "x": 2187.756992340088,
+ "y": 843.6459283828735,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "23139ea3.633f22",
+ "id": "a32862a8.8af3d",
"type": "set",
"name": "set tmp.found-cidx",
"xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
"comments": "",
- "x": 1319.6461448669434,
- "y": 728.3125722408295,
- "z": "307cdf1d.539fd",
+ "x": 1313.6461639404297,
+ "y": 755.3126714229584,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "572750a4.da966",
+ "id": "46efcfd6.a7a1a",
"type": "comment",
"name": "Add to parent services provided-allotted-resources in mdsal",
"info": "",
"comments": "",
- "x": 708.2015075683594,
- "y": 912.9792566299438,
- "z": "307cdf1d.539fd",
+ "x": 702.2015266418457,
+ "y": 939.9793558120728,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "c22af7ab.9a1898",
+ "id": "b6eb1599.cd85e8",
"type": "comment",
"name": "Add to allotted-resources in mdsal",
"info": "",
"comments": "",
- "x": 628.9686965942383,
- "y": 1198.968936920166,
- "z": "307cdf1d.539fd",
+ "x": 622.9687156677246,
+ "y": 1225.969036102295,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "5b1e701f.600c",
+ "id": "19566392.15832c",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1302.000051498413,
- "y": 626.2777605056763,
- "z": "307cdf1d.539fd",
+ "x": 1296.0000705718994,
+ "y": 653.2778596878052,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "f33fd165.6af9d"
+ "be105cba.576f"
]
]
},
{
- "id": "f33fd165.6af9d",
+ "id": "be105cba.576f",
"type": "switchNode",
"name": "switch cr length",
"xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1489.8574314117432,
- "y": 626.8968958854675,
- "z": "307cdf1d.539fd",
+ "x": 1483.8574504852295,
+ "y": 653.8969950675964,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "30bd1249.6e0cce"
+ "a5af4603.e786b8"
]
]
},
{
- "id": "30bd1249.6e0cce",
+ "id": "a5af4603.e786b8",
"type": "other",
"name": "outcome 1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1689.1905536651611,
- "y": 626.8969745635986,
- "z": "307cdf1d.539fd",
+ "x": 1683.1905727386475,
+ "y": 653.8970737457275,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "cc9f7f26.8914e"
+ "2a3354d7.ee765c"
]
]
},
{
- "id": "6e7b925f.51d77c",
+ "id": "b07d75d2.a2b088",
"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": 774.0000534057617,
- "y": 621.000036239624,
- "z": "307cdf1d.539fd",
+ "x": 768.000072479248,
+ "y": 648.0001354217529,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "8b5477db.c5c9d8",
- "94a8a58d.dee408"
+ "66a512c5.0faacc",
+ "9a3ff920.b9ec88"
]
]
},
{
- "id": "94a8a58d.dee408",
+ "id": "9a3ff920.b9ec88",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1142.0000839233398,
- "y": 591.0000343322754,
- "z": "307cdf1d.539fd",
+ "x": 1136.0001029968262,
+ "y": 618.0001335144043,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "9c37a2ea.b7b0a"
+ "9cab679f.f79248"
]
]
},
{
- "id": "9c37a2ea.b7b0a",
+ "id": "9cab679f.f79248",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1294.0000839233398,
- "y": 590.0000343322754,
- "z": "307cdf1d.539fd",
+ "x": 1288.0001029968262,
+ "y": 617.0001335144043,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "92f874df.f4a158",
+ "id": "26fdc495.60ac0c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 570.5556106567383,
- "y": 1540.6666536331177,
- "z": "307cdf1d.539fd",
+ "x": 564.5556297302246,
+ "y": 1567.6667528152466,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "53c527c9.b22648",
- "e855335b.71b3c"
+ "3267c7d4.904798",
+ "77c2c758.5059b8"
]
]
},
{
- "id": "53c527c9.b22648",
+ "id": "3267c7d4.904798",
"type": "for",
"name": "for each sotn-get-request-input-param",
"xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 840.5556755065918,
- "y": 1540.6667013168335,
- "z": "307cdf1d.539fd",
+ "x": 834.5556945800781,
+ "y": 1567.6668004989624,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "261e5f2.fe442a"
+ "2605999a.01d556"
]
]
},
{
- "id": "d5857a39.639db8",
+ "id": "2051e6d6.e5a81a",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 1380.5554580688477,
- "y": 1496.6667346954346,
- "z": "307cdf1d.539fd",
+ "x": 1374.555477142334,
+ "y": 1523.6668338775635,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "6df2fba8.889c14",
+ "id": "43dec0c4.9aa5a",
"type": "execute",
"name": "execute split parameterName",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1338.5901260375977,
- "y": 1531.6458778381348,
- "z": "307cdf1d.539fd",
+ "x": 1332.590145111084,
+ "y": 1558.6459770202637,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
},
{
- "id": "bd5f9072.2a8a7",
+ "id": "e2d39b7e.8a6eb8",
"type": "set",
"name": "set parameterName",
"xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
"comments": "",
- "x": 1309.034652709961,
- "y": 1564.6458778381348,
- "z": "307cdf1d.539fd",
+ "x": 1303.0346717834473,
+ "y": 1591.6459770202637,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "4a2aa60e.ed5c08",
+ "id": "36eb754f.ed7b4a",
"type": "comment",
"name": "Remove VNFC prefix",
"info": "",
"comments": "",
- "x": 781.5556030273438,
- "y": 1508.1110153198242,
- "z": "307cdf1d.539fd",
+ "x": 775.5556221008301,
+ "y": 1535.1111145019531,
+ "z": "ab45b2a0.2d254",
"wires": []
},
{
- "id": "261e5f2.fe442a",
+ "id": "2605999a.01d556",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1087.5555114746094,
- "y": 1539.1110458374023,
- "z": "307cdf1d.539fd",
+ "x": 1081.5555305480957,
+ "y": 1566.1111450195312,
+ "z": "ab45b2a0.2d254",
"wires": [
[
- "6df2fba8.889c14",
- "bd5f9072.2a8a7"
+ "43dec0c4.9aa5a",
+ "e2d39b7e.8a6eb8"
]
]
},
{
- "id": "5a956e5b.11a09",
+ "id": "e02c5c21.82a2",
"type": "save",
"name": "save srcLTP relationship in AAI",
- "xml": "<save 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 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/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $prop.connection-attachment.access-ltp-id`\" />\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",
+ "xml": "<save 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 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/' + $prop.connection-attachment.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": 619.0039329528809,
- "y": 1925.0039825439453,
- "z": "307cdf1d.539fd",
+ "x": 590.0041046142578,
+ "y": 1988.0046367645264,
+ "z": "ab45b2a0.2d254",
"wires": [
[]
]
+ },
+ {
+ "id": "bde5bdf6.37338",
+ "type": "set",
+ "name": "set src-ltpId",
+ "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`\" />\n",
+ "comments": "",
+ "x": 534.0001983642578,
+ "y": 1952.0004014968872,
+ "z": "ab45b2a0.2d254",
+ "wires": []
}
]
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_self-serve-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
index 1d074f4a..ba373a26 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
@@ -6,6 +6,10 @@
<set>
<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
</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>
<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >
<outcome value='failure'>
<return status='failure'>
@@ -33,12 +37,16 @@
<block atomic='true'>
<set>
<parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
+ <parameter name='tmp.gen-name_length' value='1' />
</set>
<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
<switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">
<outcome value='true'>
<set>
<parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+ <parameter name="`tmp.gen-name[0].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+ <parameter name="`tmp.gen-name[0].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+ <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
</set>
</outcome>
</switch>
@@ -61,9 +69,14 @@
<parameter name='target' value=',]' />
<parameter name='replacement' value=']' />
</execute>
- <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>
- <parameter name='payload' value='`$tmp.naming-data-payload`' />
- <parameter name="prifix" value="nameGenResponse" />
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+ <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+ <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='DELETE' />
+ <parameter name="responsePrefix" value="nameGenResponse" />
<outcome value='failure'>
<block>
<set>
@@ -90,7 +103,7 @@
</outcome>
</execute>
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
- <parameter name="source" value="nameGenResponse.response-payload" />
+ <parameter name="source" value="nameGenResponse.httpResponse" />
<parameter name="outputPath" value="jsonContextPrefix" />
<parameter name="isEscaped" value="false" />
</execute>
@@ -136,7 +149,8 @@
<outcome value='true'>
<block atomic='true'>
<set>
- <parameter name='tmp.naming-data-payload' value='' />
+ <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+ <parameter name='tmp.gen-name_length' value='0' />
</set>
<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
@@ -148,10 +162,14 @@
<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
<set>
<parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+ <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+ <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+ <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
</set>
</for>
<set>
<parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+ <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
</set>
</block>
</outcome>
@@ -175,9 +193,14 @@
<parameter name='target' value=',]' />
<parameter name='replacement' value=']' />
</execute>
- <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
- <parameter name='payload' value='`$tmp.naming-data-payload`' />
- <parameter name="prifix" value="nameGenResponse" />
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+ <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+ <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='POST' />
+ <parameter name="responsePrefix" value="nameGenResponse" />
<outcome value='failure'>
<block>
<set>
@@ -204,7 +227,7 @@
</outcome>
</execute>
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
- <parameter name="source" value="nameGenResponse.response-payload" />
+ <parameter name="source" value="nameGenResponse.httpResponse" />
<parameter name="outputPath" value="jsonContextPrefix" />
<parameter name="isEscaped" value="false" />
</execute>
@@ -276,12 +299,16 @@
<block atomic='true'>
<set>
<parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
+ <parameter name='tmp.gen-name_length' value='1' />
</set>
<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key_length`' >
<switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">
<outcome value='true'>
<set>
<parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+ <parameter name="`tmp.gen-name[0].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+ <parameter name="`tmp.gen-name[0].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+ <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
</set>
</outcome>
</switch>
@@ -304,9 +331,14 @@
<parameter name='target' value=',]' />
<parameter name='replacement' value=']' />
</execute>
- <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>
- <parameter name='payload' value='`$tmp.naming-data-payload`' />
- <parameter name="prifix" value="nameGenResponse" />
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+ <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+ <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='DELETE' />
+ <parameter name="responsePrefix" value="nameGenResponse" />
<outcome value='failure'>
<block>
<set>
@@ -333,7 +365,7 @@
</outcome>
</execute>
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
- <parameter name="source" value="nameGenResponse.response-payload" />
+ <parameter name="source" value="nameGenResponse.httpResponse" />
<parameter name="outputPath" value="jsonContextPrefix" />
<parameter name="isEscaped" value="false" />
</execute>
@@ -379,7 +411,8 @@
<outcome value='true'>
<block atomic='true'>
<set>
- <parameter name='tmp.naming-data-payload' value='' />
+ <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+ <parameter name='tmp.gen-name_length' value='0' />
</set>
<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
@@ -391,10 +424,14 @@
<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key_length`' >
<set>
<parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+ <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+ <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+ <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
</set>
</for>
<set>
<parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+ <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
</set>
</block>
</outcome>
@@ -418,9 +455,14 @@
<parameter name='target' value=',]' />
<parameter name='replacement' value=']' />
</execute>
- <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
- <parameter name='payload' value='`$tmp.naming-data-payload`' />
- <parameter name="prifix" value="nameGenResponse" />
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+ <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+ <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='POST' />
+ <parameter name="responsePrefix" value="nameGenResponse" />
<outcome value='failure'>
<block>
<set>
@@ -447,7 +489,7 @@
</outcome>
</execute>
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
- <parameter name="source" value="nameGenResponse.response-payload" />
+ <parameter name="source" value="nameGenResponse.httpResponse" />
<parameter name="outputPath" value="jsonContextPrefix" />
<parameter name="isEscaped" value="false" />
</execute>
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 23b28c85..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'/>
@@ -378,8 +381,7 @@
</set>
<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="pnf"
- key="network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id
- AND pnf.pnf-name = $oof.vpn.access-node-id
+ key="pnf.pnf-name = $oof.vpn.access-node-id
AND depth = '0'"
pfx='tmp.aai.pnf' local-only='false' >
<outcome value='success'>
@@ -431,7 +433,7 @@
</get-resource>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
<parameter name="format" value="json"/>
@@ -489,7 +491,7 @@
key='vpn-binding.vpn-id = $tmp.vpnName'
force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $src-ltpId`" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
</save>
@@ -497,7 +499,7 @@
key='vpn-binding.vpn-id = $tmp.vpnName'
force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $dst-ltpId`" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" />
</save>
@@ -571,8 +573,7 @@
pfx='pfx' local-only='false' force='false'>
<parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
<parameter name="selflink" value="`$tmp.ar.self-link`" />
- <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
- <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+ <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
<parameter name="operational-status" value="Active" />
<outcome value='failure'>
<return status='failure'>
@@ -596,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-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
index e0beaac9..073b4210 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
@@ -270,6 +270,9 @@ value="`$connection-attachment-ar-identifiers.`" />
</return>
</outcome>
</save>
+ <set>
+ <parameter name='src-ltpId' value="`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`" />
+ </set>
<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
@@ -278,7 +281,7 @@ value="`$connection-attachment-ar-identifiers.`" />
allotted-resource.id = $tmp.ar.allotted-resource-id"
force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $prop.connection-attachment.access-ltp-id`" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
</save>
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
diff --git a/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json b/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
index 30ee561d..fcd3d4f3 100755
--- a/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_distribute-traffic.json
@@ -1,22 +1,22 @@
[
{
- "id": "1a420388.7ce24c",
+ "id": "fab0f7ed.c486b8",
"type": "method",
"name": "distribute-traffic",
"xml": "<method rpc='distribute-traffic' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 550,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 480,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "e635fd5d.f4087"
+ "5ccc8e8d.06e5"
]
]
},
{
- "id": "c220826b.91906",
+ "id": "5c791eb8.0072b",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,528 +24,788 @@
"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='LCM' version='${project.version}'>",
"outputs": 1,
- "x": 337.99993896484375,
- "y": 103,
- "z": "af8f5cdd.6e4de",
+ "x": 267.99993896484375,
+ "y": 148,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1a420388.7ce24c"
+ "fab0f7ed.c486b8"
]
]
},
{
- "id": "810e1e54.dec1c",
+ "id": "3503ece1.d7ad14",
"type": "execute",
"name": "execute AnsibleA.reqExec",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$distribute-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$distribute-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 345.00001525878906,
- "y": 379,
- "z": "af8f5cdd.6e4de",
+ "x": 335.00001525878906,
+ "y": 755,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f279f5b8.9d49b8",
- "895a0a53.e12ea8",
- "fa759954.4e2068"
+ "734b2c42.973ee4",
+ "bb8a76ca.fb7058",
+ "a457fe79.46497"
]
]
},
{
- "id": "f7db5396.7b5f1",
+ "id": "f17ff2aa.67075",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 690.9999389648438,
- "y": 530.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 734.9999389648438,
+ "y": 863.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "bc5a2382.4973",
- "84f0dd88.8438",
- "ffd4aab1.e3c4b8"
+ "7ad5787f.1c20f8",
+ "b6f779a3.cc7ed8",
+ "f695f05e.abf31"
]
]
},
{
- "id": "bc5a2382.4973",
+ "id": "7ad5787f.1c20f8",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 835.9999389648438,
- "y": 528.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 879.9999389648438,
+ "y": 861.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "84f0dd88.8438",
+ "id": "b6f779a3.cc7ed8",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 838.9999389648438,
- "y": 571.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 918.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f44a47b3.3aa128"
+ "1a65bc45.b2fcb4"
]
]
},
{
- "id": "f44a47b3.3aa128",
+ "id": "1a65bc45.b2fcb4",
"type": "execute",
"name": "execute reqExecResult",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1025.9999389648438,
- "y": 570.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1064.9999389648438,
+ "y": 917.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "dd2fe7e6.957248",
- "6913b982.6c9bb8"
+ "5b0d24c6.9eb0ac",
+ "2b5e4322.1d495c"
]
]
},
{
- "id": "895a0a53.e12ea8",
+ "id": "bb8a76ca.fb7058",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 581.9999389648438,
- "y": 439.0000534057617,
- "z": "af8f5cdd.6e4de",
+ "x": 593.9999389648438,
+ "y": 776.0000915527344,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "f279f5b8.9d49b8",
+ "id": "734b2c42.973ee4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 583.9999389648438,
- "y": 491.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 595.9999389648438,
+ "y": 828.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f7db5396.7b5f1"
+ "f17ff2aa.67075"
]
]
},
{
- "id": "dd2fe7e6.957248",
+ "id": "5b0d24c6.9eb0ac",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1189.9999389648438,
- "y": 542.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1233.9999389648438,
+ "y": 875.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "ffd4aab1.e3c4b8",
+ "id": "f695f05e.abf31",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 832.9999389648438,
- "y": 486.00006103515625,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 819.0000686645508,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "6913b982.6c9bb8",
+ "id": "2b5e4322.1d495c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1191.9999389648438,
- "y": 597.0000915527344,
- "z": "af8f5cdd.6e4de",
+ "x": 1241.9998779296875,
+ "y": 923.0001220703125,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "14c8dea1.b5b7a1"
+ "db1e6d62.a1404"
]
]
},
{
- "id": "a32993f8.f8215",
+ "id": "c1a2b259.11e46",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
"comments": "",
- "x": 1467.9998779296875,
- "y": 648.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 1535.9998779296875,
+ "y": 980.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "d8c3f83d.d0b9d8",
+ "id": "566f9779.c05d38",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 153,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 83,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c220826b.91906"
+ "5c791eb8.0072b"
]
]
},
{
- "id": "e635fd5d.f4087",
+ "id": "5ccc8e8d.06e5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 139.91668701171875,
- "y": 241.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 80.91668701171875,
+ "y": 239.08334350585938,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "810e1e54.dec1c",
- "ee1802be.c5c18",
- "e8d3b31a.f46c6",
- "4d7f56db.9375c8"
+ "3503ece1.d7ad14",
+ "dc18f7c9.2e4ac8",
+ "814875d2.cac108",
+ "e9d89bdf.30f7a8",
+ "69e97f86.e07ef",
+ "fa9a8e1f.bba53",
+ "baba22fc.1ceb5",
+ "81510405.ca8868"
]
]
},
{
- "id": "ee1802be.c5c18",
+ "id": "dc18f7c9.2e4ac8",
"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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 328.00001525878906,
- "y": 225.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 379.0000305175781,
+ "y": 272.0833435058594,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "3830f5d4.87f1aa",
+ "id": "70d1c79a.089af8",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1222.9999389648438,
- "y": 371.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1545.9998779296875,
+ "y": 725.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1566d659.a0655a"
+ "d776c76b.1dd188"
]
]
},
{
- "id": "1566d659.a0655a",
+ "id": "d776c76b.1dd188",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1392.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1715.9998168945312,
+ "y": 724.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "22f8bfd0.6139e"
+ "eac6c260.d11fc"
]
]
},
{
- "id": "80cc4946.3f0f78",
+ "id": "2b54a991.b17b16",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1025.9998779296875,
- "y": 395.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1348.9998168945312,
+ "y": 749.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "3830f5d4.87f1aa",
- "fedbb5e6.fb3c28",
- "898f667e.daf2e8"
+ "70d1c79a.089af8",
+ "7970fcd5.6f11b4",
+ "3d8934f9.d0339c"
]
]
},
{
- "id": "7ce48bed.5b7c74",
+ "id": "e790e11b.4f947",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1488.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1546.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "37e7fa80.2728b6"
+ "2e13891.034f576"
]
]
},
{
- "id": "37e7fa80.2728b6",
+ "id": "2e13891.034f576",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1648.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1714.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "47c7511a.dd8fe"
+ "30475e40.9b8be2"
]
]
},
{
- "id": "22f8bfd0.6139e",
+ "id": "eac6c260.d11fc",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1524.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1835.9998779296875,
+ "y": 723.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "fedbb5e6.fb3c28",
+ "id": "7970fcd5.6f11b4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
"comments": "",
- "x": 1197.9165649414062,
- "y": 408.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1527.91650390625,
+ "y": 776.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "47c7511a.dd8fe",
+ "id": "30475e40.9b8be2",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1769.9166259765625,
- "y": 598.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1842.9166259765625,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "898f667e.daf2e8",
+ "id": "3d8934f9.d0339c",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$distribute-traffic-input.common-header.request-id + '-' + $distribute-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='distribute-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$distribute-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$distribute-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$distribute-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$distribute-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$distribute-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$distribute-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$distribute-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1174.9999389648438,
- "y": 318.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1532.9998779296875,
+ "y": 672.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "14c8dea1.b5b7a1",
+ "id": "db1e6d62.a1404",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1317.9998779296875,
- "y": 596.0833435058594,
- "z": "af8f5cdd.6e4de",
+ "x": 1369.9998779296875,
+ "y": 924.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "7ce48bed.5b7c74",
- "70a28c6a.563d24",
- "a32993f8.f8215"
+ "e790e11b.4f947",
+ "3a3f1d44.898da2",
+ "c1a2b259.11e46"
]
]
},
{
- "id": "70a28c6a.563d24",
+ "id": "3a3f1d44.898da2",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$distribute-traffic-input.common-header.request-id + '-' + $distribute-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='distribute-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$distribute-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$distribute-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$distribute-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$distribute-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$distribute-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$distribute-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$distribute-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$distribute-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1448.1666259765625,
- "y": 549.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1536.1666259765625,
+ "y": 875.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "fa759954.4e2068",
+ "id": "a457fe79.46497",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 577.9999389648438,
- "y": 392.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 602.9999389648438,
+ "y": 728.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "ed41675d.59c088"
+ "3d4c2c9a.7b1324"
]
]
},
{
- "id": "756c2e53.ca6d7",
+ "id": "d512629f.bc625",
"type": "set",
"name": "set Defaults",
"xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
"comments": "",
- "x": 1009.9999389648438,
- "y": 297.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 893.9999389648438,
+ "y": 687,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "ed41675d.59c088",
+ "id": "3d4c2c9a.7b1324",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 761.9999389648438,
- "y": 384.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 739.9999389648438,
+ "y": 722.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "756c2e53.ca6d7",
- "80cc4946.3f0f78"
+ "d512629f.bc625",
+ "2b54a991.b17b16"
]
]
},
{
- "id": "e8d3b31a.f46c6",
+ "id": "814875d2.cac108",
"type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+ "name": "set default values",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
"comments": "",
- "x": 336,
- "y": 269,
- "z": "af8f5cdd.6e4de",
+ "x": 372,
+ "y": 319,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "4d7f56db.9375c8",
+ "id": "442dbdff.6dfcb4",
"type": "get-resource",
- "name": "get aai.generic-vnf by vnf-id",
+ "name": "get aai.generic-vnf ",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $distribute-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
"comments": "",
"outputs": 1,
- "x": 349.0000305175781,
- "y": 325,
- "z": "af8f5cdd.6e4de",
+ "x": 912,
+ "y": 495,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "fa69a126.2a554",
- "f9cb9963.f9e368"
+ "1e57cb28.122ad5"
]
]
},
{
- "id": "fa69a126.2a554",
- "type": "failure",
+ "id": "1e57cb28.122ad5",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1070.3907470703125,
+ "y": 493.28399658203125,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "5a65efc0.bf413"
+ ]
+ ]
+ },
+ {
+ "id": "baba22fc.1ceb5",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 300.9998779296875,
+ "y": 683,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "69e97f86.e07ef",
+ "type": "switchNode",
+ "name": "switch pnf-flag",
+ "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 354,
+ "y": 420,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "e43265e9.4c7f38",
+ "d78c93da.7125f"
+ ]
+ ]
+ },
+ {
+ "id": "e9d89bdf.30f7a8",
+ "type": "execute",
+ "name": "execute jsonStringToCtx",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='distribute-traffic-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 386,
+ "y": 366,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "e43265e9.4c7f38",
+ "type": "outcome",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 551,
+ "y": 399,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "abbc4ae4.be5328"
+ ]
+ ]
+ },
+ {
+ "id": "d78c93da.7125f",
+ "type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 589.86083984375,
- "y": 312.53564453125,
- "z": "af8f5cdd.6e4de",
+ "x": 550.9999389648438,
+ "y": 460,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "2d1a88c6.11f9d8"
+ "f68ee407.ca6d88"
]
]
},
{
- "id": "f9cb9963.f9e368",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
+ "id": "f68ee407.ca6d88",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 591.3908081054688,
- "y": 260.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 698.9999389648438,
+ "y": 459,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c4d4de4d.3e19f"
+ "442dbdff.6dfcb4",
+ "80c560bb.eea5f"
]
]
},
{
- "id": "c4d4de4d.3e19f",
+ "id": "abbc4ae4.be5328",
+ "type": "set",
+ "name": "set AnsibleReq",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.distribute-traffic.playbookname`'/>\n",
+ "comments": "",
+ "x": 712,
+ "y": 397,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "80c560bb.eea5f",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.distribute-traffic.playbookname'`\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 921,
+ "y": 439,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fa9a8e1f.bba53",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 351,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "1a5624d2.74e98b"
+ ]
+ ]
+ },
+ {
+ "id": "1a5624d2.74e98b",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 522,
+ "y": 552,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "524c17a1.30fbf8"
+ ]
+ ]
+ },
+ {
+ "id": "524c17a1.30fbf8",
+ "type": "set",
+ "name": "set playbookname",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.distribute-traffic.playbookname`'/>",
+ "comments": "",
+ "x": 712,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "81510405.ca8868",
+ "type": "switchNode",
+ "name": "switch nodelist",
+ "xml": "<switch test='`$nodelist`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 341,
+ "y": 610,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "7a126f.d2de2d9",
+ "8743a074.e8506"
+ ]
+ ]
+ },
+ {
+ "id": "7a126f.d2de2d9",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 521,
+ "y": 603,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "c954af6f.c34df",
"type": "set",
"name": "set nodelist",
- "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 740.3908081054688,
- "y": 259.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 678,
+ "y": 617,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "2d1a88c6.11f9d8",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+ "id": "8743a074.e8506",
+ "type": "outcome",
+ "name": "empty",
+ "xml": "<outcome value=\"['']\">\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 520,
+ "y": 647,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "90b2891b.001708",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1396,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c9dd0d76.432f7"
+ ]
+ ]
+ },
+ {
+ "id": "c9dd0d76.432f7",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1574,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "6ea15b2b.d9cd74"
+ ]
+ ]
+ },
+ {
+ "id": "9706bdee.6acf9",
+ "type": "set",
+ "name": "set nodelist",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "comments": "",
+ "x": 1369,
+ "y": 535,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "5a65efc0.bf413",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1199,
+ "y": 492,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "90b2891b.001708",
+ "9706bdee.6acf9"
+ ]
+ ]
+ },
+ {
+ "id": "6ea15b2b.d9cd74",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.distribute-traffic.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 736,
- "y": 312,
- "z": "af8f5cdd.6e4de",
+ "x": 1746,
+ "y": 480,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
diff --git a/platform-logic/lcm/src/main/json/LCM_lock.json b/platform-logic/lcm/src/main/json/LCM_lock.json
index 32f1f8c0..dea68fab 100644
--- a/platform-logic/lcm/src/main/json/LCM_lock.json
+++ b/platform-logic/lcm/src/main/json/LCM_lock.json
@@ -1,194 +1,164 @@
-[
- {
- "id": "85add9d3.6d38c8",
- "type": "method",
- "name": "lock",
- "xml": "<method rpc='lock' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 535.5,
- "y": 83,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "a726273f.d4087"
- ]
- ]
- },
- {
- "id": "6cc2acd4.57558c",
- "type": "service-logic",
- "name": "LCM ${project.version}",
- "module": "LCM",
- "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='LCM' version='${project.version}'>",
- "outputs": 1,
- "x": 306.49993896484375,
- "y": 84,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "85add9d3.6d38c8"
- ]
- ]
- },
- {
- "id": "3b5bd72a.fb19f8",
- "type": "returnSuccess",
- "name": "return success",
- "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
- "comments": "",
- "x": 388.5,
- "y": 472,
- "z": "1bef9bfd.091c84",
- "wires": []
- },
- {
- "id": "7bee7647.02e808",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 103.5,
- "y": 83,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "6cc2acd4.57558c"
- ]
- ]
- },
- {
- "id": "a726273f.d4087",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 139.41668701171875,
- "y": 237.08334350585938,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "c733c1eb.f6dc98",
- "8a3a4a22.8cd238",
- "5c905e45.08ff1",
- "ff16f6f7.bb02d",
- "3b5bd72a.fb19f8"
- ]
- ]
- },
- {
- "id": "c733c1eb.f6dc98",
- "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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
- "comments": "",
- "outputs": 1,
- "x": 426.5,
- "y": 222.08334350585938,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "ff16f6f7.bb02d",
- "type": "execute",
- "name": "execute DmaapMsg",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 402.5,
- "y": 399.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "4150232b.d9de94"
- ]
- ]
- },
- {
- "id": "4150232b.d9de94",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 611.5,
- "y": 397.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "1c38db15.1f052d"
- ]
- ]
- },
- {
- "id": "f6eb674d.c21",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1506.9999389648438,
- "y": 415.0833511352539,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "db43d1c.5a1cab"
- ]
- ]
- },
- {
- "id": "1c38db15.1f052d",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
- "comments": "",
- "outputs": 1,
- "x": 771.5,
- "y": 397.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "db43d1c.5a1cab",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
- "comments": "",
- "outputs": 1,
- "x": 1628.4166870117188,
- "y": 416.0833511352539,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "5c905e45.08ff1",
- "type": "set",
- "name": "set",
- "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$lock-input.common-header.request-id + '-' + $lock-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='lock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$lock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$lock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$lock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$lock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$lock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$lock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",
- "comments": "",
- "x": 374.5,
- "y": 331.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": []
- },
- {
- "id": "8a3a4a22.8cd238",
- "type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
- "comments": "",
- "x": 428.5,
- "y": 274,
- "z": "1bef9bfd.091c84",
- "wires": []
- }
-]
+[
+ {
+ "id": "c36c1e82.e47c",
+ "type": "method",
+ "name": "lock",
+ "xml": "<method rpc='lock' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 530,
+ "y": 121,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "ea26f1ed.e963b"
+ ]
+ ]
+ },
+ {
+ "id": "4c2264b2.81a61c",
+ "type": "service-logic",
+ "name": "LCM ${project.version}",
+ "module": "LCM",
+ "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='LCM' version='${project.version}'>",
+ "outputs": 1,
+ "x": 300.99993896484375,
+ "y": 122,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "c36c1e82.e47c"
+ ]
+ ]
+ },
+ {
+ "id": "a3360ab0.ce42c8",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
+ "comments": "",
+ "x": 383,
+ "y": 510,
+ "z": "a439ae77.f8998",
+ "wires": []
+ },
+ {
+ "id": "7e67863d.7c42f8",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 98,
+ "y": 121,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "4c2264b2.81a61c"
+ ]
+ ]
+ },
+ {
+ "id": "ea26f1ed.e963b",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 133.91668701171875,
+ "y": 275.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "f1d5fb31.fa3878",
+ "625601b.39b33",
+ "786cf009.ea481",
+ "cd184491.d656e8",
+ "a3360ab0.ce42c8"
+ ]
+ ]
+ },
+ {
+ "id": "f1d5fb31.fa3878",
+ "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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 421,
+ "y": 260.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "cd184491.d656e8",
+ "type": "execute",
+ "name": "execute DmaapMsg",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 397,
+ "y": 437.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "91133c94.04e29"
+ ]
+ ]
+ },
+ {
+ "id": "91133c94.04e29",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 606,
+ "y": 435.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "f3b86bb6.9cf808"
+ ]
+ ]
+ },
+ {
+ "id": "f3b86bb6.9cf808",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 766,
+ "y": 435.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "786cf009.ea481",
+ "type": "set",
+ "name": "set",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$lock-input.common-header.request-id + '-' + $lock-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='lock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$lock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$lock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$lock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$lock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$lock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$lock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$lock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",
+ "comments": "",
+ "x": 369,
+ "y": 369.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": []
+ },
+ {
+ "id": "625601b.39b33",
+ "type": "set",
+ "name": "set default status value",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+ "comments": "",
+ "x": 423,
+ "y": 312,
+ "z": "a439ae77.f8998",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json b/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
index b88d314d..d6f757a5 100644
--- a/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_quiesce-traffic.json
@@ -1,22 +1,22 @@
[
{
- "id": "1a420388.7ce24c",
+ "id": "fab0f7ed.c486b8",
"type": "method",
"name": "quiesce-traffic",
"xml": "<method rpc='quiesce-traffic' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 550,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 480,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "e635fd5d.f4087"
+ "5ccc8e8d.06e5"
]
]
},
{
- "id": "c220826b.91906",
+ "id": "5c791eb8.0072b",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,528 +24,788 @@
"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='LCM' version='${project.version}'>",
"outputs": 1,
- "x": 337.99993896484375,
- "y": 103,
- "z": "af8f5cdd.6e4de",
+ "x": 267.99993896484375,
+ "y": 148,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1a420388.7ce24c"
+ "fab0f7ed.c486b8"
]
]
},
{
- "id": "810e1e54.dec1c",
+ "id": "3503ece1.d7ad14",
"type": "execute",
"name": "execute AnsibleA.reqExec",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$quiesce-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$quiesce-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 345.00001525878906,
- "y": 379,
- "z": "af8f5cdd.6e4de",
+ "x": 335.00001525878906,
+ "y": 755,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f279f5b8.9d49b8",
- "895a0a53.e12ea8",
- "fa759954.4e2068"
+ "734b2c42.973ee4",
+ "bb8a76ca.fb7058",
+ "a457fe79.46497"
]
]
},
{
- "id": "f7db5396.7b5f1",
+ "id": "f17ff2aa.67075",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 690.9999389648438,
- "y": 530.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 734.9999389648438,
+ "y": 863.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "bc5a2382.4973",
- "84f0dd88.8438",
- "ffd4aab1.e3c4b8"
+ "7ad5787f.1c20f8",
+ "b6f779a3.cc7ed8",
+ "f695f05e.abf31"
]
]
},
{
- "id": "bc5a2382.4973",
+ "id": "7ad5787f.1c20f8",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 835.9999389648438,
- "y": 528.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 879.9999389648438,
+ "y": 861.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "84f0dd88.8438",
+ "id": "b6f779a3.cc7ed8",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 838.9999389648438,
- "y": 571.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 918.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f44a47b3.3aa128"
+ "1a65bc45.b2fcb4"
]
]
},
{
- "id": "f44a47b3.3aa128",
+ "id": "1a65bc45.b2fcb4",
"type": "execute",
"name": "execute reqExecResult",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1025.9999389648438,
- "y": 570.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1064.9999389648438,
+ "y": 917.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "dd2fe7e6.957248",
- "6913b982.6c9bb8"
+ "5b0d24c6.9eb0ac",
+ "2b5e4322.1d495c"
]
]
},
{
- "id": "895a0a53.e12ea8",
+ "id": "bb8a76ca.fb7058",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 581.9999389648438,
- "y": 439.0000534057617,
- "z": "af8f5cdd.6e4de",
+ "x": 593.9999389648438,
+ "y": 776.0000915527344,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "f279f5b8.9d49b8",
+ "id": "734b2c42.973ee4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 583.9999389648438,
- "y": 491.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 595.9999389648438,
+ "y": 828.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f7db5396.7b5f1"
+ "f17ff2aa.67075"
]
]
},
{
- "id": "dd2fe7e6.957248",
+ "id": "5b0d24c6.9eb0ac",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1189.9999389648438,
- "y": 542.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1233.9999389648438,
+ "y": 875.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "ffd4aab1.e3c4b8",
+ "id": "f695f05e.abf31",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 832.9999389648438,
- "y": 486.00006103515625,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 819.0000686645508,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "6913b982.6c9bb8",
+ "id": "2b5e4322.1d495c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1191.9999389648438,
- "y": 597.0000915527344,
- "z": "af8f5cdd.6e4de",
+ "x": 1241.9998779296875,
+ "y": 923.0001220703125,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "14c8dea1.b5b7a1"
+ "db1e6d62.a1404"
]
]
},
{
- "id": "a32993f8.f8215",
+ "id": "c1a2b259.11e46",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
"comments": "",
- "x": 1467.9998779296875,
- "y": 648.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 1535.9998779296875,
+ "y": 980.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "d8c3f83d.d0b9d8",
+ "id": "566f9779.c05d38",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 153,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 83,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c220826b.91906"
+ "5c791eb8.0072b"
]
]
},
{
- "id": "e635fd5d.f4087",
+ "id": "5ccc8e8d.06e5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 139.91668701171875,
- "y": 241.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 80.91668701171875,
+ "y": 239.08334350585938,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "810e1e54.dec1c",
- "ee1802be.c5c18",
- "e8d3b31a.f46c6",
- "4d7f56db.9375c8"
+ "3503ece1.d7ad14",
+ "dc18f7c9.2e4ac8",
+ "814875d2.cac108",
+ "e9d89bdf.30f7a8",
+ "69e97f86.e07ef",
+ "fa9a8e1f.bba53",
+ "baba22fc.1ceb5",
+ "81510405.ca8868"
]
]
},
{
- "id": "ee1802be.c5c18",
+ "id": "dc18f7c9.2e4ac8",
"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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 328.00001525878906,
- "y": 225.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 379.0000305175781,
+ "y": 272.0833435058594,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "3830f5d4.87f1aa",
+ "id": "70d1c79a.089af8",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1222.9999389648438,
- "y": 371.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1545.9998779296875,
+ "y": 725.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1566d659.a0655a"
+ "d776c76b.1dd188"
]
]
},
{
- "id": "1566d659.a0655a",
+ "id": "d776c76b.1dd188",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1392.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1715.9998168945312,
+ "y": 724.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "22f8bfd0.6139e"
+ "eac6c260.d11fc"
]
]
},
{
- "id": "80cc4946.3f0f78",
+ "id": "2b54a991.b17b16",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1025.9998779296875,
- "y": 395.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1348.9998168945312,
+ "y": 749.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "3830f5d4.87f1aa",
- "fedbb5e6.fb3c28",
- "898f667e.daf2e8"
+ "70d1c79a.089af8",
+ "7970fcd5.6f11b4",
+ "3d8934f9.d0339c"
]
]
},
{
- "id": "7ce48bed.5b7c74",
+ "id": "e790e11b.4f947",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1488.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1546.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "37e7fa80.2728b6"
+ "2e13891.034f576"
]
]
},
{
- "id": "37e7fa80.2728b6",
+ "id": "2e13891.034f576",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1648.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1714.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "47c7511a.dd8fe"
+ "30475e40.9b8be2"
]
]
},
{
- "id": "22f8bfd0.6139e",
+ "id": "eac6c260.d11fc",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1524.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1835.9998779296875,
+ "y": 723.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "fedbb5e6.fb3c28",
+ "id": "7970fcd5.6f11b4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
"comments": "",
- "x": 1197.9165649414062,
- "y": 408.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1527.91650390625,
+ "y": 776.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "47c7511a.dd8fe",
+ "id": "30475e40.9b8be2",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1769.9166259765625,
- "y": 598.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1842.9166259765625,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "898f667e.daf2e8",
+ "id": "3d8934f9.d0339c",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$quiesce-traffic-input.common-header.request-id + '-' + $quiesce-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='quiesce-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$quiesce-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$quiesce-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$quiesce-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$quiesce-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$quiesce-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$quiesce-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$quiesce-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1174.9999389648438,
- "y": 318.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1532.9998779296875,
+ "y": 672.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "14c8dea1.b5b7a1",
+ "id": "db1e6d62.a1404",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1317.9998779296875,
- "y": 596.0833435058594,
- "z": "af8f5cdd.6e4de",
+ "x": 1369.9998779296875,
+ "y": 924.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "7ce48bed.5b7c74",
- "70a28c6a.563d24",
- "a32993f8.f8215"
+ "e790e11b.4f947",
+ "3a3f1d44.898da2",
+ "c1a2b259.11e46"
]
]
},
{
- "id": "70a28c6a.563d24",
+ "id": "3a3f1d44.898da2",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$quiesce-traffic-input.common-header.request-id + '-' + $quiesce-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='quiesce-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$quiesce-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$quiesce-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$quiesce-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$quiesce-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$quiesce-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$quiesce-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$quiesce-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$quiesce-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1448.1666259765625,
- "y": 549.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1536.1666259765625,
+ "y": 875.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "fa759954.4e2068",
+ "id": "a457fe79.46497",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 577.9999389648438,
- "y": 392.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 602.9999389648438,
+ "y": 728.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "ed41675d.59c088"
+ "3d4c2c9a.7b1324"
]
]
},
{
- "id": "756c2e53.ca6d7",
+ "id": "d512629f.bc625",
"type": "set",
"name": "set Defaults",
"xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
"comments": "",
- "x": 1009.9999389648438,
- "y": 297.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 893.9999389648438,
+ "y": 687,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "ed41675d.59c088",
+ "id": "3d4c2c9a.7b1324",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 761.9999389648438,
- "y": 384.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 739.9999389648438,
+ "y": 722.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "756c2e53.ca6d7",
- "80cc4946.3f0f78"
+ "d512629f.bc625",
+ "2b54a991.b17b16"
]
]
},
{
- "id": "e8d3b31a.f46c6",
+ "id": "814875d2.cac108",
"type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+ "name": "set default values",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
"comments": "",
- "x": 336,
- "y": 269,
- "z": "af8f5cdd.6e4de",
+ "x": 372,
+ "y": 319,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "4d7f56db.9375c8",
+ "id": "442dbdff.6dfcb4",
"type": "get-resource",
- "name": "get aai.generic-vnf by vnf-id",
+ "name": "get aai.generic-vnf ",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $quiesce-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
"comments": "",
"outputs": 1,
- "x": 349.0000305175781,
- "y": 325,
- "z": "af8f5cdd.6e4de",
+ "x": 912,
+ "y": 495,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "fa69a126.2a554",
- "f9cb9963.f9e368"
+ "1e57cb28.122ad5"
]
]
},
{
- "id": "fa69a126.2a554",
- "type": "failure",
+ "id": "1e57cb28.122ad5",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1070.3907470703125,
+ "y": 493.28399658203125,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "5a65efc0.bf413"
+ ]
+ ]
+ },
+ {
+ "id": "baba22fc.1ceb5",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 300.9998779296875,
+ "y": 683,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "69e97f86.e07ef",
+ "type": "switchNode",
+ "name": "switch pnf-flag",
+ "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 354,
+ "y": 420,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "e43265e9.4c7f38",
+ "d78c93da.7125f"
+ ]
+ ]
+ },
+ {
+ "id": "e9d89bdf.30f7a8",
+ "type": "execute",
+ "name": "execute jsonStringToCtx",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='quiesce-traffic-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 386,
+ "y": 366,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "e43265e9.4c7f38",
+ "type": "outcome",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 551,
+ "y": 399,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "abbc4ae4.be5328"
+ ]
+ ]
+ },
+ {
+ "id": "d78c93da.7125f",
+ "type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 589.86083984375,
- "y": 312.53564453125,
- "z": "af8f5cdd.6e4de",
+ "x": 550.9999389648438,
+ "y": 460,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "2d1a88c6.11f9d8"
+ "f68ee407.ca6d88"
]
]
},
{
- "id": "f9cb9963.f9e368",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
+ "id": "f68ee407.ca6d88",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 591.3908081054688,
- "y": 260.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 698.9999389648438,
+ "y": 459,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c4d4de4d.3e19f"
+ "442dbdff.6dfcb4",
+ "80c560bb.eea5f"
]
]
},
{
- "id": "c4d4de4d.3e19f",
+ "id": "abbc4ae4.be5328",
+ "type": "set",
+ "name": "set AnsibleReq",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.quiesce-traffic.playbookname`'/>\n",
+ "comments": "",
+ "x": 712,
+ "y": 397,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "80c560bb.eea5f",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.quiesce-traffic.playbookname'`\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 921,
+ "y": 439,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fa9a8e1f.bba53",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 351,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "1a5624d2.74e98b"
+ ]
+ ]
+ },
+ {
+ "id": "1a5624d2.74e98b",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 522,
+ "y": 552,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "524c17a1.30fbf8"
+ ]
+ ]
+ },
+ {
+ "id": "524c17a1.30fbf8",
+ "type": "set",
+ "name": "set playbookname",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.quiesce-traffic.playbookname`'/>",
+ "comments": "",
+ "x": 712,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "81510405.ca8868",
+ "type": "switchNode",
+ "name": "switch nodelist",
+ "xml": "<switch test='`$nodelist`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 341,
+ "y": 610,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "7a126f.d2de2d9",
+ "8743a074.e8506"
+ ]
+ ]
+ },
+ {
+ "id": "7a126f.d2de2d9",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 521,
+ "y": 603,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "c954af6f.c34df",
"type": "set",
"name": "set nodelist",
- "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 740.3908081054688,
- "y": 259.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 678,
+ "y": 617,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "2d1a88c6.11f9d8",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+ "id": "8743a074.e8506",
+ "type": "outcome",
+ "name": "empty",
+ "xml": "<outcome value=\"['']\">\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 520,
+ "y": 647,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "90b2891b.001708",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1396,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c9dd0d76.432f7"
+ ]
+ ]
+ },
+ {
+ "id": "c9dd0d76.432f7",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1574,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "6ea15b2b.d9cd74"
+ ]
+ ]
+ },
+ {
+ "id": "9706bdee.6acf9",
+ "type": "set",
+ "name": "set nodelist",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "comments": "",
+ "x": 1369,
+ "y": 535,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "5a65efc0.bf413",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1199,
+ "y": 492,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "90b2891b.001708",
+ "9706bdee.6acf9"
+ ]
+ ]
+ },
+ {
+ "id": "6ea15b2b.d9cd74",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.quiesce-traffic.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 736,
- "y": 312,
- "z": "af8f5cdd.6e4de",
+ "x": 1746,
+ "y": 480,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
diff --git a/platform-logic/lcm/src/main/json/LCM_resume-traffic.json b/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
index 6024d141..405e58b5 100644
--- a/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
+++ b/platform-logic/lcm/src/main/json/LCM_resume-traffic.json
@@ -1,22 +1,22 @@
[
{
- "id": "1a420388.7ce24c",
+ "id": "fab0f7ed.c486b8",
"type": "method",
"name": "resume-traffic",
"xml": "<method rpc='resume-traffic' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 550,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 480,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "e635fd5d.f4087"
+ "5ccc8e8d.06e5"
]
]
},
{
- "id": "c220826b.91906",
+ "id": "5c791eb8.0072b",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,528 +24,788 @@
"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='LCM' version='${project.version}'>",
"outputs": 1,
- "x": 337.99993896484375,
- "y": 103,
- "z": "af8f5cdd.6e4de",
+ "x": 267.99993896484375,
+ "y": 148,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1a420388.7ce24c"
+ "fab0f7ed.c486b8"
]
]
},
{
- "id": "810e1e54.dec1c",
+ "id": "3503ece1.d7ad14",
"type": "execute",
"name": "execute AnsibleA.reqExec",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$resume-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$resume-traffic-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 345.00001525878906,
- "y": 379,
- "z": "af8f5cdd.6e4de",
+ "x": 335.00001525878906,
+ "y": 755,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f279f5b8.9d49b8",
- "895a0a53.e12ea8",
- "fa759954.4e2068"
+ "734b2c42.973ee4",
+ "bb8a76ca.fb7058",
+ "a457fe79.46497"
]
]
},
{
- "id": "f7db5396.7b5f1",
+ "id": "f17ff2aa.67075",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 690.9999389648438,
- "y": 530.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 734.9999389648438,
+ "y": 863.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "bc5a2382.4973",
- "84f0dd88.8438",
- "ffd4aab1.e3c4b8"
+ "7ad5787f.1c20f8",
+ "b6f779a3.cc7ed8",
+ "f695f05e.abf31"
]
]
},
{
- "id": "bc5a2382.4973",
+ "id": "7ad5787f.1c20f8",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 835.9999389648438,
- "y": 528.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 879.9999389648438,
+ "y": 861.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "84f0dd88.8438",
+ "id": "b6f779a3.cc7ed8",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 838.9999389648438,
- "y": 571.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 918.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f44a47b3.3aa128"
+ "1a65bc45.b2fcb4"
]
]
},
{
- "id": "f44a47b3.3aa128",
+ "id": "1a65bc45.b2fcb4",
"type": "execute",
"name": "execute reqExecResult",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1025.9999389648438,
- "y": 570.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1064.9999389648438,
+ "y": 917.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "dd2fe7e6.957248",
- "6913b982.6c9bb8"
+ "5b0d24c6.9eb0ac",
+ "2b5e4322.1d495c"
]
]
},
{
- "id": "895a0a53.e12ea8",
+ "id": "bb8a76ca.fb7058",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 581.9999389648438,
- "y": 439.0000534057617,
- "z": "af8f5cdd.6e4de",
+ "x": 593.9999389648438,
+ "y": 776.0000915527344,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "f279f5b8.9d49b8",
+ "id": "734b2c42.973ee4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 583.9999389648438,
- "y": 491.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 595.9999389648438,
+ "y": 828.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f7db5396.7b5f1"
+ "f17ff2aa.67075"
]
]
},
{
- "id": "dd2fe7e6.957248",
+ "id": "5b0d24c6.9eb0ac",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1189.9999389648438,
- "y": 542.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1233.9999389648438,
+ "y": 875.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "ffd4aab1.e3c4b8",
+ "id": "f695f05e.abf31",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 832.9999389648438,
- "y": 486.00006103515625,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 819.0000686645508,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "6913b982.6c9bb8",
+ "id": "2b5e4322.1d495c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1191.9999389648438,
- "y": 597.0000915527344,
- "z": "af8f5cdd.6e4de",
+ "x": 1241.9998779296875,
+ "y": 923.0001220703125,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "14c8dea1.b5b7a1"
+ "db1e6d62.a1404"
]
]
},
{
- "id": "a32993f8.f8215",
+ "id": "c1a2b259.11e46",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
"comments": "",
- "x": 1467.9998779296875,
- "y": 648.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 1535.9998779296875,
+ "y": 980.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "d8c3f83d.d0b9d8",
+ "id": "566f9779.c05d38",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 153,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 83,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c220826b.91906"
+ "5c791eb8.0072b"
]
]
},
{
- "id": "e635fd5d.f4087",
+ "id": "5ccc8e8d.06e5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 139.91668701171875,
- "y": 241.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 80.91668701171875,
+ "y": 239.08334350585938,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "810e1e54.dec1c",
- "ee1802be.c5c18",
- "e8d3b31a.f46c6",
- "4d7f56db.9375c8"
+ "3503ece1.d7ad14",
+ "dc18f7c9.2e4ac8",
+ "814875d2.cac108",
+ "e9d89bdf.30f7a8",
+ "69e97f86.e07ef",
+ "fa9a8e1f.bba53",
+ "baba22fc.1ceb5",
+ "81510405.ca8868"
]
]
},
{
- "id": "ee1802be.c5c18",
+ "id": "dc18f7c9.2e4ac8",
"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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 328.00001525878906,
- "y": 225.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 379.0000305175781,
+ "y": 272.0833435058594,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "3830f5d4.87f1aa",
+ "id": "70d1c79a.089af8",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1222.9999389648438,
- "y": 371.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1545.9998779296875,
+ "y": 725.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1566d659.a0655a"
+ "d776c76b.1dd188"
]
]
},
{
- "id": "1566d659.a0655a",
+ "id": "d776c76b.1dd188",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1392.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1715.9998168945312,
+ "y": 724.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "22f8bfd0.6139e"
+ "eac6c260.d11fc"
]
]
},
{
- "id": "80cc4946.3f0f78",
+ "id": "2b54a991.b17b16",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1025.9998779296875,
- "y": 395.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1348.9998168945312,
+ "y": 749.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "3830f5d4.87f1aa",
- "fedbb5e6.fb3c28",
- "898f667e.daf2e8"
+ "70d1c79a.089af8",
+ "7970fcd5.6f11b4",
+ "3d8934f9.d0339c"
]
]
},
{
- "id": "7ce48bed.5b7c74",
+ "id": "e790e11b.4f947",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1488.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1546.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "37e7fa80.2728b6"
+ "2e13891.034f576"
]
]
},
{
- "id": "37e7fa80.2728b6",
+ "id": "2e13891.034f576",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1648.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1714.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "47c7511a.dd8fe"
+ "30475e40.9b8be2"
]
]
},
{
- "id": "22f8bfd0.6139e",
+ "id": "eac6c260.d11fc",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1524.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1835.9998779296875,
+ "y": 723.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "fedbb5e6.fb3c28",
+ "id": "7970fcd5.6f11b4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
"comments": "",
- "x": 1197.9165649414062,
- "y": 408.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1527.91650390625,
+ "y": 776.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "47c7511a.dd8fe",
+ "id": "30475e40.9b8be2",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1769.9166259765625,
- "y": 598.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1842.9166259765625,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "898f667e.daf2e8",
+ "id": "3d8934f9.d0339c",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$resume-traffic-input.common-header.request-id + '-' + $resume-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='resume-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$resume-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$resume-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$resume-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$resume-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$resume-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$resume-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$resume-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1174.9999389648438,
- "y": 318.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1532.9998779296875,
+ "y": 672.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "14c8dea1.b5b7a1",
+ "id": "db1e6d62.a1404",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1317.9998779296875,
- "y": 596.0833435058594,
- "z": "af8f5cdd.6e4de",
+ "x": 1369.9998779296875,
+ "y": 924.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "7ce48bed.5b7c74",
- "70a28c6a.563d24",
- "a32993f8.f8215"
+ "e790e11b.4f947",
+ "3a3f1d44.898da2",
+ "c1a2b259.11e46"
]
]
},
{
- "id": "70a28c6a.563d24",
+ "id": "3a3f1d44.898da2",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$resume-traffic-input.common-header.request-id + '-' + $resume-traffic-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='resume-traffic'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$resume-traffic-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$resume-traffic-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$resume-traffic-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$resume-traffic-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$resume-traffic-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$resume-traffic-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$resume-traffic-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$resume-traffic-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1448.1666259765625,
- "y": 549.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1536.1666259765625,
+ "y": 875.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "fa759954.4e2068",
+ "id": "a457fe79.46497",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 577.9999389648438,
- "y": 392.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 602.9999389648438,
+ "y": 728.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "ed41675d.59c088"
+ "3d4c2c9a.7b1324"
]
]
},
{
- "id": "756c2e53.ca6d7",
+ "id": "d512629f.bc625",
"type": "set",
"name": "set Defaults",
"xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
"comments": "",
- "x": 1009.9999389648438,
- "y": 297.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 893.9999389648438,
+ "y": 687,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "ed41675d.59c088",
+ "id": "3d4c2c9a.7b1324",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 761.9999389648438,
- "y": 384.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 739.9999389648438,
+ "y": 722.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "756c2e53.ca6d7",
- "80cc4946.3f0f78"
+ "d512629f.bc625",
+ "2b54a991.b17b16"
]
]
},
{
- "id": "e8d3b31a.f46c6",
+ "id": "814875d2.cac108",
"type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+ "name": "set default values",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
"comments": "",
- "x": 336,
- "y": 269,
- "z": "af8f5cdd.6e4de",
+ "x": 372,
+ "y": 319,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "4d7f56db.9375c8",
+ "id": "442dbdff.6dfcb4",
"type": "get-resource",
- "name": "get aai.generic-vnf by vnf-id",
+ "name": "get aai.generic-vnf ",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $resume-traffic-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
"comments": "",
"outputs": 1,
- "x": 349.0000305175781,
- "y": 325,
- "z": "af8f5cdd.6e4de",
+ "x": 912,
+ "y": 495,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "fa69a126.2a554",
- "f9cb9963.f9e368"
+ "1e57cb28.122ad5"
]
]
},
{
- "id": "fa69a126.2a554",
- "type": "failure",
+ "id": "1e57cb28.122ad5",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1070.3907470703125,
+ "y": 493.28399658203125,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "5a65efc0.bf413"
+ ]
+ ]
+ },
+ {
+ "id": "baba22fc.1ceb5",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 300.9998779296875,
+ "y": 683,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "69e97f86.e07ef",
+ "type": "switchNode",
+ "name": "switch pnf-flag",
+ "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 354,
+ "y": 420,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "e43265e9.4c7f38",
+ "d78c93da.7125f"
+ ]
+ ]
+ },
+ {
+ "id": "e9d89bdf.30f7a8",
+ "type": "execute",
+ "name": "execute jsonStringToCtx",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='resume-traffic-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 386,
+ "y": 366,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "e43265e9.4c7f38",
+ "type": "outcome",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 551,
+ "y": 399,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "abbc4ae4.be5328"
+ ]
+ ]
+ },
+ {
+ "id": "d78c93da.7125f",
+ "type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 589.86083984375,
- "y": 312.53564453125,
- "z": "af8f5cdd.6e4de",
+ "x": 550.9999389648438,
+ "y": 460,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "2d1a88c6.11f9d8"
+ "f68ee407.ca6d88"
]
]
},
{
- "id": "f9cb9963.f9e368",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
+ "id": "f68ee407.ca6d88",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 591.3908081054688,
- "y": 260.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 698.9999389648438,
+ "y": 459,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c4d4de4d.3e19f"
+ "442dbdff.6dfcb4",
+ "80c560bb.eea5f"
]
]
},
{
- "id": "c4d4de4d.3e19f",
+ "id": "abbc4ae4.be5328",
+ "type": "set",
+ "name": "set AnsibleReq",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.resume-traffic.playbookname`'/>\n",
+ "comments": "",
+ "x": 712,
+ "y": 397,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "80c560bb.eea5f",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.resume-traffic.playbookname'`\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 921,
+ "y": 439,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fa9a8e1f.bba53",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 351,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "1a5624d2.74e98b"
+ ]
+ ]
+ },
+ {
+ "id": "1a5624d2.74e98b",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 522,
+ "y": 552,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "524c17a1.30fbf8"
+ ]
+ ]
+ },
+ {
+ "id": "524c17a1.30fbf8",
+ "type": "set",
+ "name": "set playbookname",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.resume-traffic.playbookname`'/>",
+ "comments": "",
+ "x": 712,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "81510405.ca8868",
+ "type": "switchNode",
+ "name": "switch nodelist",
+ "xml": "<switch test='`$nodelist`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 341,
+ "y": 610,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "7a126f.d2de2d9",
+ "8743a074.e8506"
+ ]
+ ]
+ },
+ {
+ "id": "7a126f.d2de2d9",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 521,
+ "y": 603,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "c954af6f.c34df",
"type": "set",
"name": "set nodelist",
- "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 740.3908081054688,
- "y": 259.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 678,
+ "y": 617,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "2d1a88c6.11f9d8",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+ "id": "8743a074.e8506",
+ "type": "outcome",
+ "name": "empty",
+ "xml": "<outcome value=\"['']\">\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 520,
+ "y": 647,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "90b2891b.001708",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1396,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c9dd0d76.432f7"
+ ]
+ ]
+ },
+ {
+ "id": "c9dd0d76.432f7",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1574,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "6ea15b2b.d9cd74"
+ ]
+ ]
+ },
+ {
+ "id": "9706bdee.6acf9",
+ "type": "set",
+ "name": "set nodelist",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "comments": "",
+ "x": 1369,
+ "y": 535,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "5a65efc0.bf413",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1199,
+ "y": 492,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "90b2891b.001708",
+ "9706bdee.6acf9"
+ ]
+ ]
+ },
+ {
+ "id": "6ea15b2b.d9cd74",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.resume-traffic.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 736,
- "y": 312,
- "z": "af8f5cdd.6e4de",
+ "x": 1746,
+ "y": 480,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
diff --git a/platform-logic/lcm/src/main/json/LCM_snapshot.json b/platform-logic/lcm/src/main/json/LCM_snapshot.json
index 549425c6..76bb844c 100644
--- a/platform-logic/lcm/src/main/json/LCM_snapshot.json
+++ b/platform-logic/lcm/src/main/json/LCM_snapshot.json
@@ -1,194 +1,164 @@
-[
- {
- "id": "85add9d3.6d38c8",
- "type": "method",
- "name": "snapshot",
- "xml": "<method rpc='snapshot' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 535.5,
- "y": 83,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "a726273f.d4087"
- ]
- ]
- },
- {
- "id": "6cc2acd4.57558c",
- "type": "service-logic",
- "name": "LCM ${project.version}",
- "module": "LCM",
- "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='LCM' version='${project.version}'>",
- "outputs": 1,
- "x": 306.49993896484375,
- "y": 84,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "85add9d3.6d38c8"
- ]
- ]
- },
- {
- "id": "3b5bd72a.fb19f8",
- "type": "returnSuccess",
- "name": "return success",
- "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
- "comments": "",
- "x": 388.5,
- "y": 472,
- "z": "1bef9bfd.091c84",
- "wires": []
- },
- {
- "id": "7bee7647.02e808",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 103.5,
- "y": 83,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "6cc2acd4.57558c"
- ]
- ]
- },
- {
- "id": "a726273f.d4087",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 139.41668701171875,
- "y": 237.08334350585938,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "c733c1eb.f6dc98",
- "8a3a4a22.8cd238",
- "5c905e45.08ff1",
- "ff16f6f7.bb02d",
- "3b5bd72a.fb19f8"
- ]
- ]
- },
- {
- "id": "c733c1eb.f6dc98",
- "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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
- "comments": "",
- "outputs": 1,
- "x": 426.5,
- "y": 222.08334350585938,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "ff16f6f7.bb02d",
- "type": "execute",
- "name": "execute DmaapMsg",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 402.5,
- "y": 399.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "4150232b.d9de94"
- ]
- ]
- },
- {
- "id": "4150232b.d9de94",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 611.5,
- "y": 397.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "1c38db15.1f052d"
- ]
- ]
- },
- {
- "id": "f6eb674d.c21",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1506.9999389648438,
- "y": 415.0833511352539,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "db43d1c.5a1cab"
- ]
- ]
- },
- {
- "id": "1c38db15.1f052d",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
- "comments": "",
- "outputs": 1,
- "x": 771.5,
- "y": 397.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "db43d1c.5a1cab",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
- "comments": "",
- "outputs": 1,
- "x": 1628.4166870117188,
- "y": 416.0833511352539,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "5c905e45.08ff1",
- "type": "set",
- "name": "set",
- "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$snapshot-input.common-header.request-id + '-' + $snapshot-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='snapshot'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$snapshot-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$snapshot-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$snapshot-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$snapshot-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$snapshot-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$snapshot-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Snapshot Mock returns success'/>\n",
- "comments": "",
- "x": 374.5,
- "y": 331.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": []
- },
- {
- "id": "8a3a4a22.8cd238",
- "type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
- "comments": "",
- "x": 428.5,
- "y": 274,
- "z": "1bef9bfd.091c84",
- "wires": []
- }
-]
+[
+ {
+ "id": "c36c1e82.e47c",
+ "type": "method",
+ "name": "snapshot",
+ "xml": "<method rpc='snapshot' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 530,
+ "y": 121,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "ea26f1ed.e963b"
+ ]
+ ]
+ },
+ {
+ "id": "4c2264b2.81a61c",
+ "type": "service-logic",
+ "name": "LCM ${project.version}",
+ "module": "LCM",
+ "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='LCM' version='${project.version}'>",
+ "outputs": 1,
+ "x": 300.99993896484375,
+ "y": 122,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "c36c1e82.e47c"
+ ]
+ ]
+ },
+ {
+ "id": "a3360ab0.ce42c8",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Snapshot Mock returns success'/>",
+ "comments": "",
+ "x": 383,
+ "y": 510,
+ "z": "a439ae77.f8998",
+ "wires": []
+ },
+ {
+ "id": "7e67863d.7c42f8",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 98,
+ "y": 121,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "4c2264b2.81a61c"
+ ]
+ ]
+ },
+ {
+ "id": "ea26f1ed.e963b",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 133.91668701171875,
+ "y": 275.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "f1d5fb31.fa3878",
+ "625601b.39b33",
+ "786cf009.ea481",
+ "cd184491.d656e8",
+ "a3360ab0.ce42c8"
+ ]
+ ]
+ },
+ {
+ "id": "f1d5fb31.fa3878",
+ "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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 421,
+ "y": 260.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "cd184491.d656e8",
+ "type": "execute",
+ "name": "execute DmaapMsg",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 397,
+ "y": 437.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "91133c94.04e29"
+ ]
+ ]
+ },
+ {
+ "id": "91133c94.04e29",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 606,
+ "y": 435.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "f3b86bb6.9cf808"
+ ]
+ ]
+ },
+ {
+ "id": "f3b86bb6.9cf808",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 766,
+ "y": 435.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "786cf009.ea481",
+ "type": "set",
+ "name": "set",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$snapshot-input.common-header.request-id + '-' + $snapshot-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='snapshot'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$snapshot-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$snapshot-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$snapshot-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$snapshot-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$snapshot-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$snapshot-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$snapshot-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Snapshot Mock returns success'/>\n",
+ "comments": "",
+ "x": 369,
+ "y": 369.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": []
+ },
+ {
+ "id": "625601b.39b33",
+ "type": "set",
+ "name": "set default status value",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+ "comments": "",
+ "x": 423,
+ "y": 312,
+ "z": "a439ae77.f8998",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_unlock.json b/platform-logic/lcm/src/main/json/LCM_unlock.json
index 827259d9..98d391d7 100644
--- a/platform-logic/lcm/src/main/json/LCM_unlock.json
+++ b/platform-logic/lcm/src/main/json/LCM_unlock.json
@@ -1,194 +1,164 @@
-[
- {
- "id": "85add9d3.6d38c8",
- "type": "method",
- "name": "unlock",
- "xml": "<method rpc='unlock' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 535.5,
- "y": 83,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "a726273f.d4087"
- ]
- ]
- },
- {
- "id": "6cc2acd4.57558c",
- "type": "service-logic",
- "name": "LCM ${project.version}",
- "module": "LCM",
- "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='LCM' version='${project.version}'>",
- "outputs": 1,
- "x": 306.49993896484375,
- "y": 84,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "85add9d3.6d38c8"
- ]
- ]
- },
- {
- "id": "3b5bd72a.fb19f8",
- "type": "returnSuccess",
- "name": "return success",
- "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Unlock Mock returns success'/>",
- "comments": "",
- "x": 388.5,
- "y": 472,
- "z": "1bef9bfd.091c84",
- "wires": []
- },
- {
- "id": "7bee7647.02e808",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 103.5,
- "y": 83,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "6cc2acd4.57558c"
- ]
- ]
- },
- {
- "id": "a726273f.d4087",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 139.41668701171875,
- "y": 237.08334350585938,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "c733c1eb.f6dc98",
- "8a3a4a22.8cd238",
- "5c905e45.08ff1",
- "ff16f6f7.bb02d",
- "3b5bd72a.fb19f8"
- ]
- ]
- },
- {
- "id": "c733c1eb.f6dc98",
- "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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
- "comments": "",
- "outputs": 1,
- "x": 426.5,
- "y": 222.08334350585938,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "ff16f6f7.bb02d",
- "type": "execute",
- "name": "execute DmaapMsg",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 402.5,
- "y": 399.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "4150232b.d9de94"
- ]
- ]
- },
- {
- "id": "4150232b.d9de94",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 611.5,
- "y": 397.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "1c38db15.1f052d"
- ]
- ]
- },
- {
- "id": "f6eb674d.c21",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1506.9999389648438,
- "y": 415.0833511352539,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "db43d1c.5a1cab"
- ]
- ]
- },
- {
- "id": "1c38db15.1f052d",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
- "comments": "",
- "outputs": 1,
- "x": 771.5,
- "y": 397.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "db43d1c.5a1cab",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
- "comments": "",
- "outputs": 1,
- "x": 1628.4166870117188,
- "y": 416.0833511352539,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "5c905e45.08ff1",
- "type": "set",
- "name": "set",
- "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$unlock-input.common-header.request-id + '-' + $unlock-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='unlock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$unlock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$unlock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$unlock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$unlock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>\n",
- "comments": "",
- "x": 374.5,
- "y": 331.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": []
- },
- {
- "id": "8a3a4a22.8cd238",
- "type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
- "comments": "",
- "x": 428.5,
- "y": 274,
- "z": "1bef9bfd.091c84",
- "wires": []
- }
-]
+[
+ {
+ "id": "c36c1e82.e47c",
+ "type": "method",
+ "name": "unlock",
+ "xml": "<method rpc='unlock' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 530,
+ "y": 121,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "ea26f1ed.e963b"
+ ]
+ ]
+ },
+ {
+ "id": "4c2264b2.81a61c",
+ "type": "service-logic",
+ "name": "LCM ${project.version}",
+ "module": "LCM",
+ "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='LCM' version='${project.version}'>",
+ "outputs": 1,
+ "x": 300.99993896484375,
+ "y": 122,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "c36c1e82.e47c"
+ ]
+ ]
+ },
+ {
+ "id": "a3360ab0.ce42c8",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Unlock Mock returns success'/>",
+ "comments": "",
+ "x": 383,
+ "y": 510,
+ "z": "a439ae77.f8998",
+ "wires": []
+ },
+ {
+ "id": "7e67863d.7c42f8",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 98,
+ "y": 121,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "4c2264b2.81a61c"
+ ]
+ ]
+ },
+ {
+ "id": "ea26f1ed.e963b",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 133.91668701171875,
+ "y": 275.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "f1d5fb31.fa3878",
+ "625601b.39b33",
+ "786cf009.ea481",
+ "cd184491.d656e8",
+ "a3360ab0.ce42c8"
+ ]
+ ]
+ },
+ {
+ "id": "f1d5fb31.fa3878",
+ "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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 421,
+ "y": 260.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "cd184491.d656e8",
+ "type": "execute",
+ "name": "execute DmaapMsg",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 397,
+ "y": 437.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "91133c94.04e29"
+ ]
+ ]
+ },
+ {
+ "id": "91133c94.04e29",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 606,
+ "y": 435.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "f3b86bb6.9cf808"
+ ]
+ ]
+ },
+ {
+ "id": "f3b86bb6.9cf808",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 766,
+ "y": 435.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "786cf009.ea481",
+ "type": "set",
+ "name": "set",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$unlock-input.common-header.request-id + '-' + $unlock-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='unlock'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$unlock-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$unlock-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$unlock-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$unlock-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$unlock-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Unlock Mock returns success'/>\n",
+ "comments": "",
+ "x": 369,
+ "y": 369.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": []
+ },
+ {
+ "id": "625601b.39b33",
+ "type": "set",
+ "name": "set default status value",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+ "comments": "",
+ "x": 423,
+ "y": 312,
+ "z": "a439ae77.f8998",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json b/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
index 42534d67..d45b3d11 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-backup.json
@@ -1,194 +1,164 @@
-[
- {
- "id": "85add9d3.6d38c8",
- "type": "method",
- "name": "upgrade-backup",
- "xml": "<method rpc='upgrade-backup' mode='sync'>\n",
- "comments": "",
- "outputs": 1,
- "x": 535.5,
- "y": 83,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "a726273f.d4087"
- ]
- ]
- },
- {
- "id": "6cc2acd4.57558c",
- "type": "service-logic",
- "name": "LCM ${project.version}",
- "module": "LCM",
- "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='LCM' version='${project.version}'>",
- "outputs": 1,
- "x": 306.49993896484375,
- "y": 84,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "85add9d3.6d38c8"
- ]
- ]
- },
- {
- "id": "3b5bd72a.fb19f8",
- "type": "returnSuccess",
- "name": "return success",
- "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Lock Mock returns success'/>",
- "comments": "",
- "x": 388.5,
- "y": 472,
- "z": "1bef9bfd.091c84",
- "wires": []
- },
- {
- "id": "7bee7647.02e808",
- "type": "dgstart",
- "name": "DGSTART",
- "outputs": 1,
- "x": 103.5,
- "y": 83,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "6cc2acd4.57558c"
- ]
- ]
- },
- {
- "id": "a726273f.d4087",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 139.41668701171875,
- "y": 237.08334350585938,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "c733c1eb.f6dc98",
- "8a3a4a22.8cd238",
- "5c905e45.08ff1",
- "ff16f6f7.bb02d",
- "3b5bd72a.fb19f8"
- ]
- ]
- },
- {
- "id": "c733c1eb.f6dc98",
- "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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
- "comments": "",
- "outputs": 1,
- "x": 426.5,
- "y": 222.08334350585938,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "ff16f6f7.bb02d",
- "type": "execute",
- "name": "execute DmaapMsg",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
- "comments": "",
- "outputs": 1,
- "x": 402.5,
- "y": 399.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "4150232b.d9de94"
- ]
- ]
- },
- {
- "id": "4150232b.d9de94",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 611.5,
- "y": 397.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "1c38db15.1f052d"
- ]
- ]
- },
- {
- "id": "f6eb674d.c21",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1506.9999389648438,
- "y": 415.0833511352539,
- "z": "1bef9bfd.091c84",
- "wires": [
- [
- "db43d1c.5a1cab"
- ]
- ]
- },
- {
- "id": "1c38db15.1f052d",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
- "comments": "",
- "outputs": 1,
- "x": 771.5,
- "y": 397.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "db43d1c.5a1cab",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
- "comments": "",
- "outputs": 1,
- "x": 1628.4166870117188,
- "y": 416.0833511352539,
- "z": "1bef9bfd.091c84",
- "wires": [
- []
- ]
- },
- {
- "id": "5c905e45.08ff1",
- "type": "set",
- "name": "set",
- "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-backup-input.common-header.request-id + '-' + $upgrade-backup-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-backup'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-backup-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-backup-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-backup-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-backup-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>\n",
- "comments": "",
- "x": 374.5,
- "y": 331.0833435058594,
- "z": "1bef9bfd.091c84",
- "wires": []
- },
- {
- "id": "8a3a4a22.8cd238",
- "type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
- "comments": "",
- "x": 428.5,
- "y": 274,
- "z": "1bef9bfd.091c84",
- "wires": []
- }
-]
+[
+ {
+ "id": "c36c1e82.e47c",
+ "type": "method",
+ "name": "upgrade-backup",
+ "xml": "<method rpc='upgrade-backup' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 530,
+ "y": 121,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "ea26f1ed.e963b"
+ ]
+ ]
+ },
+ {
+ "id": "4c2264b2.81a61c",
+ "type": "service-logic",
+ "name": "LCM ${project.version}",
+ "module": "LCM",
+ "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='LCM' version='${project.version}'>",
+ "outputs": 1,
+ "x": 300.99993896484375,
+ "y": 122,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "c36c1e82.e47c"
+ ]
+ ]
+ },
+ {
+ "id": "a3360ab0.ce42c8",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name='status.code' value='400' />\n<parameter name='status.message' value='SDNC Upgrade-backup Mock returns success'/>",
+ "comments": "",
+ "x": 383,
+ "y": 510,
+ "z": "a439ae77.f8998",
+ "wires": []
+ },
+ {
+ "id": "7e67863d.7c42f8",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 98,
+ "y": 121,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "4c2264b2.81a61c"
+ ]
+ ]
+ },
+ {
+ "id": "ea26f1ed.e963b",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 133.91668701171875,
+ "y": 275.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "f1d5fb31.fa3878",
+ "625601b.39b33",
+ "786cf009.ea481",
+ "cd184491.d656e8",
+ "a3360ab0.ce42c8"
+ ]
+ ]
+ },
+ {
+ "id": "f1d5fb31.fa3878",
+ "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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 421,
+ "y": 260.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "cd184491.d656e8",
+ "type": "execute",
+ "name": "execute DmaapMsg",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 397,
+ "y": 437.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "91133c94.04e29"
+ ]
+ ]
+ },
+ {
+ "id": "91133c94.04e29",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 606,
+ "y": 435.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ [
+ "f3b86bb6.9cf808"
+ ]
+ ]
+ },
+ {
+ "id": "f3b86bb6.9cf808",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 766,
+ "y": 435.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "786cf009.ea481",
+ "type": "set",
+ "name": "set",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-backup-input.common-header.request-id + '-' + $upgrade-backup-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-backup'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-backup-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-backup-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-backup-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-backup-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-backup-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>\n",
+ "comments": "",
+ "x": 369,
+ "y": 369.0833435058594,
+ "z": "a439ae77.f8998",
+ "wires": []
+ },
+ {
+ "id": "625601b.39b33",
+ "type": "set",
+ "name": "set default status value",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+ "comments": "",
+ "x": 423,
+ "y": 312,
+ "z": "a439ae77.f8998",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
index 60fe6a61..38086480 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
@@ -1,22 +1,22 @@
[
{
- "id": "1a420388.7ce24c",
+ "id": "fab0f7ed.c486b8",
"type": "method",
"name": "upgrade-post-check",
"xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 550,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 480,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "e635fd5d.f4087"
+ "5ccc8e8d.06e5"
]
]
},
{
- "id": "c220826b.91906",
+ "id": "5c791eb8.0072b",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,528 +24,788 @@
"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='LCM' version='${project.version}'>",
"outputs": 1,
- "x": 337.99993896484375,
- "y": 103,
- "z": "af8f5cdd.6e4de",
+ "x": 267.99993896484375,
+ "y": 148,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1a420388.7ce24c"
+ "fab0f7ed.c486b8"
]
]
},
{
- "id": "810e1e54.dec1c",
+ "id": "3503ece1.d7ad14",
"type": "execute",
"name": "execute AnsibleA.reqExec",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 345.00001525878906,
- "y": 379,
- "z": "af8f5cdd.6e4de",
+ "x": 335.00001525878906,
+ "y": 755,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f279f5b8.9d49b8",
- "895a0a53.e12ea8",
- "fa759954.4e2068"
+ "734b2c42.973ee4",
+ "bb8a76ca.fb7058",
+ "a457fe79.46497"
]
]
},
{
- "id": "f7db5396.7b5f1",
+ "id": "f17ff2aa.67075",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 690.9999389648438,
- "y": 530.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 734.9999389648438,
+ "y": 863.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "bc5a2382.4973",
- "84f0dd88.8438",
- "ffd4aab1.e3c4b8"
+ "7ad5787f.1c20f8",
+ "b6f779a3.cc7ed8",
+ "f695f05e.abf31"
]
]
},
{
- "id": "bc5a2382.4973",
+ "id": "7ad5787f.1c20f8",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 835.9999389648438,
- "y": 528.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 879.9999389648438,
+ "y": 861.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "84f0dd88.8438",
+ "id": "b6f779a3.cc7ed8",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 838.9999389648438,
- "y": 571.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 918.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f44a47b3.3aa128"
+ "1a65bc45.b2fcb4"
]
]
},
{
- "id": "f44a47b3.3aa128",
+ "id": "1a65bc45.b2fcb4",
"type": "execute",
"name": "execute reqExecResult",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1025.9999389648438,
- "y": 570.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1064.9999389648438,
+ "y": 917.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "dd2fe7e6.957248",
- "6913b982.6c9bb8"
+ "5b0d24c6.9eb0ac",
+ "2b5e4322.1d495c"
]
]
},
{
- "id": "895a0a53.e12ea8",
+ "id": "bb8a76ca.fb7058",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 581.9999389648438,
- "y": 439.0000534057617,
- "z": "af8f5cdd.6e4de",
+ "x": 593.9999389648438,
+ "y": 776.0000915527344,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "f279f5b8.9d49b8",
+ "id": "734b2c42.973ee4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 583.9999389648438,
- "y": 491.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 595.9999389648438,
+ "y": 828.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f7db5396.7b5f1"
+ "f17ff2aa.67075"
]
]
},
{
- "id": "dd2fe7e6.957248",
+ "id": "5b0d24c6.9eb0ac",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1189.9999389648438,
- "y": 542.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1233.9999389648438,
+ "y": 875.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "ffd4aab1.e3c4b8",
+ "id": "f695f05e.abf31",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 832.9999389648438,
- "y": 486.00006103515625,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 819.0000686645508,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "6913b982.6c9bb8",
+ "id": "2b5e4322.1d495c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1191.9999389648438,
- "y": 597.0000915527344,
- "z": "af8f5cdd.6e4de",
+ "x": 1241.9998779296875,
+ "y": 923.0001220703125,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "14c8dea1.b5b7a1"
+ "db1e6d62.a1404"
]
]
},
{
- "id": "a32993f8.f8215",
+ "id": "c1a2b259.11e46",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
"comments": "",
- "x": 1467.9998779296875,
- "y": 648.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 1535.9998779296875,
+ "y": 980.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "d8c3f83d.d0b9d8",
+ "id": "566f9779.c05d38",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 153,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 83,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c220826b.91906"
+ "5c791eb8.0072b"
]
]
},
{
- "id": "e635fd5d.f4087",
+ "id": "5ccc8e8d.06e5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 139.91668701171875,
- "y": 241.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 80.91668701171875,
+ "y": 239.08334350585938,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "810e1e54.dec1c",
- "ee1802be.c5c18",
- "e8d3b31a.f46c6",
- "4d7f56db.9375c8"
+ "3503ece1.d7ad14",
+ "dc18f7c9.2e4ac8",
+ "814875d2.cac108",
+ "e9d89bdf.30f7a8",
+ "69e97f86.e07ef",
+ "fa9a8e1f.bba53",
+ "baba22fc.1ceb5",
+ "81510405.ca8868"
]
]
},
{
- "id": "ee1802be.c5c18",
+ "id": "dc18f7c9.2e4ac8",
"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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 328.00001525878906,
- "y": 225.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 379.0000305175781,
+ "y": 272.0833435058594,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "3830f5d4.87f1aa",
+ "id": "70d1c79a.089af8",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1222.9999389648438,
- "y": 371.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1545.9998779296875,
+ "y": 725.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1566d659.a0655a"
+ "d776c76b.1dd188"
]
]
},
{
- "id": "1566d659.a0655a",
+ "id": "d776c76b.1dd188",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1392.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1715.9998168945312,
+ "y": 724.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "22f8bfd0.6139e"
+ "eac6c260.d11fc"
]
]
},
{
- "id": "80cc4946.3f0f78",
+ "id": "2b54a991.b17b16",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1025.9998779296875,
- "y": 395.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1348.9998168945312,
+ "y": 749.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "3830f5d4.87f1aa",
- "fedbb5e6.fb3c28",
- "898f667e.daf2e8"
+ "70d1c79a.089af8",
+ "7970fcd5.6f11b4",
+ "3d8934f9.d0339c"
]
]
},
{
- "id": "7ce48bed.5b7c74",
+ "id": "e790e11b.4f947",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1488.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1546.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "37e7fa80.2728b6"
+ "2e13891.034f576"
]
]
},
{
- "id": "37e7fa80.2728b6",
+ "id": "2e13891.034f576",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1648.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1714.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "47c7511a.dd8fe"
+ "30475e40.9b8be2"
]
]
},
{
- "id": "22f8bfd0.6139e",
+ "id": "eac6c260.d11fc",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1524.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1835.9998779296875,
+ "y": 723.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "fedbb5e6.fb3c28",
+ "id": "7970fcd5.6f11b4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
"comments": "",
- "x": 1197.9165649414062,
- "y": 408.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1527.91650390625,
+ "y": 776.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "47c7511a.dd8fe",
+ "id": "30475e40.9b8be2",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1769.9166259765625,
- "y": 598.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1842.9166259765625,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "898f667e.daf2e8",
+ "id": "3d8934f9.d0339c",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1174.9999389648438,
- "y": 318.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1532.9998779296875,
+ "y": 672.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "14c8dea1.b5b7a1",
+ "id": "db1e6d62.a1404",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1317.9998779296875,
- "y": 596.0833435058594,
- "z": "af8f5cdd.6e4de",
+ "x": 1369.9998779296875,
+ "y": 924.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "7ce48bed.5b7c74",
- "70a28c6a.563d24",
- "a32993f8.f8215"
+ "e790e11b.4f947",
+ "3a3f1d44.898da2",
+ "c1a2b259.11e46"
]
]
},
{
- "id": "70a28c6a.563d24",
+ "id": "3a3f1d44.898da2",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1448.1666259765625,
- "y": 549.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1536.1666259765625,
+ "y": 875.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "fa759954.4e2068",
+ "id": "a457fe79.46497",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 577.9999389648438,
- "y": 392.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 602.9999389648438,
+ "y": 728.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "ed41675d.59c088"
+ "3d4c2c9a.7b1324"
]
]
},
{
- "id": "756c2e53.ca6d7",
+ "id": "d512629f.bc625",
"type": "set",
"name": "set Defaults",
"xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
"comments": "",
- "x": 1009.9999389648438,
- "y": 297.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 893.9999389648438,
+ "y": 687,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "ed41675d.59c088",
+ "id": "3d4c2c9a.7b1324",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 761.9999389648438,
- "y": 384.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 739.9999389648438,
+ "y": 722.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "756c2e53.ca6d7",
- "80cc4946.3f0f78"
+ "d512629f.bc625",
+ "2b54a991.b17b16"
]
]
},
{
- "id": "e8d3b31a.f46c6",
+ "id": "814875d2.cac108",
"type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+ "name": "set default values",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
"comments": "",
- "x": 336,
- "y": 269,
- "z": "af8f5cdd.6e4de",
+ "x": 372,
+ "y": 319,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "4d7f56db.9375c8",
+ "id": "442dbdff.6dfcb4",
"type": "get-resource",
- "name": "get aai.generic-vnf by vnf-id",
+ "name": "get aai.generic-vnf ",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
"comments": "",
"outputs": 1,
- "x": 349.0000305175781,
- "y": 325,
- "z": "af8f5cdd.6e4de",
+ "x": 912,
+ "y": 495,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "fa69a126.2a554",
- "f9cb9963.f9e368"
+ "1e57cb28.122ad5"
]
]
},
{
- "id": "fa69a126.2a554",
- "type": "failure",
+ "id": "1e57cb28.122ad5",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1070.3907470703125,
+ "y": 493.28399658203125,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "5a65efc0.bf413"
+ ]
+ ]
+ },
+ {
+ "id": "baba22fc.1ceb5",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 300.9998779296875,
+ "y": 683,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "69e97f86.e07ef",
+ "type": "switchNode",
+ "name": "switch pnf-flag",
+ "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 354,
+ "y": 420,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "e43265e9.4c7f38",
+ "d78c93da.7125f"
+ ]
+ ]
+ },
+ {
+ "id": "e9d89bdf.30f7a8",
+ "type": "execute",
+ "name": "execute jsonStringToCtx",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-post-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 386,
+ "y": 366,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "e43265e9.4c7f38",
+ "type": "outcome",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 551,
+ "y": 399,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "abbc4ae4.be5328"
+ ]
+ ]
+ },
+ {
+ "id": "d78c93da.7125f",
+ "type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 589.86083984375,
- "y": 312.53564453125,
- "z": "af8f5cdd.6e4de",
+ "x": 550.9999389648438,
+ "y": 460,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "2d1a88c6.11f9d8"
+ "f68ee407.ca6d88"
]
]
},
{
- "id": "f9cb9963.f9e368",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
+ "id": "f68ee407.ca6d88",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 591.3908081054688,
- "y": 260.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 698.9999389648438,
+ "y": 459,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c4d4de4d.3e19f"
+ "442dbdff.6dfcb4",
+ "80c560bb.eea5f"
]
]
},
{
- "id": "c4d4de4d.3e19f",
+ "id": "abbc4ae4.be5328",
+ "type": "set",
+ "name": "set AnsibleReq",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n",
+ "comments": "",
+ "x": 712,
+ "y": 397,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "80c560bb.eea5f",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 921,
+ "y": 439,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fa9a8e1f.bba53",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 351,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "1a5624d2.74e98b"
+ ]
+ ]
+ },
+ {
+ "id": "1a5624d2.74e98b",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 522,
+ "y": 552,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "524c17a1.30fbf8"
+ ]
+ ]
+ },
+ {
+ "id": "524c17a1.30fbf8",
+ "type": "set",
+ "name": "set playbookname",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
+ "comments": "",
+ "x": 712,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "81510405.ca8868",
+ "type": "switchNode",
+ "name": "switch nodelist",
+ "xml": "<switch test='`$nodelist`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 341,
+ "y": 610,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "7a126f.d2de2d9",
+ "8743a074.e8506"
+ ]
+ ]
+ },
+ {
+ "id": "7a126f.d2de2d9",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 521,
+ "y": 603,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "c954af6f.c34df",
"type": "set",
"name": "set nodelist",
- "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 740.3908081054688,
- "y": 259.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 678,
+ "y": 617,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "2d1a88c6.11f9d8",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+ "id": "8743a074.e8506",
+ "type": "outcome",
+ "name": "empty",
+ "xml": "<outcome value=\"['']\">\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 520,
+ "y": 647,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "90b2891b.001708",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1396,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c9dd0d76.432f7"
+ ]
+ ]
+ },
+ {
+ "id": "c9dd0d76.432f7",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1574,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "6ea15b2b.d9cd74"
+ ]
+ ]
+ },
+ {
+ "id": "9706bdee.6acf9",
+ "type": "set",
+ "name": "set nodelist",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "comments": "",
+ "x": 1369,
+ "y": 535,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "5a65efc0.bf413",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1199,
+ "y": 492,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "90b2891b.001708",
+ "9706bdee.6acf9"
+ ]
+ ]
+ },
+ {
+ "id": "6ea15b2b.d9cd74",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 736,
- "y": 312,
- "z": "af8f5cdd.6e4de",
+ "x": 1746,
+ "y": 480,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
index 4f39f487..8657b538 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
@@ -1,22 +1,22 @@
[
{
- "id": "1a420388.7ce24c",
+ "id": "fab0f7ed.c486b8",
"type": "method",
"name": "upgrade-pre-check",
"xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 550,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 480,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "e635fd5d.f4087"
+ "5ccc8e8d.06e5"
]
]
},
{
- "id": "c220826b.91906",
+ "id": "5c791eb8.0072b",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,528 +24,788 @@
"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='LCM' version='${project.version}'>",
"outputs": 1,
- "x": 337.99993896484375,
- "y": 103,
- "z": "af8f5cdd.6e4de",
+ "x": 267.99993896484375,
+ "y": 148,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1a420388.7ce24c"
+ "fab0f7ed.c486b8"
]
]
},
{
- "id": "810e1e54.dec1c",
+ "id": "3503ece1.d7ad14",
"type": "execute",
"name": "execute AnsibleA.reqExec",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 345.00001525878906,
- "y": 379,
- "z": "af8f5cdd.6e4de",
+ "x": 335.00001525878906,
+ "y": 755,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f279f5b8.9d49b8",
- "895a0a53.e12ea8",
- "fa759954.4e2068"
+ "734b2c42.973ee4",
+ "bb8a76ca.fb7058",
+ "a457fe79.46497"
]
]
},
{
- "id": "f7db5396.7b5f1",
+ "id": "f17ff2aa.67075",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 690.9999389648438,
- "y": 530.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 734.9999389648438,
+ "y": 863.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "bc5a2382.4973",
- "84f0dd88.8438",
- "ffd4aab1.e3c4b8"
+ "7ad5787f.1c20f8",
+ "b6f779a3.cc7ed8",
+ "f695f05e.abf31"
]
]
},
{
- "id": "bc5a2382.4973",
+ "id": "7ad5787f.1c20f8",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 835.9999389648438,
- "y": 528.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 879.9999389648438,
+ "y": 861.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "84f0dd88.8438",
+ "id": "b6f779a3.cc7ed8",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 838.9999389648438,
- "y": 571.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 918.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f44a47b3.3aa128"
+ "1a65bc45.b2fcb4"
]
]
},
{
- "id": "f44a47b3.3aa128",
+ "id": "1a65bc45.b2fcb4",
"type": "execute",
"name": "execute reqExecResult",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1025.9999389648438,
- "y": 570.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1064.9999389648438,
+ "y": 917.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "dd2fe7e6.957248",
- "6913b982.6c9bb8"
+ "5b0d24c6.9eb0ac",
+ "2b5e4322.1d495c"
]
]
},
{
- "id": "895a0a53.e12ea8",
+ "id": "bb8a76ca.fb7058",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 581.9999389648438,
- "y": 439.0000534057617,
- "z": "af8f5cdd.6e4de",
+ "x": 593.9999389648438,
+ "y": 776.0000915527344,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "f279f5b8.9d49b8",
+ "id": "734b2c42.973ee4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 583.9999389648438,
- "y": 491.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 595.9999389648438,
+ "y": 828.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f7db5396.7b5f1"
+ "f17ff2aa.67075"
]
]
},
{
- "id": "dd2fe7e6.957248",
+ "id": "5b0d24c6.9eb0ac",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1189.9999389648438,
- "y": 542.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1233.9999389648438,
+ "y": 875.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "ffd4aab1.e3c4b8",
+ "id": "f695f05e.abf31",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 832.9999389648438,
- "y": 486.00006103515625,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 819.0000686645508,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "6913b982.6c9bb8",
+ "id": "2b5e4322.1d495c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1191.9999389648438,
- "y": 597.0000915527344,
- "z": "af8f5cdd.6e4de",
+ "x": 1241.9998779296875,
+ "y": 923.0001220703125,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "14c8dea1.b5b7a1"
+ "db1e6d62.a1404"
]
]
},
{
- "id": "a32993f8.f8215",
+ "id": "c1a2b259.11e46",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
"comments": "",
- "x": 1467.9998779296875,
- "y": 648.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 1535.9998779296875,
+ "y": 980.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "d8c3f83d.d0b9d8",
+ "id": "566f9779.c05d38",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 153,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 83,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c220826b.91906"
+ "5c791eb8.0072b"
]
]
},
{
- "id": "e635fd5d.f4087",
+ "id": "5ccc8e8d.06e5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 139.91668701171875,
- "y": 241.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 80.91668701171875,
+ "y": 239.08334350585938,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "810e1e54.dec1c",
- "ee1802be.c5c18",
- "e8d3b31a.f46c6",
- "4d7f56db.9375c8"
+ "3503ece1.d7ad14",
+ "dc18f7c9.2e4ac8",
+ "814875d2.cac108",
+ "e9d89bdf.30f7a8",
+ "69e97f86.e07ef",
+ "fa9a8e1f.bba53",
+ "baba22fc.1ceb5",
+ "81510405.ca8868"
]
]
},
{
- "id": "ee1802be.c5c18",
+ "id": "dc18f7c9.2e4ac8",
"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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 328.00001525878906,
- "y": 225.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 379.0000305175781,
+ "y": 272.0833435058594,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "3830f5d4.87f1aa",
+ "id": "70d1c79a.089af8",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1222.9999389648438,
- "y": 371.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1545.9998779296875,
+ "y": 725.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1566d659.a0655a"
+ "d776c76b.1dd188"
]
]
},
{
- "id": "1566d659.a0655a",
+ "id": "d776c76b.1dd188",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1392.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1715.9998168945312,
+ "y": 724.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "22f8bfd0.6139e"
+ "eac6c260.d11fc"
]
]
},
{
- "id": "80cc4946.3f0f78",
+ "id": "2b54a991.b17b16",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1025.9998779296875,
- "y": 395.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1348.9998168945312,
+ "y": 749.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "3830f5d4.87f1aa",
- "fedbb5e6.fb3c28",
- "898f667e.daf2e8"
+ "70d1c79a.089af8",
+ "7970fcd5.6f11b4",
+ "3d8934f9.d0339c"
]
]
},
{
- "id": "7ce48bed.5b7c74",
+ "id": "e790e11b.4f947",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1488.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1546.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "37e7fa80.2728b6"
+ "2e13891.034f576"
]
]
},
{
- "id": "37e7fa80.2728b6",
+ "id": "2e13891.034f576",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1648.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1714.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "47c7511a.dd8fe"
+ "30475e40.9b8be2"
]
]
},
{
- "id": "22f8bfd0.6139e",
+ "id": "eac6c260.d11fc",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1524.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1835.9998779296875,
+ "y": 723.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "fedbb5e6.fb3c28",
+ "id": "7970fcd5.6f11b4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
"comments": "",
- "x": 1197.9165649414062,
- "y": 408.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1527.91650390625,
+ "y": 776.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "47c7511a.dd8fe",
+ "id": "30475e40.9b8be2",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1769.9166259765625,
- "y": 598.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1842.9166259765625,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "898f667e.daf2e8",
+ "id": "3d8934f9.d0339c",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1174.9999389648438,
- "y": 318.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1532.9998779296875,
+ "y": 672.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "14c8dea1.b5b7a1",
+ "id": "db1e6d62.a1404",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1317.9998779296875,
- "y": 596.0833435058594,
- "z": "af8f5cdd.6e4de",
+ "x": 1369.9998779296875,
+ "y": 924.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "7ce48bed.5b7c74",
- "70a28c6a.563d24",
- "a32993f8.f8215"
+ "e790e11b.4f947",
+ "3a3f1d44.898da2",
+ "c1a2b259.11e46"
]
]
},
{
- "id": "70a28c6a.563d24",
+ "id": "3a3f1d44.898da2",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1448.1666259765625,
- "y": 549.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1536.1666259765625,
+ "y": 875.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "fa759954.4e2068",
+ "id": "a457fe79.46497",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 577.9999389648438,
- "y": 392.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 602.9999389648438,
+ "y": 728.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "ed41675d.59c088"
+ "3d4c2c9a.7b1324"
]
]
},
{
- "id": "756c2e53.ca6d7",
+ "id": "d512629f.bc625",
"type": "set",
"name": "set Defaults",
"xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
"comments": "",
- "x": 1009.9999389648438,
- "y": 297.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 893.9999389648438,
+ "y": 687,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "ed41675d.59c088",
+ "id": "3d4c2c9a.7b1324",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 761.9999389648438,
- "y": 384.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 739.9999389648438,
+ "y": 722.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "756c2e53.ca6d7",
- "80cc4946.3f0f78"
+ "d512629f.bc625",
+ "2b54a991.b17b16"
]
]
},
{
- "id": "e8d3b31a.f46c6",
+ "id": "814875d2.cac108",
"type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+ "name": "set default values",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
"comments": "",
- "x": 336,
- "y": 269,
- "z": "af8f5cdd.6e4de",
+ "x": 372,
+ "y": 319,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "4d7f56db.9375c8",
+ "id": "442dbdff.6dfcb4",
"type": "get-resource",
- "name": "get aai.generic-vnf by vnf-id",
+ "name": "get aai.generic-vnf ",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
"comments": "",
"outputs": 1,
- "x": 349.0000305175781,
- "y": 325,
- "z": "af8f5cdd.6e4de",
+ "x": 912,
+ "y": 495,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "fa69a126.2a554",
- "f9cb9963.f9e368"
+ "1e57cb28.122ad5"
]
]
},
{
- "id": "fa69a126.2a554",
- "type": "failure",
+ "id": "1e57cb28.122ad5",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1070.3907470703125,
+ "y": 493.28399658203125,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "5a65efc0.bf413"
+ ]
+ ]
+ },
+ {
+ "id": "baba22fc.1ceb5",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 300.9998779296875,
+ "y": 683,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "69e97f86.e07ef",
+ "type": "switchNode",
+ "name": "switch pnf-flag",
+ "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 354,
+ "y": 420,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "e43265e9.4c7f38",
+ "d78c93da.7125f"
+ ]
+ ]
+ },
+ {
+ "id": "e9d89bdf.30f7a8",
+ "type": "execute",
+ "name": "execute jsonStringToCtx",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-pre-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 386,
+ "y": 366,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "e43265e9.4c7f38",
+ "type": "outcome",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 551,
+ "y": 399,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "abbc4ae4.be5328"
+ ]
+ ]
+ },
+ {
+ "id": "d78c93da.7125f",
+ "type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 589.86083984375,
- "y": 312.53564453125,
- "z": "af8f5cdd.6e4de",
+ "x": 550.9999389648438,
+ "y": 460,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "2d1a88c6.11f9d8"
+ "f68ee407.ca6d88"
]
]
},
{
- "id": "f9cb9963.f9e368",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
+ "id": "f68ee407.ca6d88",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 591.3908081054688,
- "y": 260.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 698.9999389648438,
+ "y": 459,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c4d4de4d.3e19f"
+ "442dbdff.6dfcb4",
+ "80c560bb.eea5f"
]
]
},
{
- "id": "c4d4de4d.3e19f",
+ "id": "abbc4ae4.be5328",
+ "type": "set",
+ "name": "set AnsibleReq",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n",
+ "comments": "",
+ "x": 712,
+ "y": 397,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "80c560bb.eea5f",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 921,
+ "y": 439,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fa9a8e1f.bba53",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 351,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "1a5624d2.74e98b"
+ ]
+ ]
+ },
+ {
+ "id": "1a5624d2.74e98b",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 522,
+ "y": 552,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "524c17a1.30fbf8"
+ ]
+ ]
+ },
+ {
+ "id": "524c17a1.30fbf8",
+ "type": "set",
+ "name": "set playbookname",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
+ "comments": "",
+ "x": 712,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "81510405.ca8868",
+ "type": "switchNode",
+ "name": "switch nodelist",
+ "xml": "<switch test='`$nodelist`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 341,
+ "y": 610,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "7a126f.d2de2d9",
+ "8743a074.e8506"
+ ]
+ ]
+ },
+ {
+ "id": "7a126f.d2de2d9",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 521,
+ "y": 603,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "c954af6f.c34df",
"type": "set",
"name": "set nodelist",
- "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 740.3908081054688,
- "y": 259.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 678,
+ "y": 617,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "2d1a88c6.11f9d8",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+ "id": "8743a074.e8506",
+ "type": "outcome",
+ "name": "empty",
+ "xml": "<outcome value=\"['']\">\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 520,
+ "y": 647,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "90b2891b.001708",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1396,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c9dd0d76.432f7"
+ ]
+ ]
+ },
+ {
+ "id": "c9dd0d76.432f7",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1574,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "6ea15b2b.d9cd74"
+ ]
+ ]
+ },
+ {
+ "id": "9706bdee.6acf9",
+ "type": "set",
+ "name": "set nodelist",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "comments": "",
+ "x": 1369,
+ "y": 535,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "5a65efc0.bf413",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1199,
+ "y": 492,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "90b2891b.001708",
+ "9706bdee.6acf9"
+ ]
+ ]
+ },
+ {
+ "id": "6ea15b2b.d9cd74",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 736,
- "y": 312,
- "z": "af8f5cdd.6e4de",
+ "x": 1746,
+ "y": 480,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
index 95e0638e..0ddbf91e 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
@@ -1,22 +1,22 @@
[
{
- "id": "1a420388.7ce24c",
+ "id": "fab0f7ed.c486b8",
"type": "method",
"name": "upgrade-software",
"xml": "<method rpc='upgrade-software' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 550,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 480,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "e635fd5d.f4087"
+ "5ccc8e8d.06e5"
]
]
},
{
- "id": "c220826b.91906",
+ "id": "5c791eb8.0072b",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,528 +24,788 @@
"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='LCM' version='${project.version}'>",
"outputs": 1,
- "x": 337.99993896484375,
- "y": 103,
- "z": "af8f5cdd.6e4de",
+ "x": 267.99993896484375,
+ "y": 148,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1a420388.7ce24c"
+ "fab0f7ed.c486b8"
]
]
},
{
- "id": "810e1e54.dec1c",
+ "id": "3503ece1.d7ad14",
"type": "execute",
"name": "execute AnsibleA.reqExec",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 345.00001525878906,
- "y": 379,
- "z": "af8f5cdd.6e4de",
+ "x": 335.00001525878906,
+ "y": 755,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f279f5b8.9d49b8",
- "895a0a53.e12ea8",
- "fa759954.4e2068"
+ "734b2c42.973ee4",
+ "bb8a76ca.fb7058",
+ "a457fe79.46497"
]
]
},
{
- "id": "f7db5396.7b5f1",
+ "id": "f17ff2aa.67075",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 690.9999389648438,
- "y": 530.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 734.9999389648438,
+ "y": 863.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "bc5a2382.4973",
- "84f0dd88.8438",
- "ffd4aab1.e3c4b8"
+ "7ad5787f.1c20f8",
+ "b6f779a3.cc7ed8",
+ "f695f05e.abf31"
]
]
},
{
- "id": "bc5a2382.4973",
+ "id": "7ad5787f.1c20f8",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 835.9999389648438,
- "y": 528.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 879.9999389648438,
+ "y": 861.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "84f0dd88.8438",
+ "id": "b6f779a3.cc7ed8",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 838.9999389648438,
- "y": 571.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 918.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f44a47b3.3aa128"
+ "1a65bc45.b2fcb4"
]
]
},
{
- "id": "f44a47b3.3aa128",
+ "id": "1a65bc45.b2fcb4",
"type": "execute",
"name": "execute reqExecResult",
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1025.9999389648438,
- "y": 570.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1064.9999389648438,
+ "y": 917.0000305175781,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "dd2fe7e6.957248",
- "6913b982.6c9bb8"
+ "5b0d24c6.9eb0ac",
+ "2b5e4322.1d495c"
]
]
},
{
- "id": "895a0a53.e12ea8",
+ "id": "bb8a76ca.fb7058",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 581.9999389648438,
- "y": 439.0000534057617,
- "z": "af8f5cdd.6e4de",
+ "x": 593.9999389648438,
+ "y": 776.0000915527344,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "f279f5b8.9d49b8",
+ "id": "734b2c42.973ee4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 583.9999389648438,
- "y": 491.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 595.9999389648438,
+ "y": 828.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "f7db5396.7b5f1"
+ "f17ff2aa.67075"
]
]
},
{
- "id": "dd2fe7e6.957248",
+ "id": "5b0d24c6.9eb0ac",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1189.9999389648438,
- "y": 542.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 1233.9999389648438,
+ "y": 875.0000381469727,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "ffd4aab1.e3c4b8",
+ "id": "f695f05e.abf31",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 832.9999389648438,
- "y": 486.00006103515625,
- "z": "af8f5cdd.6e4de",
+ "x": 876.9999389648438,
+ "y": 819.0000686645508,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "80cc4946.3f0f78"
+ "2b54a991.b17b16"
]
]
},
{
- "id": "6913b982.6c9bb8",
+ "id": "2b5e4322.1d495c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1191.9999389648438,
- "y": 597.0000915527344,
- "z": "af8f5cdd.6e4de",
+ "x": 1241.9998779296875,
+ "y": 923.0001220703125,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "14c8dea1.b5b7a1"
+ "db1e6d62.a1404"
]
]
},
{
- "id": "a32993f8.f8215",
+ "id": "c1a2b259.11e46",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",
"comments": "",
- "x": 1467.9998779296875,
- "y": 648.0000610351562,
- "z": "af8f5cdd.6e4de",
+ "x": 1535.9998779296875,
+ "y": 980.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "d8c3f83d.d0b9d8",
+ "id": "566f9779.c05d38",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 153,
- "y": 102,
- "z": "af8f5cdd.6e4de",
+ "x": 83,
+ "y": 147,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c220826b.91906"
+ "5c791eb8.0072b"
]
]
},
{
- "id": "e635fd5d.f4087",
+ "id": "5ccc8e8d.06e5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 139.91668701171875,
- "y": 241.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 80.91668701171875,
+ "y": 239.08334350585938,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "810e1e54.dec1c",
- "ee1802be.c5c18",
- "e8d3b31a.f46c6",
- "4d7f56db.9375c8"
+ "3503ece1.d7ad14",
+ "dc18f7c9.2e4ac8",
+ "814875d2.cac108",
+ "e9d89bdf.30f7a8",
+ "69e97f86.e07ef",
+ "fa9a8e1f.bba53",
+ "baba22fc.1ceb5",
+ "81510405.ca8868"
]
]
},
{
- "id": "ee1802be.c5c18",
+ "id": "dc18f7c9.2e4ac8",
"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%/lcm-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 328.00001525878906,
- "y": 225.08334350585938,
- "z": "af8f5cdd.6e4de",
+ "x": 379.0000305175781,
+ "y": 272.0833435058594,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "3830f5d4.87f1aa",
+ "id": "70d1c79a.089af8",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1222.9999389648438,
- "y": 371.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1545.9998779296875,
+ "y": 725.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "1566d659.a0655a"
+ "d776c76b.1dd188"
]
]
},
{
- "id": "1566d659.a0655a",
+ "id": "d776c76b.1dd188",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1392.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1715.9998168945312,
+ "y": 724.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "22f8bfd0.6139e"
+ "eac6c260.d11fc"
]
]
},
{
- "id": "80cc4946.3f0f78",
+ "id": "2b54a991.b17b16",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1025.9998779296875,
- "y": 395.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1348.9998168945312,
+ "y": 749.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "3830f5d4.87f1aa",
- "fedbb5e6.fb3c28",
- "898f667e.daf2e8"
+ "70d1c79a.089af8",
+ "7970fcd5.6f11b4",
+ "3d8934f9.d0339c"
]
]
},
{
- "id": "7ce48bed.5b7c74",
+ "id": "e790e11b.4f947",
"type": "execute",
"name": "execute DmaapMsg",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"lcm\" />\n",
"comments": "",
"outputs": 1,
- "x": 1488.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1546.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "37e7fa80.2728b6"
+ "2e13891.034f576"
]
]
},
{
- "id": "37e7fa80.2728b6",
+ "id": "2e13891.034f576",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1648.4998779296875,
- "y": 597.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1714.4998779296875,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "47c7511a.dd8fe"
+ "30475e40.9b8be2"
]
]
},
{
- "id": "22f8bfd0.6139e",
+ "id": "eac6c260.d11fc",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1524.9998779296875,
- "y": 370.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1835.9998779296875,
+ "y": 723.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "fedbb5e6.fb3c28",
+ "id": "7970fcd5.6f11b4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
"comments": "",
- "x": 1197.9165649414062,
- "y": 408.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1527.91650390625,
+ "y": 776.0834045410156,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "47c7511a.dd8fe",
+ "id": "30475e40.9b8be2",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",
"comments": "",
"outputs": 1,
- "x": 1769.9166259765625,
- "y": 598.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1842.9166259765625,
+ "y": 930.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
},
{
- "id": "898f667e.daf2e8",
+ "id": "3d8934f9.d0339c",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1174.9999389648438,
- "y": 318.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1532.9998779296875,
+ "y": 672.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "14c8dea1.b5b7a1",
+ "id": "db1e6d62.a1404",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1317.9998779296875,
- "y": 596.0833435058594,
- "z": "af8f5cdd.6e4de",
+ "x": 1369.9998779296875,
+ "y": 924.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "7ce48bed.5b7c74",
- "70a28c6a.563d24",
- "a32993f8.f8215"
+ "e790e11b.4f947",
+ "3a3f1d44.898da2",
+ "c1a2b259.11e46"
]
]
},
{
- "id": "70a28c6a.563d24",
+ "id": "3a3f1d44.898da2",
"type": "set",
- "name": "set",
+ "name": "set DmaapReq",
"xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1448.1666259765625,
- "y": 549.0833740234375,
- "z": "af8f5cdd.6e4de",
+ "x": 1536.1666259765625,
+ "y": 875.0833740234375,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "fa759954.4e2068",
+ "id": "a457fe79.46497",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 577.9999389648438,
- "y": 392.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 602.9999389648438,
+ "y": 728.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "ed41675d.59c088"
+ "3d4c2c9a.7b1324"
]
]
},
{
- "id": "756c2e53.ca6d7",
+ "id": "d512629f.bc625",
"type": "set",
"name": "set Defaults",
"xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",
"comments": "",
- "x": 1009.9999389648438,
- "y": 297.0000305175781,
- "z": "af8f5cdd.6e4de",
+ "x": 893.9999389648438,
+ "y": 687,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "ed41675d.59c088",
+ "id": "3d4c2c9a.7b1324",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 761.9999389648438,
- "y": 384.0000228881836,
- "z": "af8f5cdd.6e4de",
+ "x": 739.9999389648438,
+ "y": 722.0000610351562,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "756c2e53.ca6d7",
- "80cc4946.3f0f78"
+ "d512629f.bc625",
+ "2b54a991.b17b16"
]
]
},
{
- "id": "e8d3b31a.f46c6",
+ "id": "814875d2.cac108",
"type": "set",
- "name": "set default status value",
- "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+ "name": "set default values",
+ "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",
"comments": "",
- "x": 336,
- "y": 269,
- "z": "af8f5cdd.6e4de",
+ "x": 372,
+ "y": 319,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "4d7f56db.9375c8",
+ "id": "442dbdff.6dfcb4",
"type": "get-resource",
- "name": "get aai.generic-vnf by vnf-id",
+ "name": "get aai.generic-vnf ",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
"comments": "",
"outputs": 1,
- "x": 349.0000305175781,
- "y": 325,
- "z": "af8f5cdd.6e4de",
+ "x": 912,
+ "y": 495,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "fa69a126.2a554",
- "f9cb9963.f9e368"
+ "1e57cb28.122ad5"
]
]
},
{
- "id": "fa69a126.2a554",
- "type": "failure",
+ "id": "1e57cb28.122ad5",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1070.3907470703125,
+ "y": 493.28399658203125,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "5a65efc0.bf413"
+ ]
+ ]
+ },
+ {
+ "id": "baba22fc.1ceb5",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",
+ "comments": "",
+ "outputs": 1,
+ "x": 300.9998779296875,
+ "y": 683,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "69e97f86.e07ef",
+ "type": "switchNode",
+ "name": "switch pnf-flag",
+ "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 354,
+ "y": 420,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "e43265e9.4c7f38",
+ "d78c93da.7125f"
+ ]
+ ]
+ },
+ {
+ "id": "e9d89bdf.30f7a8",
+ "type": "execute",
+ "name": "execute jsonStringToCtx",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-software-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 386,
+ "y": 366,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "e43265e9.4c7f38",
+ "type": "outcome",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 551,
+ "y": 399,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "abbc4ae4.be5328"
+ ]
+ ]
+ },
+ {
+ "id": "d78c93da.7125f",
+ "type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 589.86083984375,
- "y": 312.53564453125,
- "z": "af8f5cdd.6e4de",
+ "x": 550.9999389648438,
+ "y": 460,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "2d1a88c6.11f9d8"
+ "f68ee407.ca6d88"
]
]
},
{
- "id": "f9cb9963.f9e368",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
+ "id": "f68ee407.ca6d88",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 591.3908081054688,
- "y": 260.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 698.9999389648438,
+ "y": 459,
+ "z": "50de34e0.ace54c",
"wires": [
[
- "c4d4de4d.3e19f"
+ "442dbdff.6dfcb4",
+ "80c560bb.eea5f"
]
]
},
{
- "id": "c4d4de4d.3e19f",
+ "id": "abbc4ae4.be5328",
+ "type": "set",
+ "name": "set AnsibleReq",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\n",
+ "comments": "",
+ "x": 712,
+ "y": 397,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "80c560bb.eea5f",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 921,
+ "y": 439,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fa9a8e1f.bba53",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 351,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "1a5624d2.74e98b"
+ ]
+ ]
+ },
+ {
+ "id": "1a5624d2.74e98b",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 522,
+ "y": 552,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "524c17a1.30fbf8"
+ ]
+ ]
+ },
+ {
+ "id": "524c17a1.30fbf8",
+ "type": "set",
+ "name": "set playbookname",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",
+ "comments": "",
+ "x": 712,
+ "y": 551,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "81510405.ca8868",
+ "type": "switchNode",
+ "name": "switch nodelist",
+ "xml": "<switch test='`$nodelist`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 341,
+ "y": 610,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "7a126f.d2de2d9",
+ "8743a074.e8506"
+ ]
+ ]
+ },
+ {
+ "id": "7a126f.d2de2d9",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 521,
+ "y": 603,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "c954af6f.c34df",
"type": "set",
"name": "set nodelist",
- "xml": "<set>\n<parameter name='quote' value=\"'\" />\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 740.3908081054688,
- "y": 259.28399658203125,
- "z": "af8f5cdd.6e4de",
+ "x": 678,
+ "y": 617,
+ "z": "50de34e0.ace54c",
"wires": []
},
{
- "id": "2d1a88c6.11f9d8",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='VNF not found in AAI. Nodelist retrieved from config'/>",
+ "id": "8743a074.e8506",
+ "type": "outcome",
+ "name": "empty",
+ "xml": "<outcome value=\"['']\">\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 520,
+ "y": 647,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c954af6f.c34df"
+ ]
+ ]
+ },
+ {
+ "id": "90b2891b.001708",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1396,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "c9dd0d76.432f7"
+ ]
+ ]
+ },
+ {
+ "id": "c9dd0d76.432f7",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1574,
+ "y": 482,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "6ea15b2b.d9cd74"
+ ]
+ ]
+ },
+ {
+ "id": "9706bdee.6acf9",
+ "type": "set",
+ "name": "set nodelist",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "comments": "",
+ "x": 1369,
+ "y": 535,
+ "z": "50de34e0.ace54c",
+ "wires": []
+ },
+ {
+ "id": "5a65efc0.bf413",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1199,
+ "y": 492,
+ "z": "50de34e0.ace54c",
+ "wires": [
+ [
+ "90b2891b.001708",
+ "9706bdee.6acf9"
+ ]
+ ]
+ },
+ {
+ "id": "6ea15b2b.d9cd74",
+ "type": "execute",
+ "name": "set playbookname",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 736,
- "y": 312,
- "z": "af8f5cdd.6e4de",
+ "x": 1746,
+ "y": 480,
+ "z": "50de34e0.ace54c",
"wires": [
[]
]
diff --git a/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
index d83d149d..9b550d32 100755
--- a/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_distribute-traffic.xml
@@ -10,26 +10,75 @@
<set>
<parameter name='status.code' value='200' />
<parameter name='status.message' value='unexpected return from DG' />
- <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='quote' value="'" />
</set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='distribute-traffic-input.payload' />
+ <parameter name='outputPath' value='payloadJson' />
+ <parameter name='isEscaped' value='true' />
+ </execute>
+ <switch test='`$payloadJson.pnf-flag`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.distribute-traffic.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.distribute-traffic.playbookname'`" />
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
key="generic-vnf.vnf-id = $distribute-traffic-input.action-identifiers.vnf-id"
local-only="false"
pfx='aai.generic-vnf'>
- <outcome value='success'>
+ <outcome value='success'>
+ <block>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.distribute-traffic.playbookname'`" />
+ </execute>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`"/>
+ </set>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
<set>
- <parameter name='quote' value="'" />
- <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`"/>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='playbookname' value='`$prop.lcm.distribute-traffic.playbookname`'/>
</set>
</outcome>
- <outcome value='Other'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
- <parameter name="logger" value="message-log"/>
- <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
- </record>
+ </switch>
+ <switch test='`$nodelist`'>
+ <outcome value=''>
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
+ </outcome>
+ <outcome value="['']">
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
</outcome>
- </get-resource>
+ </switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+ <parameter name="logger" value="message-log"/>
+ <parameter name="field1" value='`$playbookname`'/>
+ <parameter name="field2" value='`$nodelist`'/>
+ </record>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
<parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
<parameter name='Timeout' value='`$prop.ansible.timeout`'/>
<parameter name='Version' value='`$prop.ansible.version`'/>
<parameter name='Id' value='`$distribute-traffic-input.common-header.request-id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='not-found'>
<block>
<set>
@@ -219,7 +268,7 @@
<parameter name='User' value='`$prop.ansible.user`'/>
<parameter name='Password' value='`$prop.ansible.password`'/>
<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.distribute-traffic.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
<set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
index 95038993..36eec1dd 100644
--- a/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_quiesce-traffic.xml
@@ -10,26 +10,75 @@
<set>
<parameter name='status.code' value='200' />
<parameter name='status.message' value='unexpected return from DG' />
- <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='quote' value="'" />
</set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='quiesce-traffic-input.payload' />
+ <parameter name='outputPath' value='payloadJson' />
+ <parameter name='isEscaped' value='true' />
+ </execute>
+ <switch test='`$payloadJson.pnf-flag`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.quiesce-traffic.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.quiesce-traffic.playbookname'`" />
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
key="generic-vnf.vnf-id = $quiesce-traffic-input.action-identifiers.vnf-id"
local-only="false"
pfx='aai.generic-vnf'>
- <outcome value='success'>
+ <outcome value='success'>
+ <block>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.quiesce-traffic.playbookname'`" />
+ </execute>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`"/>
+ </set>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
<set>
- <parameter name='quote' value="'" />
- <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`"/>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='playbookname' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
</set>
</outcome>
- <outcome value='Other'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
- <parameter name="logger" value="message-log"/>
- <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
- </record>
+ </switch>
+ <switch test='`$nodelist`'>
+ <outcome value=''>
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
+ </outcome>
+ <outcome value="['']">
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
</outcome>
- </get-resource>
+ </switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+ <parameter name="logger" value="message-log"/>
+ <parameter name="field1" value='`$playbookname`'/>
+ <parameter name="field2" value='`$nodelist`'/>
+ </record>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
<parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
<parameter name='Timeout' value='`$prop.ansible.timeout`'/>
<parameter name='Version' value='`$prop.ansible.version`'/>
<parameter name='Id' value='`$quiesce-traffic-input.common-header.request-id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='not-found'>
<block>
<set>
@@ -219,7 +268,7 @@
<parameter name='User' value='`$prop.ansible.user`'/>
<parameter name='Password' value='`$prop.ansible.password`'/>
<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.quiesce-traffic.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
<set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml b/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
index 54d35bde..9d2795b6 100644
--- a/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_resume-traffic.xml
@@ -10,26 +10,75 @@
<set>
<parameter name='status.code' value='200' />
<parameter name='status.message' value='unexpected return from DG' />
- <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='quote' value="'" />
</set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='resume-traffic-input.payload' />
+ <parameter name='outputPath' value='payloadJson' />
+ <parameter name='isEscaped' value='true' />
+ </execute>
+ <switch test='`$payloadJson.pnf-flag`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.resume-traffic.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.resume-traffic.playbookname'`" />
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
key="generic-vnf.vnf-id = $resume-traffic-input.action-identifiers.vnf-id"
local-only="false"
pfx='aai.generic-vnf'>
- <outcome value='success'>
+ <outcome value='success'>
+ <block>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.resume-traffic.playbookname'`" />
+ </execute>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`"/>
+ </set>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
<set>
- <parameter name='quote' value="'" />
- <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`"/>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='playbookname' value='`$prop.lcm.resume-traffic.playbookname`'/>
</set>
</outcome>
- <outcome value='Other'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
- <parameter name="logger" value="message-log"/>
- <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
- </record>
+ </switch>
+ <switch test='`$nodelist`'>
+ <outcome value=''>
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
+ </outcome>
+ <outcome value="['']">
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
</outcome>
- </get-resource>
+ </switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+ <parameter name="logger" value="message-log"/>
+ <parameter name="field1" value='`$playbookname`'/>
+ <parameter name="field2" value='`$nodelist`'/>
+ </record>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
<parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
<parameter name='Timeout' value='`$prop.ansible.timeout`'/>
<parameter name='Version' value='`$prop.ansible.version`'/>
<parameter name='Id' value='`$resume-traffic-input.common-header.request-id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='not-found'>
<block>
<set>
@@ -219,7 +268,7 @@
<parameter name='User' value='`$prop.ansible.user`'/>
<parameter name='Password' value='`$prop.ansible.password`'/>
<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.resume-traffic.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
<set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_snapshot.xml b/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
index 4284f404..73d0885a 100644
--- a/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_snapshot.xml
@@ -50,4 +50,4 @@
</return>
</block>
</method>
-</service-logic>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_unlock.xml b/platform-logic/lcm/src/main/xml/LCM_unlock.xml
index 37c36a07..f524af4e 100644
--- a/platform-logic/lcm/src/main/xml/LCM_unlock.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_unlock.xml
@@ -26,7 +26,7 @@
<parameter name='lcm-dmaap.flags.force' value='`$unlock-input.common-header.flags.force`'/>
<parameter name='lcm-dmaap.flags.ttl' value='`$unlock-input.common-header.flags.ttl`'/>
<parameter name='lcm-dmaap.status.code' value='400' />
- <parameter name='lcm-dmaap.status.message' value='SDNC UnLock Mock returns success'/>
+ <parameter name='lcm-dmaap.status.message' value='SDNC Unlock Mock returns success'/>
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
@@ -46,8 +46,8 @@
</execute>
<return status='success'>
<parameter name='status.code' value='400' />
- <parameter name='status.message' value='SDNC UnLock Mock returns success'/>
+ <parameter name='status.message' value='SDNC Unlock Mock returns success'/>
</return>
</block>
</method>
-</service-logic>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
index 4b9ef5cd..39eb3414 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-backup.xml
@@ -26,7 +26,7 @@
<parameter name='lcm-dmaap.flags.force' value='`$upgrade-backup-input.common-header.flags.force`'/>
<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-backup-input.common-header.flags.ttl`'/>
<parameter name='lcm-dmaap.status.code' value='400' />
- <parameter name='lcm-dmaap.status.message' value='SDNC Lock Mock returns success'/>
+ <parameter name='lcm-dmaap.status.message' value='SDNC Upgrade-backup Mock returns success'/>
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
@@ -46,8 +46,8 @@
</execute>
<return status='success'>
<parameter name='status.code' value='400' />
- <parameter name='status.message' value='SDNC Lock Mock returns success'/>
+ <parameter name='status.message' value='SDNC Upgrade-backup Mock returns success'/>
</return>
</block>
</method>
-</service-logic>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index 50301a72..3338f1c2 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
@@ -10,26 +10,75 @@
<set>
<parameter name='status.code' value='200' />
<parameter name='status.message' value='unexpected return from DG' />
- <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='quote' value="'" />
</set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='upgrade-post-check-input.payload' />
+ <parameter name='outputPath' value='payloadJson' />
+ <parameter name='isEscaped' value='true' />
+ </execute>
+ <switch test='`$payloadJson.pnf-flag`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`" />
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
key="generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id"
local-only="false"
pfx='aai.generic-vnf'>
- <outcome value='success'>
+ <outcome value='success'>
+ <block>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`" />
+ </execute>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`"/>
+ </set>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
<set>
- <parameter name='quote' value="'" />
- <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`"/>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
</set>
</outcome>
- <outcome value='Other'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
- <parameter name="logger" value="message-log"/>
- <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
- </record>
+ </switch>
+ <switch test='`$nodelist`'>
+ <outcome value=''>
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
+ </outcome>
+ <outcome value="['']">
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
</outcome>
- </get-resource>
+ </switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+ <parameter name="logger" value="message-log"/>
+ <parameter name="field1" value='`$playbookname`'/>
+ <parameter name="field2" value='`$nodelist`'/>
+ </record>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
<parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
<parameter name='Timeout' value='`$prop.ansible.timeout`'/>
<parameter name='Version' value='`$prop.ansible.version`'/>
<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='not-found'>
<block>
<set>
@@ -219,7 +268,7 @@
<parameter name='User' value='`$prop.ansible.user`'/>
<parameter name='Password' value='`$prop.ansible.password`'/>
<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
<set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
index c0947ca7..1bf68e52 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
@@ -10,26 +10,75 @@
<set>
<parameter name='status.code' value='200' />
<parameter name='status.message' value='unexpected return from DG' />
- <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='quote' value="'" />
</set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='upgrade-pre-check-input.payload' />
+ <parameter name='outputPath' value='payloadJson' />
+ <parameter name='isEscaped' value='true' />
+ </execute>
+ <switch test='`$payloadJson.pnf-flag`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`" />
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
key="generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id"
local-only="false"
pfx='aai.generic-vnf'>
- <outcome value='success'>
+ <outcome value='success'>
+ <block>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`" />
+ </execute>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`"/>
+ </set>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
<set>
- <parameter name='quote' value="'" />
- <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`"/>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
</set>
</outcome>
- <outcome value='Other'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
- <parameter name="logger" value="message-log"/>
- <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
- </record>
+ </switch>
+ <switch test='`$nodelist`'>
+ <outcome value=''>
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
+ </outcome>
+ <outcome value="['']">
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
</outcome>
- </get-resource>
+ </switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+ <parameter name="logger" value="message-log"/>
+ <parameter name="field1" value='`$playbookname`'/>
+ <parameter name="field2" value='`$nodelist`'/>
+ </record>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
<parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
<parameter name='Timeout' value='`$prop.ansible.timeout`'/>
<parameter name='Version' value='`$prop.ansible.version`'/>
<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='not-found'>
<block>
<set>
@@ -219,7 +268,7 @@
<parameter name='User' value='`$prop.ansible.user`'/>
<parameter name='Password' value='`$prop.ansible.password`'/>
<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
<set>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index 252b438d..1a72c47e 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -10,26 +10,75 @@
<set>
<parameter name='status.code' value='200' />
<parameter name='status.message' value='unexpected return from DG' />
- <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='quote' value="'" />
</set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='upgrade-software-input.payload' />
+ <parameter name='outputPath' value='payloadJson' />
+ <parameter name='isEscaped' value='true' />
+ </execute>
+ <switch test='`$payloadJson.pnf-flag`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`" />
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="generic-vnf"
key="generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id"
local-only="false"
pfx='aai.generic-vnf'>
- <outcome value='success'>
+ <outcome value='success'>
+ <block>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`" />
+ </execute>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`"/>
+ </set>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
<set>
- <parameter name='quote' value="'" />
- <parameter name='nodelist' value="`'[' + $quote + $aai.ipv4-oam-address + $quote + ']'`"/>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ <parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>
</set>
</outcome>
- <outcome value='Other'>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
- <parameter name="logger" value="message-log"/>
- <parameter name="field1" value='VNF not found in AAI. Nodelist retrieved from config'/>
- </record>
+ </switch>
+ <switch test='`$nodelist`'>
+ <outcome value=''>
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
+ </outcome>
+ <outcome value="['']">
+ <set>
+ <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
+ </set>
</outcome>
- </get-resource>
+ </switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+ <parameter name="logger" value="message-log"/>
+ <parameter name="field1" value='`$playbookname`'/>
+ <parameter name="field2" value='`$nodelist`'/>
+ </record>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>
<parameter name='User' value='`$prop.ansible.user`'/>
@@ -40,7 +89,7 @@
<parameter name='Timeout' value='`$prop.ansible.timeout`'/>
<parameter name='Version' value='`$prop.ansible.version`'/>
<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='not-found'>
<block>
<set>
@@ -219,7 +268,7 @@
<parameter name='User' value='`$prop.ansible.user`'/>
<parameter name='Password' value='`$prop.ansible.password`'/>
<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>
- <parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>
+ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
<set>
diff --git a/platform-logic/restapi-templates/src/main/json/naming-ms-post-gen-name.json b/platform-logic/restapi-templates/src/main/json/naming-ms-post-gen-name.json
new file mode 100644
index 00000000..1887aedb
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/naming-ms-post-gen-name.json
@@ -0,0 +1,13 @@
+{
+ "elements": [
+ ${repeat:tmp.gen-name_length:
+ {
+ ${repeat:tmp.gen-name[${1}].element_length:
+ ${tmp.gen-name[${1}].element[${2}].name}: ${tmp.gen-name[${1}].element[${2}].value}
+ ,
+ },
+ },
+ }
+
+ ]
+ } \ No newline at end of file