diff options
9 files changed, 1933 insertions, 1103 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.json index 4b4448bb..306983eb 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.json @@ -1,6 +1,6 @@ [
{
- "id": "187aa613.a5839a",
+ "id": "92d63018.76651",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -8,667 +8,667 @@ "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": 235.00390625,
- "y": 121.23810815811157,
- "z": "e1fdfe1b.e244a",
+ "x": 188,
+ "y": 95.23810958862305,
+ "z": "551c808f.bbd64",
"wires": [
[
- "582fdd43.f9c334"
+ "d7e56420.878978"
]
]
},
{
- "id": "582fdd43.f9c334",
+ "id": "d7e56420.878978",
"type": "method",
"name": "method sdwan-vf-operation-site-delete",
"xml": "<method rpc='sdwan-vf-operation-site-delete' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 246.71820068359375,
- "y": 215.58634042739868,
- "z": "e1fdfe1b.e244a",
+ "x": 199.71429443359375,
+ "y": 189.58634185791016,
+ "z": "551c808f.bbd64",
"wires": [
[
- "5b1517bd.e6d538"
+ "4894aec.737e25"
]
]
},
{
- "id": "dd9a7d3b.c0b22",
+ "id": "a6d015c8.1ff688",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 155.71820068359375,
- "y": 58.999998569488525,
- "z": "e1fdfe1b.e244a",
+ "x": 108.71429443359375,
+ "y": 33,
+ "z": "551c808f.bbd64",
"wires": [
[
- "187aa613.a5839a"
+ "92d63018.76651"
]
]
},
{
- "id": "5b1517bd.e6d538",
+ "id": "4894aec.737e25",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 263.38490295410156,
- "y": 449.66671800613403,
- "z": "e1fdfe1b.e244a",
+ "x": 216.38099670410156,
+ "y": 423.6667194366455,
+ "z": "551c808f.bbd64",
"wires": [
[
- "9241d723.4c1768",
- "583bedbe.114ce4",
- "530fc00e.364a7",
- "6080131a.3dc0dc",
- "e87fa266.b6e36",
- "809305f5.00af78",
- "35360c23.e7bca4",
- "f2c5088e.cdf1f8",
- "8e537e93.b1e07",
- "c5084158.dcae4",
- "a42b62f1.2ca2"
+ "a2b42b0.3b977d8",
+ "5900c7f7.5a9318",
+ "7c3f4054.5da9f",
+ "ea6eb721.d75c78",
+ "1845f5e.f859c0a",
+ "ac4ca98d.648748",
+ "3a7cc06a.e4a93",
+ "5b1cbd9a.fe2214",
+ "d3482d9.9c6a8d",
+ "47edd8f7.5e8f08",
+ "a33ffc8b.2c56d"
]
]
},
{
- "id": "583bedbe.114ce4",
+ "id": "5900c7f7.5a9318",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 578.7495651245117,
- "y": 295.2691397666931,
- "z": "e1fdfe1b.e244a",
+ "x": 531.7456588745117,
+ "y": 269.2691411972046,
+ "z": "551c808f.bbd64",
"wires": [
[
- "54d8e288.9c571c"
+ "5c122dfc.571994"
]
]
},
{
- "id": "9241d723.4c1768",
+ "id": "a2b42b0.3b977d8",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 583.7182197570801,
- "y": 234.000009059906,
- "z": "e1fdfe1b.e244a",
+ "x": 536.7143135070801,
+ "y": 208.00001049041748,
+ "z": "551c808f.bbd64",
"wires": [
[
- "deee2c29.49f92"
+ "800d9fa6.cc593"
]
]
},
{
- "id": "deee2c29.49f92",
+ "id": "800d9fa6.cc593",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 763.7182006835938,
- "y": 232.99999856948853,
- "z": "e1fdfe1b.e244a",
+ "x": 716.7142944335938,
+ "y": 207,
+ "z": "551c808f.bbd64",
"wires": [
[
- "c9ce5d0a.f9326"
+ "21c67758.a01858"
]
]
},
{
- "id": "c9ce5d0a.f9326",
+ "id": "21c67758.a01858",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 913.1469268798828,
- "y": 234.14291620254517,
- "z": "e1fdfe1b.e244a",
+ "x": 866.1430206298828,
+ "y": 208.14291763305664,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "54d8e288.9c571c",
+ "id": "5c122dfc.571994",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 801.7182159423828,
- "y": 296.0000047683716,
- "z": "e1fdfe1b.e244a",
+ "x": 754.7143096923828,
+ "y": 270.00000619888306,
+ "z": "551c808f.bbd64",
"wires": [
[
- "60ddf1fc.3523e"
+ "e74d8f35.4c893"
]
]
},
{
- "id": "60ddf1fc.3523e",
+ "id": "e74d8f35.4c893",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1016.7182006835938,
- "y": 293.9999985694885,
- "z": "e1fdfe1b.e244a",
+ "x": 969.7142944335938,
+ "y": 268,
+ "z": "551c808f.bbd64",
"wires": [
[
- "3516b602.f2680a"
+ "18997aaf.50a2e5"
]
]
},
{
- "id": "3516b602.f2680a",
+ "id": "18997aaf.50a2e5",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1180.7182006835938,
- "y": 288.9999985694885,
- "z": "e1fdfe1b.e244a",
+ "x": 1133.7142944335938,
+ "y": 263,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "530fc00e.364a7",
+ "id": "7c3f4054.5da9f",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 649.7182350158691,
- "y": 372.00002336502075,
- "z": "e1fdfe1b.e244a",
+ "x": 602.7143287658691,
+ "y": 346.0000247955322,
+ "z": "551c808f.bbd64",
"wires": [
[
- "8726f5fa.6a9e18",
- "28d1ea9e.688d26",
- "8ffcd1cb.2fcee"
+ "e9f1419b.38f9e",
+ "585f667a.9a7e28",
+ "ebd510e0.6ad12"
]
]
},
{
- "id": "28d1ea9e.688d26",
+ "id": "585f667a.9a7e28",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 871.7182273864746,
- "y": 406.0000329017639,
- "z": "e1fdfe1b.e244a",
+ "x": 824.7143211364746,
+ "y": 380.0000343322754,
+ "z": "551c808f.bbd64",
"wires": [
[
- "ed85f484.f7f278"
+ "720f4f87.d051c"
]
]
},
{
- "id": "8726f5fa.6a9e18",
+ "id": "e9f1419b.38f9e",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 876.7182235717773,
- "y": 353.0000319480896,
- "z": "e1fdfe1b.e244a",
+ "x": 829.7143173217773,
+ "y": 327.0000333786011,
+ "z": "551c808f.bbd64",
"wires": [
[
- "ed85f484.f7f278"
+ "720f4f87.d051c"
]
]
},
{
- "id": "ed85f484.f7f278",
+ "id": "720f4f87.d051c",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 1034.7182273864746,
- "y": 366.0000329017639,
- "z": "e1fdfe1b.e244a",
+ "x": 987.7143211364746,
+ "y": 340.0000343322754,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "8ffcd1cb.2fcee",
+ "id": "ebd510e0.6ad12",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 871.7182273864746,
- "y": 467.0000329017639,
- "z": "e1fdfe1b.e244a",
+ "x": 824.7143211364746,
+ "y": 441.0000343322754,
+ "z": "551c808f.bbd64",
"wires": [
[
- "340e8678.09189a"
+ "9a0e9dd2.18865"
]
]
},
{
- "id": "806cc3c4.ab426",
+ "id": "9902fe02.18d86",
"type": "set",
"name": "set vf-module_length",
"xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
"comments": "",
- "x": 1225.7182426452637,
- "y": 465.0000468492508,
- "z": "e1fdfe1b.e244a",
+ "x": 1178.7143363952637,
+ "y": 439.00004827976227,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "340e8678.09189a",
+ "id": "9a0e9dd2.18865",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1032.7182731628418,
- "y": 464.00002431869507,
- "z": "e1fdfe1b.e244a",
+ "x": 985.7143669128418,
+ "y": 438.00002574920654,
+ "z": "551c808f.bbd64",
"wires": [
[
- "806cc3c4.ab426",
- "f59f2884.04cee8"
+ "9902fe02.18d86",
+ "16260a2b.3eaaa6"
]
]
},
{
- "id": "f59f2884.04cee8",
+ "id": "16260a2b.3eaaa6",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1244.7182121276855,
- "y": 518.0000233650208,
- "z": "e1fdfe1b.e244a",
+ "x": 1197.7143058776855,
+ "y": 492.0000247955322,
+ "z": "551c808f.bbd64",
"wires": [
[
- "2f51cfde.50b1e"
+ "88e5880a.11ce38"
]
]
},
{
- "id": "2f51cfde.50b1e",
+ "id": "88e5880a.11ce38",
"type": "switchNode",
"name": "switch vf-module-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1487.7182273864746,
- "y": 513.0000329017639,
- "z": "e1fdfe1b.e244a",
+ "x": 1440.7143211364746,
+ "y": 487.0000343322754,
+ "z": "551c808f.bbd64",
"wires": [
[
- "b1049a4.b276d68"
+ "70d8d5dc.c5589c"
]
]
},
{
- "id": "b1049a4.b276d68",
+ "id": "70d8d5dc.c5589c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1728.718355178833,
- "y": 506.00003004074097,
- "z": "e1fdfe1b.e244a",
+ "x": 1681.714448928833,
+ "y": 480.00003147125244,
+ "z": "551c808f.bbd64",
"wires": [
[
- "30dc082a.0a5cd8"
+ "edcff2.a0ee701"
]
]
},
{
- "id": "30dc082a.0a5cd8",
+ "id": "edcff2.a0ee701",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1880.7183265686035,
- "y": 508.00002336502075,
- "z": "e1fdfe1b.e244a",
+ "x": 1833.7144203186035,
+ "y": 482.0000247955322,
+ "z": "551c808f.bbd64",
"wires": [
[
- "68ce9aa6.9cbee4",
- "6fd91070.2784d",
- "83965509.802248"
+ "3e47609d.a63df",
+ "9b88bd4a.a8923",
+ "e106d289.b1b46"
]
]
},
{
- "id": "68ce9aa6.9cbee4",
+ "id": "3e47609d.a63df",
"type": "set",
"name": "set tmp.vidx and ctx.vnf-data",
"xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
"comments": "",
- "x": 2102.7183265686035,
- "y": 504.00002336502075,
- "z": "e1fdfe1b.e244a",
+ "x": 2055.7144203186035,
+ "y": 478.0000247955322,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "6fd91070.2784d",
+ "id": "9b88bd4a.a8923",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
"comments": "",
- "x": 2108.7183265686035,
- "y": 553.0000233650208,
- "z": "e1fdfe1b.e244a",
+ "x": 2061.7144203186035,
+ "y": 527.0000247955322,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "83965509.802248",
+ "id": "e106d289.b1b46",
"type": "call",
- "name": "call sdwan-get-vf-module-device-param",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' >\n",
+ "name": "call sdwan-get-vf-module-site-param",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2136.718547821045,
- "y": 601.0000290870667,
- "z": "e1fdfe1b.e244a",
+ "x": 2089.714641571045,
+ "y": 575.0000305175781,
+ "z": "551c808f.bbd64",
"wires": [
[]
]
},
{
- "id": "6080131a.3dc0dc",
+ "id": "ea6eb721.d75c78",
"type": "switchNode",
"name": "switch tmp.vidx ",
"xml": "<switch test=\"`$tmp.vidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 588.7494468688965,
- "y": 545.0161061286926,
- "z": "e1fdfe1b.e244a",
+ "x": 541.7455406188965,
+ "y": 519.0161075592041,
+ "z": "551c808f.bbd64",
"wires": [
[
- "73f1e922.5bcb58"
+ "b4a5c77f.e6a8e8"
]
]
},
{
- "id": "73f1e922.5bcb58",
+ "id": "b4a5c77f.e6a8e8",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 736.1780891418457,
- "y": 544.5875163078308,
- "z": "e1fdfe1b.e244a",
+ "x": 689.1741828918457,
+ "y": 518.5875177383423,
+ "z": "551c808f.bbd64",
"wires": [
[
- "a8c19777.b80838"
+ "1bdd208b.11220f"
]
]
},
{
- "id": "a8c19777.b80838",
+ "id": "1bdd208b.11220f",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 885.6068153381348,
- "y": 545.7304339408875,
- "z": "e1fdfe1b.e244a",
+ "x": 838.6029090881348,
+ "y": 519.7304353713989,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "e87fa266.b6e36",
+ "id": "1845f5e.f859c0a",
"type": "switchNode",
"name": "switch vf-module-oper-status",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 633.047607421875,
- "y": 615.3333115577698,
- "z": "e1fdfe1b.e244a",
+ "x": 586.043701171875,
+ "y": 589.3333129882812,
+ "z": "551c808f.bbd64",
"wires": [
[
- "f563296b.c51508",
- "5df5c282.7498ac"
+ "b4a1d75e.3ca968",
+ "3c274d12.c91802"
]
]
},
{
- "id": "f563296b.c51508",
+ "id": "b4a1d75e.3ca968",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 923.8808746337891,
- "y": 619.4444346427917,
- "z": "e1fdfe1b.e244a",
+ "x": 876.8769683837891,
+ "y": 593.4444360733032,
+ "z": "551c808f.bbd64",
"wires": [
[
- "def8fb03.8e15e8"
+ "c9fb09b5.340538"
]
]
},
{
- "id": "5df5c282.7498ac",
+ "id": "3c274d12.c91802",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 890.8810119628906,
- "y": 671.4444873332977,
- "z": "e1fdfe1b.e244a",
+ "x": 843.8771057128906,
+ "y": 645.4444887638092,
+ "z": "551c808f.bbd64",
"wires": [
[
- "2bb9155.57a22ea"
+ "2fa34d4f.1b8342"
]
]
},
{
- "id": "2bb9155.57a22ea",
+ "id": "2fa34d4f.1b8342",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
"comments": "",
- "x": 1050.3807792663574,
- "y": 674.4444863796234,
- "z": "e1fdfe1b.e244a",
+ "x": 1003.3768730163574,
+ "y": 648.4444878101349,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "def8fb03.8e15e8",
+ "id": "c9fb09b5.340538",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1121.1872749328613,
- "y": 629.7695889472961,
- "z": "e1fdfe1b.e244a",
+ "x": 1074.1833686828613,
+ "y": 603.7695903778076,
+ "z": "551c808f.bbd64",
"wires": [
[]
]
},
{
- "id": "a42b62f1.2ca2",
+ "id": "a33ffc8b.2c56d",
"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": 611.1588096618652,
- "y": 994.2221984863281,
- "z": "e1fdfe1b.e244a",
+ "x": 564.1549034118652,
+ "y": 968.2221999168396,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "809305f5.00af78",
+ "id": "ac4ca98d.648748",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
"comments": "",
- "x": 607.2454776763916,
- "y": 689.3333535194397,
- "z": "e1fdfe1b.e244a",
+ "x": 560.2415714263916,
+ "y": 663.3333549499512,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "35360c23.e7bca4",
+ "id": "3a7cc06a.e4a93",
"type": "for",
"name": "for lidx..service-data.vf-modules.vf-module[]",
"xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 687.2453918457031,
- "y": 740.3333554267883,
- "z": "e1fdfe1b.e244a",
+ "x": 640.2414855957031,
+ "y": 714.3333568572998,
+ "z": "551c808f.bbd64",
"wires": [
[
- "37a5b897.303c08"
+ "95674187.09446"
]
]
},
{
- "id": "f2c5088e.cdf1f8",
+ "id": "5b1cbd9a.fe2214",
"type": "set",
"name": "set new vnf length",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
"comments": "",
- "x": 611.3467636108398,
- "y": 793.1375732421875,
- "z": "e1fdfe1b.e244a",
+ "x": 564.3428573608398,
+ "y": 767.137574672699,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "8e537e93.b1e07",
+ "id": "d3482d9.9c6a8d",
"type": "set",
"name": "Remove vnf from ServiceData",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",
"comments": "",
- "x": 648.2454376220703,
- "y": 843.3333582878113,
- "z": "e1fdfe1b.e244a",
+ "x": 601.2415313720703,
+ "y": 817.3333597183228,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "37a5b897.303c08",
+ "id": "95674187.09446",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 947.24538230896,
- "y": 747.3332152366638,
- "z": "e1fdfe1b.e244a",
+ "x": 900.24147605896,
+ "y": 721.3332166671753,
+ "z": "551c808f.bbd64",
"wires": [
[
- "28df8155.45a17e"
+ "e3d25248.df60d"
]
]
},
{
- "id": "b54d3819.c1f898",
+ "id": "52d4e995.bbf898",
"type": "delete",
"name": "delete site vf instance configuration in AAI",
"xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='site-resource' \n key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",
"comments": "",
"outputs": 1,
- "x": 693.2457847595215,
- "y": 941.59490442276,
- "z": "e1fdfe1b.e244a",
+ "x": 646.2418785095215,
+ "y": 915.5949058532715,
+ "z": "551c808f.bbd64",
"wires": [
[]
]
},
{
- "id": "28df8155.45a17e",
+ "id": "e3d25248.df60d",
"type": "switchNode",
"name": "switch vnf-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.vf-module-information.vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1133.245449066162,
- "y": 747.3333759307861,
- "z": "e1fdfe1b.e244a",
+ "x": 1086.241542816162,
+ "y": 721.3333773612976,
+ "z": "551c808f.bbd64",
"wires": [
[
- "b11e0659.68c598"
+ "47678fed.7b718"
]
]
},
{
- "id": "b11e0659.68c598",
+ "id": "47678fed.7b718",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1302.2454566955566,
- "y": 746.3332133293152,
- "z": "e1fdfe1b.e244a",
+ "x": 1255.2415504455566,
+ "y": 720.3332147598267,
+ "z": "551c808f.bbd64",
"wires": [
[
- "8c9a4a2b.2a6988"
+ "c04d70ca.31b0d"
]
]
},
{
- "id": "8c9a4a2b.2a6988",
+ "id": "c04d70ca.31b0d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1456.2452955245972,
- "y": 738.3332142829895,
- "z": "e1fdfe1b.e244a",
+ "x": 1409.2413892745972,
+ "y": 712.333215713501,
+ "z": "551c808f.bbd64",
"wires": [
[
- "9c4fcf43.faebd",
- "f51761cb.90c27"
+ "127fe12b.983b6f",
+ "2ec119fa.b900e6"
]
]
},
{
- "id": "9c4fcf43.faebd",
+ "id": "127fe12b.983b6f",
"type": "set",
"name": "set vnf data",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\n",
"comments": "",
- "x": 1621.2453908920288,
- "y": 713.3333697319031,
- "z": "e1fdfe1b.e244a",
+ "x": 1574.2414846420288,
+ "y": 687.3333711624146,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "f51761cb.90c27",
+ "id": "2ec119fa.b900e6",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
"comments": "",
- "x": 1643.2453908920288,
- "y": 769.333333492279,
- "z": "e1fdfe1b.e244a",
+ "x": 1596.2414846420288,
+ "y": 743.3333349227905,
+ "z": "551c808f.bbd64",
"wires": []
},
{
- "id": "c5084158.dcae4",
+ "id": "47edd8f7.5e8f08",
"type": "set",
"name": "set vf-module-object-path",
"xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
"comments": "",
- "x": 635.0476455688477,
- "y": 888.6666932106018,
- "z": "e1fdfe1b.e244a",
+ "x": 588.0437393188477,
+ "y": 862.6666946411133,
+ "z": "551c808f.bbd64",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.json index d290e8e7..6918596a 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.json @@ -1,22 +1,22 @@ [
{
- "id": "4c9b7636.16d1a8",
+ "id": "108df9ad.e955a6",
"type": "method",
"name": "method sdwan-vf-operation-wanport-delete",
"xml": "<method rpc='sdwan-vf-operation-wanport-delete' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 227.01040649414062,
- "y": 192.58634161949158,
- "z": "fa825249.678d7",
+ "x": 188.71429443359375,
+ "y": 192.58645629882812,
+ "z": "811cb3d0.df7",
"wires": [
[
- "ef9a78fa.b0f5b8"
+ "f6ae267d.a135a8"
]
]
},
{
- "id": "ae863831.900868",
+ "id": "91046601.99c4f8",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -24,640 +24,640 @@ "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": 215.29611206054688,
- "y": 98.23810935020447,
- "z": "fa825249.678d7",
+ "x": 177,
+ "y": 98.23822402954102,
+ "z": "811cb3d0.df7",
"wires": [
[
- "4c9b7636.16d1a8"
+ "108df9ad.e955a6"
]
]
},
{
- "id": "3c4c41bd.66b0ee",
+ "id": "5961d5b2.76b41c",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 136.01040649414062,
- "y": 35.99999976158142,
- "z": "fa825249.678d7",
+ "x": 97.71429443359375,
+ "y": 36.00011444091797,
+ "z": "811cb3d0.df7",
"wires": [
[
- "ae863831.900868"
+ "91046601.99c4f8"
]
]
},
{
- "id": "ef9a78fa.b0f5b8",
+ "id": "f6ae267d.a135a8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 246.67710876464844,
- "y": 459.66673517227173,
- "z": "fa825249.678d7",
+ "x": 208.38099670410156,
+ "y": 459.6668498516083,
+ "z": "811cb3d0.df7",
"wires": [
[
- "73502c25.0501b4",
- "8ef64cba.b142",
- "e7c6e1f4.291c4",
- "5b7d49e0.41f2f8",
- "8b01c2d1.84cd3",
- "27503470.8bf84c",
- "dce00f39.1d9f7",
- "9d21b2cd.86c73",
- "827a72ac.9aabf",
- "67cd24d6.a0f83c",
- "a35824b0.8bb6e8"
+ "d930c943.e6e998",
+ "8e7ede43.d475c",
+ "4ec60d6a.71f484",
+ "6a64350b.28076c",
+ "da14742e.a382e8",
+ "452859c9.e498f8",
+ "c7649fe7.d4fb9",
+ "9d43ca3e.815638",
+ "23273105.4d68be",
+ "7182ec74.f348c4",
+ "ebdf21b1.cc8c7"
]
]
},
{
- "id": "8ef64cba.b142",
+ "id": "8e7ede43.d475c",
"type": "for",
"name": "for each vnf",
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 559.0417709350586,
- "y": 272.269140958786,
- "z": "fa825249.678d7",
+ "x": 520.7456588745117,
+ "y": 272.26925563812256,
+ "z": "811cb3d0.df7",
"wires": [
[
- "11c14e91.a941a1"
+ "9e14817f.8f614"
]
]
},
{
- "id": "73502c25.0501b4",
+ "id": "d930c943.e6e998",
"type": "switchNode",
"name": "switch vnf_length",
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 564.010425567627,
- "y": 211.0000102519989,
- "z": "fa825249.678d7",
+ "x": 525.7143135070801,
+ "y": 211.00012493133545,
+ "z": "811cb3d0.df7",
"wires": [
[
- "45acbb70.cf9d84"
+ "452f6a7.3541694"
]
]
},
{
- "id": "45acbb70.cf9d84",
+ "id": "452f6a7.3541694",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 744.0104064941406,
- "y": 209.99999976158142,
- "z": "fa825249.678d7",
+ "x": 705.7142944335938,
+ "y": 210.00011444091797,
+ "z": "811cb3d0.df7",
"wires": [
[
- "1c305856.7d7878"
+ "25d0ddf2.3f4862"
]
]
},
{
- "id": "1c305856.7d7878",
+ "id": "25d0ddf2.3f4862",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 893.4391326904297,
- "y": 211.14291739463806,
- "z": "fa825249.678d7",
+ "x": 855.1430206298828,
+ "y": 211.1430320739746,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "11c14e91.a941a1",
+ "id": "9e14817f.8f614",
"type": "switchNode",
"name": "switch this vnf-id == input vnf-id",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\"> \n",
"comments": "",
"outputs": 1,
- "x": 782.0104217529297,
- "y": 273.0000059604645,
- "z": "fa825249.678d7",
+ "x": 743.7143096923828,
+ "y": 273.000120639801,
+ "z": "811cb3d0.df7",
"wires": [
[
- "4a09a290.a75bbc"
+ "523175d4.98b7bc"
]
]
},
{
- "id": "4a09a290.a75bbc",
+ "id": "523175d4.98b7bc",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 997.0104064941406,
- "y": 270.9999997615814,
- "z": "fa825249.678d7",
+ "x": 958.7142944335938,
+ "y": 271.00011444091797,
+ "z": "811cb3d0.df7",
"wires": [
[
- "57c73c18.c834a4"
+ "a81758c8.bd7d68"
]
]
},
{
- "id": "57c73c18.c834a4",
+ "id": "a81758c8.bd7d68",
"type": "set",
"name": "set vnf-index",
"xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
"comments": "",
- "x": 1161.0104064941406,
- "y": 265.9999997615814,
- "z": "fa825249.678d7",
+ "x": 1122.7142944335938,
+ "y": 266.00011444091797,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "e7c6e1f4.291c4",
+ "id": "4ec60d6a.71f484",
"type": "switchNode",
"name": "switch vf-modules.vf-module_length",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 630.010440826416,
- "y": 349.00002455711365,
- "z": "fa825249.678d7",
+ "x": 591.7143287658691,
+ "y": 349.0001392364502,
+ "z": "811cb3d0.df7",
"wires": [
[
- "8cdd0772.dbdbf8",
- "d22fa0c4.8a1a8",
- "b6f26649.6b92a8"
+ "15b47ae.5174785",
+ "99344700.318bf8",
+ "fca663c0.b87bd"
]
]
},
{
- "id": "d22fa0c4.8a1a8",
+ "id": "99344700.318bf8",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 852.0104331970215,
- "y": 383.0000340938568,
- "z": "fa825249.678d7",
+ "x": 813.7143211364746,
+ "y": 383.00014877319336,
+ "z": "811cb3d0.df7",
"wires": [
[
- "1ebe6a81.7b0665"
+ "1da7bb0c.744515"
]
]
},
{
- "id": "8cdd0772.dbdbf8",
+ "id": "15b47ae.5174785",
"type": "outcome",
"name": "0",
"xml": "<outcome value='0'>\n",
"comments": "",
"outputs": 1,
- "x": 857.0104293823242,
- "y": 330.0000331401825,
- "z": "fa825249.678d7",
+ "x": 818.7143173217773,
+ "y": 330.00014781951904,
+ "z": "811cb3d0.df7",
"wires": [
[
- "1ebe6a81.7b0665"
+ "1da7bb0c.744515"
]
]
},
{
- "id": "1ebe6a81.7b0665",
+ "id": "1da7bb0c.744515",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 1015.0104331970215,
- "y": 343.0000340938568,
- "z": "fa825249.678d7",
+ "x": 976.7143211364746,
+ "y": 343.00014877319336,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "b6f26649.6b92a8",
+ "id": "fca663c0.b87bd",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 852.0104331970215,
- "y": 444.0000340938568,
- "z": "fa825249.678d7",
+ "x": 813.7143211364746,
+ "y": 444.00014877319336,
+ "z": "811cb3d0.df7",
"wires": [
[
- "5d0462e8.482a9c"
+ "e8eea7a1.b01d68"
]
]
},
{
- "id": "98248461.3994b8",
+ "id": "c4845e4b.47681",
"type": "set",
"name": "set vf-module_length",
"xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
"comments": "",
- "x": 1206.0104484558105,
- "y": 442.0000480413437,
- "z": "fa825249.678d7",
+ "x": 1167.7143363952637,
+ "y": 442.00016272068024,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "5d0462e8.482a9c",
+ "id": "e8eea7a1.b01d68",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1013.0104789733887,
- "y": 441.00002551078796,
- "z": "fa825249.678d7",
+ "x": 974.7143669128418,
+ "y": 441.0001401901245,
+ "z": "811cb3d0.df7",
"wires": [
[
- "98248461.3994b8",
- "bb5716e5.5eb1d8"
+ "c4845e4b.47681",
+ "5a93254.82122dc"
]
]
},
{
- "id": "bb5716e5.5eb1d8",
+ "id": "5a93254.82122dc",
"type": "for",
"name": "for each existing vf-index",
"xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1225.0104179382324,
- "y": 495.00002455711365,
- "z": "fa825249.678d7",
+ "x": 1186.7143058776855,
+ "y": 495.0001392364502,
+ "z": "811cb3d0.df7",
"wires": [
[
- "56d74cea.fe48b4"
+ "aeb0ca88.3fa2d8"
]
]
},
{
- "id": "56d74cea.fe48b4",
+ "id": "aeb0ca88.3fa2d8",
"type": "switchNode",
"name": "switch vf-module-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1468.0104331970215,
- "y": 490.0000340938568,
- "z": "fa825249.678d7",
+ "x": 1429.7143211364746,
+ "y": 490.00014877319336,
+ "z": "811cb3d0.df7",
"wires": [
[
- "2f21e786.1474c8"
+ "e81b9c86.1c484"
]
]
},
{
- "id": "2f21e786.1474c8",
+ "id": "e81b9c86.1c484",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1709.0105609893799,
- "y": 483.00003123283386,
- "z": "fa825249.678d7",
+ "x": 1670.714448928833,
+ "y": 483.0001459121704,
+ "z": "811cb3d0.df7",
"wires": [
[
- "935557d5.b42b38"
+ "e2120549.90ce38"
]
]
},
{
- "id": "935557d5.b42b38",
+ "id": "e2120549.90ce38",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1861.0105323791504,
- "y": 485.00002455711365,
- "z": "fa825249.678d7",
+ "x": 1822.7144203186035,
+ "y": 485.0001392364502,
+ "z": "811cb3d0.df7",
"wires": [
[
- "b801dc09.3262a",
- "fd33c1ac.d18c2",
- "49806a1a.1b29c4"
+ "a9962147.95e54",
+ "a06c71d8.3073f",
+ "4f41068e.276488"
]
]
},
{
- "id": "b801dc09.3262a",
+ "id": "a9962147.95e54",
"type": "set",
"name": "set tmp.vidx and ctx.vnf-data",
"xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
"comments": "",
- "x": 2083.0105323791504,
- "y": 481.00002455711365,
- "z": "fa825249.678d7",
+ "x": 2044.7144203186035,
+ "y": 481.0001392364502,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "fd33c1ac.d18c2",
+ "id": "a06c71d8.3073f",
"type": "set",
"name": "set vf-module-request-input.",
"xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
"comments": "",
- "x": 2089.0105323791504,
- "y": 530.0000245571136,
- "z": "fa825249.678d7",
+ "x": 2050.7144203186035,
+ "y": 530.0001392364502,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "49806a1a.1b29c4",
+ "id": "4f41068e.276488",
"type": "call",
- "name": "call sdwan-get-vf-module-device-param",
- "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' >\n",
+ "name": "call sdwan-get-wan-param",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 2117.010753631592,
- "y": 578.0000302791595,
- "z": "fa825249.678d7",
+ "x": 2047.7146301269531,
+ "y": 577.0001640319824,
+ "z": "811cb3d0.df7",
"wires": [
[]
]
},
{
- "id": "5b7d49e0.41f2f8",
+ "id": "6a64350b.28076c",
"type": "switchNode",
"name": "switch tmp.vidx ",
"xml": "<switch test=\"`$tmp.vidx`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 569.0416526794434,
- "y": 522.0161073207855,
- "z": "fa825249.678d7",
+ "x": 530.7455406188965,
+ "y": 522.0162220001221,
+ "z": "811cb3d0.df7",
"wires": [
[
- "93788503.77e6c8"
+ "81340348.a1108"
]
]
},
{
- "id": "93788503.77e6c8",
+ "id": "81340348.a1108",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 716.4702949523926,
- "y": 521.5875174999237,
- "z": "fa825249.678d7",
+ "x": 678.1741828918457,
+ "y": 521.5876321792603,
+ "z": "811cb3d0.df7",
"wires": [
[
- "70fed172.85f44"
+ "11a722f5.6f62ed"
]
]
},
{
- "id": "70fed172.85f44",
+ "id": "11a722f5.6f62ed",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
"comments": "",
- "x": 865.8990211486816,
- "y": 522.7304351329803,
- "z": "fa825249.678d7",
+ "x": 827.6029090881348,
+ "y": 522.7305498123169,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "8b01c2d1.84cd3",
+ "id": "da14742e.a382e8",
"type": "switchNode",
"name": "switch vf-module-oper-status",
"xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",
"comments": "",
"outputs": 1,
- "x": 613.3398132324219,
- "y": 592.3333127498627,
- "z": "fa825249.678d7",
+ "x": 575.043701171875,
+ "y": 592.3334274291992,
+ "z": "811cb3d0.df7",
"wires": [
[
- "223c17b4.64b778",
- "e9d52081.e76dc"
+ "f2a53e72.39754",
+ "a36c3118.17722"
]
]
},
{
- "id": "223c17b4.64b778",
+ "id": "f2a53e72.39754",
"type": "outcome",
"name": "outcome PendingDelete",
"xml": "<outcome value='PendingDelete'>\n",
"comments": "",
"outputs": 1,
- "x": 904.1730804443359,
- "y": 596.4444358348846,
- "z": "fa825249.678d7",
+ "x": 865.8769683837891,
+ "y": 596.4445505142212,
+ "z": "811cb3d0.df7",
"wires": [
[
- "814b2c34.1fd7f"
+ "d03e05d1.e8c3f8"
]
]
},
{
- "id": "e9d52081.e76dc",
+ "id": "a36c3118.17722",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 871.1732177734375,
- "y": 648.4444885253906,
- "z": "fa825249.678d7",
+ "x": 832.8771057128906,
+ "y": 648.4446032047272,
+ "z": "811cb3d0.df7",
"wires": [
[
- "714ed175.ddb84"
+ "9b8ea994.f38dc8"
]
]
},
{
- "id": "714ed175.ddb84",
+ "id": "9b8ea994.f38dc8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
"comments": "",
- "x": 1030.6729850769043,
- "y": 651.4444875717163,
- "z": "fa825249.678d7",
+ "x": 992.3768730163574,
+ "y": 651.4446022510529,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "814b2c34.1fd7f",
+ "id": "d03e05d1.e8c3f8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1101.4794807434082,
- "y": 606.769590139389,
- "z": "fa825249.678d7",
+ "x": 1063.1833686828613,
+ "y": 606.7697048187256,
+ "z": "811cb3d0.df7",
"wires": [
[]
]
},
{
- "id": "67cd24d6.a0f83c",
+ "id": "7182ec74.f348c4",
"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": 562.031307220459,
- "y": 966.0313129425049,
- "z": "fa825249.678d7",
+ "x": 523.7351951599121,
+ "y": 966.0314276218414,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "27503470.8bf84c",
+ "id": "452859c9.e498f8",
"type": "for",
"name": "for lidx..service-data.vf-modules.vf-module[]",
"xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 644.1178894042969,
- "y": 712.1424579620361,
- "z": "fa825249.678d7",
+ "x": 605.82177734375,
+ "y": 712.1425726413727,
+ "z": "811cb3d0.df7",
"wires": [
[
- "666e6c4f.f97484"
+ "ae40c7e9.213d38"
]
]
},
{
- "id": "dce00f39.1d9f7",
+ "id": "c7649fe7.d4fb9",
"type": "set",
"name": "set new vnf length",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
"comments": "",
- "x": 568.2192611694336,
- "y": 764.9466757774353,
- "z": "fa825249.678d7",
+ "x": 529.9231491088867,
+ "y": 764.9467904567719,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "9d21b2cd.86c73",
+ "id": "9d43ca3e.815638",
"type": "set",
"name": "Remove vnf from ServiceData",
"xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",
"comments": "",
- "x": 605.1179351806641,
- "y": 815.1424608230591,
- "z": "fa825249.678d7",
+ "x": 566.8218231201172,
+ "y": 815.1425755023956,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "666e6c4f.f97484",
+ "id": "ae40c7e9.213d38",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 904.1178798675537,
- "y": 719.1423177719116,
- "z": "fa825249.678d7",
+ "x": 865.8217678070068,
+ "y": 719.1424324512482,
+ "z": "811cb3d0.df7",
"wires": [
[
- "46998b08.18a904"
+ "e08d014a.44fec"
]
]
},
{
- "id": "a35824b0.8bb6e8",
+ "id": "ebdf21b1.cc8c7",
"type": "delete",
"name": "delete wanport vf instance configuration in AAI",
"xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='site-resource' \n key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",
"comments": "",
"outputs": 1,
- "x": 654.1183090209961,
- "y": 906.4041156768799,
- "z": "fa825249.678d7",
+ "x": 615.8221969604492,
+ "y": 906.4042303562164,
+ "z": "811cb3d0.df7",
"wires": [
[]
]
},
{
- "id": "46998b08.18a904",
+ "id": "e08d014a.44fec",
"type": "switchNode",
"name": "switch vnf-id found",
"xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.vf-module-information.vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1090.1179466247559,
- "y": 719.1424784660339,
- "z": "fa825249.678d7",
+ "x": 1051.821834564209,
+ "y": 719.1425931453705,
+ "z": "811cb3d0.df7",
"wires": [
[
- "52431b6f.b34934"
+ "eabeafc3.ee56a"
]
]
},
{
- "id": "52431b6f.b34934",
+ "id": "eabeafc3.ee56a",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1259.1179542541504,
- "y": 718.142315864563,
- "z": "fa825249.678d7",
+ "x": 1220.8218421936035,
+ "y": 718.1424305438995,
+ "z": "811cb3d0.df7",
"wires": [
[
- "2b619a80.4a9f36"
+ "d4085bbc.a3d7c8"
]
]
},
{
- "id": "2b619a80.4a9f36",
+ "id": "d4085bbc.a3d7c8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1413.117793083191,
- "y": 710.1423168182373,
- "z": "fa825249.678d7",
+ "x": 1374.821681022644,
+ "y": 710.1424314975739,
+ "z": "811cb3d0.df7",
"wires": [
[
- "466caa7f.55c334",
- "921821fe.9836b"
+ "69725eb0.1ff91",
+ "c86d78ea.65d938"
]
]
},
{
- "id": "466caa7f.55c334",
+ "id": "69725eb0.1ff91",
"type": "set",
"name": "set vnf data",
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\n",
"comments": "",
- "x": 1578.1178884506226,
- "y": 685.1424722671509,
- "z": "fa825249.678d7",
+ "x": 1539.8217763900757,
+ "y": 685.1425869464874,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "921821fe.9836b",
+ "id": "c86d78ea.65d938",
"type": "set",
"name": "set prop.vnfNewidx",
"xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
"comments": "",
- "x": 1600.1178884506226,
- "y": 741.1424360275269,
- "z": "fa825249.678d7",
+ "x": 1561.8217763900757,
+ "y": 741.1425507068634,
+ "z": "811cb3d0.df7",
"wires": []
},
{
- "id": "827a72ac.9aabf",
+ "id": "23273105.4d68be",
"type": "set",
"name": "set vf-module-object-path",
"xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
"comments": "",
- "x": 591.9201431274414,
- "y": 860.4757957458496,
- "z": "fa825249.678d7",
+ "x": 553.6240310668945,
+ "y": 860.4759104251862,
+ "z": "811cb3d0.df7",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions index a049e64e..065a656b 100755 --- a/platform-logic/generic-resource-api/src/main/resources/graph.versions +++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions @@ -229,3 +229,29 @@ GENERIC-RESOURCE-API wan-connection-topology-operation-create ${project.version} GENERIC-RESOURCE-API wan-connection-topology-operation-activate ${project.version} sync GENERIC-RESOURCE-API wan-connection-topology-operation-deactivate ${project.version} sync GENERIC-RESOURCE-API wan-connection-topology-operation-delete ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-device-create ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-device-activate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-device-deactivate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-device-delete ${project.version} sync +GENERIC-RESOURCE-API sdwan-get-vf-module-device-param ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-site-create ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-site-activate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-site-deactivate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-site-delete ${project.version} sync +GENERIC-RESOURCE-API sdwan-get-vf-module-site-param ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-wanport-create ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-wanport-activate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-wanport-deactivate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-wanport-delete ${project.version} sync +GENERIC-RESOURCE-API sdwan-get-wan-param ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-vpn-create ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-vpn-activate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-vpn-deactivate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-vpn-delete ${project.version} sync +GENERIC-RESOURCE-API validate-sdwan-vf-vpn-input-parameters ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-lanport-create ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-lanport-activate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-lanport-deactivate ${project.version} sync +GENERIC-RESOURCE-API sdwan-vf-operation-lanport-delete ${project.version} sync +GENERIC-RESOURCE-API sdwan-get-vf-module-lanport-param ${project.version} sync +GENERIC-RESOURCE-API sdwan-bandwidth-policy-change ${project.version} sync diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml index 0c728d4b..a108518a 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-site-delete.xml @@ -52,7 +52,7 @@ <set>
<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
</set>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-site-param' mode='sync' ></call>
</block>
</outcome>
</switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml index 587f6cc0..710925da 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-delete.xml @@ -52,7 +52,7 @@ <set>
<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
</set>
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' ></call>
</block>
</outcome>
</switch>
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 18a63f29..781faaa6 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,813 +1,1083 @@ [
{
- "id": "ab475552.d851d8",
+ "id": "fe0acee3.b3d4f",
"type": "method",
"name": "upgrade-post-check",
"xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 548,
- "y": 59,
- "z": "802a6e37.fb3c1",
+ "x": 523,
+ "y": 71,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "356938f4.e6ef78"
+ "88d3f9c3.91e818"
]
]
},
{
- "id": "db22c5e0.c4b368",
+ "id": "dd69f330.0db38",
"type": "service-logic",
- "name": "LCM 1.4.5",
+ "name": "LCM ${project.version}",
"module": "LCM",
- "version": "1.4.5",
+ "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": 335.99993896484375,
- "y": 60,
- "z": "802a6e37.fb3c1",
+ "x": 310.99993896484375,
+ "y": 72,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "ab475552.d851d8"
+ "fe0acee3.b3d4f"
]
]
},
{
- "id": "74883a0a.669d34",
+ "id": "ca77e1d2.5f235",
"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='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 403.00001525878906,
- "y": 667,
- "z": "802a6e37.fb3c1",
+ "x": 378.00001525878906,
+ "y": 679,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "8efae65a.30c7b8",
- "fdc248e2.dda948",
- "fc8e86cf.976918"
+ "98532a13.9e8648",
+ "300b9189.6839ae",
+ "93689f4a.8157"
]
]
},
{
- "id": "ea8ede8a.5e5e7",
+ "id": "338f7649.ef4e9a",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 802.9999389648438,
- "y": 775.0000305175781,
- "z": "802a6e37.fb3c1",
+ "x": 777.9999389648438,
+ "y": 787.0000305175781,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "ed747ae6.f82e38",
- "d348a5a9.90bb58",
- "606ee94e.547568"
+ "13e6fdd5.284672",
+ "558456ec.861628",
+ "d84c0d6b.4e961"
]
]
},
{
- "id": "ed747ae6.f82e38",
+ "id": "13e6fdd5.284672",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 947.9999389648438,
- "y": 773.0000381469727,
- "z": "802a6e37.fb3c1",
+ "x": 922.9999389648438,
+ "y": 785.0000381469727,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "8e974f56.dbd44"
+ "d4f3b77a.b39508"
]
]
},
{
- "id": "d348a5a9.90bb58",
+ "id": "558456ec.861628",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 944.9999389648438,
- "y": 830.0000305175781,
- "z": "802a6e37.fb3c1",
+ "x": 919.9999389648438,
+ "y": 842.0000305175781,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "5fe71ec4.57d62"
+ "a1c39fcf.a06c"
]
]
},
{
- "id": "5fe71ec4.57d62",
+ "id": "a1c39fcf.a06c",
"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='`$playbookname`'/>\n\t\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1132.9999389648438,
- "y": 829.0000305175781,
- "z": "802a6e37.fb3c1",
+ "x": 1107.9999389648438,
+ "y": 841.0000305175781,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "484e1e77.a4c4c",
- "ef7a898e.c55ae8"
+ "f58c60bb.b391f",
+ "b18d4538.e8ef28"
]
]
},
{
- "id": "fdc248e2.dda948",
+ "id": "300b9189.6839ae",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 661.9999389648438,
- "y": 688.0000915527344,
- "z": "802a6e37.fb3c1",
+ "x": 636.9999389648438,
+ "y": 700.0000915527344,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "8e974f56.dbd44"
+ "d4f3b77a.b39508"
]
]
},
{
- "id": "8efae65a.30c7b8",
+ "id": "98532a13.9e8648",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 663.9999389648438,
- "y": 740.0000610351562,
- "z": "802a6e37.fb3c1",
+ "x": 638.9999389648438,
+ "y": 752.0000610351562,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "ea8ede8a.5e5e7"
+ "338f7649.ef4e9a"
]
]
},
{
- "id": "484e1e77.a4c4c",
+ "id": "f58c60bb.b391f",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1301.9999389648438,
- "y": 787.0000381469727,
- "z": "802a6e37.fb3c1",
+ "x": 1278.9998779296875,
+ "y": 820.0000610351562,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "8e974f56.dbd44"
+ "44e1b1d0.b5bf9"
]
]
},
{
- "id": "606ee94e.547568",
+ "id": "d84c0d6b.4e961",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 944.9999389648438,
- "y": 731.0000686645508,
- "z": "802a6e37.fb3c1",
+ "x": 919.9999389648438,
+ "y": 743.0000686645508,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "8e974f56.dbd44"
+ "d4f3b77a.b39508"
]
]
},
{
- "id": "ef7a898e.c55ae8",
+ "id": "b18d4538.e8ef28",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1309.9998779296875,
- "y": 835.0001220703125,
- "z": "802a6e37.fb3c1",
+ "x": 1281.9998779296875,
+ "y": 871.0001220703125,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "565fc0b9.1ff1a"
+ "44e1b1d0.b5bf9"
]
]
},
{
- "id": "bca33267.b186f",
- "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": 1603.9998779296875,
- "y": 892.0000610351562,
- "z": "802a6e37.fb3c1",
- "wires": []
- },
- {
- "id": "f3c40140.4762d",
+ "id": "67392fb2.3fda3",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 151,
- "y": 59,
- "z": "802a6e37.fb3c1",
+ "x": 126,
+ "y": 71,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "db22c5e0.c4b368"
+ "dd69f330.0db38"
]
]
},
{
- "id": "356938f4.e6ef78",
+ "id": "88d3f9c3.91e818",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 148.91668701171875,
- "y": 151.08334350585938,
- "z": "802a6e37.fb3c1",
+ "x": 123.91668701171875,
+ "y": 163.08334350585938,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "74883a0a.669d34",
- "5f157934.113238",
- "fad67e1f.e709b",
- "f04f2fb5.8c0ca",
- "a1aa3253.06afa",
- "e636c2ac.2dc0d",
- "8b5b2558.88c888",
- "89a1b60f.9a2848"
+ "ca77e1d2.5f235",
+ "c7ec6050.45978",
+ "889f84ed.e111e8",
+ "40652fca.65d24",
+ "983b7f00.0aa95",
+ "43b098aa.2b8088",
+ "3c8d18f4.57a768",
+ "5c9efc94.d81d24"
]
]
},
{
- "id": "5f157934.113238",
+ "id": "c7ec6050.45978",
"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": 447.0000305175781,
- "y": 184.08334350585938,
- "z": "802a6e37.fb3c1",
+ "x": 422.0000305175781,
+ "y": 196.08334350585938,
+ "z": "b4969602.e5a2a8",
"wires": [
[]
]
},
{
- "id": "9c2d2fed.0688d",
+ "id": "d9d2286.379c4d8",
"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": 1613.9998779296875,
- "y": 637.0834045410156,
- "z": "802a6e37.fb3c1",
+ "x": 1588.9998779296875,
+ "y": 649.0834045410156,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "789af377.cced2c"
+ "642ae55d.535a7c"
]
]
},
{
- "id": "789af377.cced2c",
+ "id": "642ae55d.535a7c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1783.9998168945312,
- "y": 636.0834045410156,
- "z": "802a6e37.fb3c1",
+ "x": 1758.9998168945312,
+ "y": 648.0834045410156,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "c75d24f.c2de2d8"
+ "7969554f.e56e0c"
]
]
},
{
- "id": "8e974f56.dbd44",
+ "id": "d4f3b77a.b39508",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1416.9998168945312,
- "y": 661.0834045410156,
- "z": "802a6e37.fb3c1",
+ "x": 1391.9998168945312,
+ "y": 673.0834045410156,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "9c2d2fed.0688d",
- "a0c3935d.9a935",
- "82255155.ccaef"
+ "d9d2286.379c4d8",
+ "8a00ee98.85d8c",
+ "a967853.2e08a78"
]
]
},
{
- "id": "2939808a.b52ef",
+ "id": "61a865a3.81374c",
"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": 1614.4998779296875,
- "y": 842.0833740234375,
- "z": "802a6e37.fb3c1",
+ "x": 1600.4998779296875,
+ "y": 904.0833740234375,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "22bed4c.08b6a2c"
+ "bf6e3414.ac0ab8"
]
]
},
{
- "id": "22bed4c.08b6a2c",
+ "id": "bf6e3414.ac0ab8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
"x": 1782.4998779296875,
- "y": 842.0833740234375,
- "z": "802a6e37.fb3c1",
+ "y": 904.0833740234375,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "8841bc4a.67149"
+ "a98ac8b6.1c8b18"
]
]
},
{
- "id": "c75d24f.c2de2d8",
+ "id": "7969554f.e56e0c",
"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": 1903.9998779296875,
- "y": 635.0833740234375,
- "z": "802a6e37.fb3c1",
+ "x": 1878.9998779296875,
+ "y": 647.0833740234375,
+ "z": "b4969602.e5a2a8",
"wires": [
[]
]
},
{
- "id": "a0c3935d.9a935",
+ "id": "8a00ee98.85d8c",
"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": 1595.91650390625,
- "y": 688.0834045410156,
- "z": "802a6e37.fb3c1",
+ "x": 1570.91650390625,
+ "y": 700.0834045410156,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "8841bc4a.67149",
+ "id": "a98ac8b6.1c8b18",
"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": 1910.9166259765625,
- "y": 842.0833740234375,
- "z": "802a6e37.fb3c1",
+ "x": 1912.9166259765625,
+ "y": 904.0833740234375,
+ "z": "b4969602.e5a2a8",
"wires": [
[]
]
},
{
- "id": "82255155.ccaef",
+ "id": "a967853.2e08a78",
"type": "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": 1600.9998779296875,
- "y": 584.0833740234375,
- "z": "802a6e37.fb3c1",
+ "x": 1575.9998779296875,
+ "y": 596.0833740234375,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "565fc0b9.1ff1a",
+ "id": "44e1b1d0.b5bf9",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1437.9998779296875,
- "y": 836.0833740234375,
- "z": "802a6e37.fb3c1",
+ "x": 1406.9998779296875,
+ "y": 845.0833740234375,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "2939808a.b52ef",
- "cd18f032.f6fef",
- "bca33267.b186f"
+ "61a865a3.81374c",
+ "af2360f3.a1b32",
+ "c058b1a3.cafa7",
+ "d59d4575.f7aa08",
+ "97b68625.59c538"
]
]
},
{
- "id": "cd18f032.f6fef",
+ "id": "72836a7a.768624",
"type": "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": 1604.1666259765625,
- "y": 787.0833740234375,
- "z": "802a6e37.fb3c1",
+ "x": 1938.1666259765625,
+ "y": 819.0833740234375,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "fc8e86cf.976918",
+ "id": "93689f4a.8157",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 670.9999389648438,
- "y": 640.0000610351562,
- "z": "802a6e37.fb3c1",
+ "x": 645.9999389648438,
+ "y": 652.0000610351562,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "95e77813.ba9108"
+ "c92e96da.bead68"
]
]
},
{
- "id": "60c18ca3.4f03c4",
+ "id": "3705b5ae.a55ada",
"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": 961.9999389648438,
- "y": 599,
- "z": "802a6e37.fb3c1",
+ "x": 936.9999389648438,
+ "y": 611,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "95e77813.ba9108",
+ "id": "c92e96da.bead68",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 807.9999389648438,
- "y": 634.0000610351562,
- "z": "802a6e37.fb3c1",
+ "x": 782.9999389648438,
+ "y": 646.0000610351562,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "60c18ca3.4f03c4",
- "8e974f56.dbd44"
+ "3705b5ae.a55ada",
+ "d4f3b77a.b39508"
]
]
},
{
- "id": "fad67e1f.e709b",
+ "id": "889f84ed.e111e8",
"type": "set",
"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",
+ "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<parameter name='outputPayloadField' value='.Output' />\n",
"comments": "",
- "x": 440,
- "y": 231,
- "z": "802a6e37.fb3c1",
+ "x": 415,
+ "y": 243,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "24f45898.65de18",
+ "id": "9e2047bf.84ca98",
"type": "get-resource",
"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": 980,
- "y": 407,
- "z": "802a6e37.fb3c1",
+ "x": 955,
+ "y": 419,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "3a57fbc.0ac6d04"
+ "db67679b.d5f7f8"
]
]
},
{
- "id": "3a57fbc.0ac6d04",
+ "id": "db67679b.d5f7f8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1138.3907470703125,
- "y": 405.28399658203125,
- "z": "802a6e37.fb3c1",
+ "x": 1113.3907470703125,
+ "y": 417.28399658203125,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "721a47cc.cdf2d8"
+ "9f78147c.45b0d8"
]
]
},
{
- "id": "8b5b2558.88c888",
+ "id": "3c8d18f4.57a768",
"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": 368.9998779296875,
- "y": 595,
- "z": "802a6e37.fb3c1",
+ "x": 343.9998779296875,
+ "y": 607,
+ "z": "b4969602.e5a2a8",
"wires": [
[]
]
},
{
- "id": "a1aa3253.06afa",
+ "id": "983b7f00.0aa95",
"type": "switchNode",
"name": "switch pnf-flag",
"xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
"comments": "",
"outputs": 1,
- "x": 422,
- "y": 332,
- "z": "802a6e37.fb3c1",
+ "x": 397,
+ "y": 344,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "9417db8c.51c568",
- "9e3df3f5.2c2d9"
+ "6ab53366.6b679c",
+ "c2f80dd0.8d1"
]
]
},
{
- "id": "f04f2fb5.8c0ca",
+ "id": "40652fca.65d24",
"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": 454,
- "y": 278,
- "z": "802a6e37.fb3c1",
+ "x": 429,
+ "y": 290,
+ "z": "b4969602.e5a2a8",
"wires": [
[]
]
},
{
- "id": "9417db8c.51c568",
+ "id": "6ab53366.6b679c",
"type": "outcome",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 619,
- "y": 311,
- "z": "802a6e37.fb3c1",
+ "x": 594,
+ "y": 323,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "94353f3f.e7eee"
+ "b2f335c.b319ac8"
]
]
},
{
- "id": "9e3df3f5.2c2d9",
+ "id": "c2f80dd0.8d1",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 618.9999389648438,
- "y": 372,
- "z": "802a6e37.fb3c1",
+ "x": 593.9999389648438,
+ "y": 384,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "95b6db3f.a43608"
+ "64084999.263e28"
]
]
},
{
- "id": "95b6db3f.a43608",
+ "id": "64084999.263e28",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 766.9999389648438,
- "y": 371,
- "z": "802a6e37.fb3c1",
+ "x": 741.9999389648438,
+ "y": 383,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "24f45898.65de18",
- "240a5e4b.ef6af2"
+ "9e2047bf.84ca98",
+ "1c2838e7.02c327"
]
]
},
{
- "id": "94353f3f.e7eee",
+ "id": "b2f335c.b319ac8",
"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",
+ "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<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
"comments": "",
- "x": 780,
- "y": 309,
- "z": "802a6e37.fb3c1",
+ "x": 755,
+ "y": 321,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "240a5e4b.ef6af2",
+ "id": "1c2838e7.02c327",
"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": 989,
- "y": 351,
- "z": "802a6e37.fb3c1",
+ "x": 964,
+ "y": 363,
+ "z": "b4969602.e5a2a8",
"wires": [
[]
]
},
{
- "id": "e636c2ac.2dc0d",
+ "id": "43b098aa.2b8088",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 419,
- "y": 463,
- "z": "802a6e37.fb3c1",
+ "x": 394,
+ "y": 475,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "a65bd4c9.27f638"
+ "f5a4d554.8310a8"
]
]
},
{
- "id": "a65bd4c9.27f638",
+ "id": "f5a4d554.8310a8",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 590,
- "y": 464,
- "z": "802a6e37.fb3c1",
+ "x": 565,
+ "y": 476,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "286bc0d0.e5819"
+ "e3207caa.85b44"
]
]
},
{
- "id": "286bc0d0.e5819",
+ "id": "e3207caa.85b44",
"type": "set",
"name": "set playbookname",
"xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
"comments": "",
- "x": 780,
- "y": 463,
- "z": "802a6e37.fb3c1",
+ "x": 755,
+ "y": 475,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "89a1b60f.9a2848",
+ "id": "5c9efc94.d81d24",
"type": "switchNode",
"name": "switch nodelist",
"xml": "<switch test='`$nodelist`'>\n",
"comments": "",
"outputs": 1,
- "x": 409,
- "y": 522,
- "z": "802a6e37.fb3c1",
+ "x": 384,
+ "y": 534,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "10bd0563.dd89eb",
- "9f1eacfe.fa54"
+ "77224991.c20a78",
+ "2deab8c5.642298"
]
]
},
{
- "id": "10bd0563.dd89eb",
+ "id": "77224991.c20a78",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 589,
- "y": 515,
- "z": "802a6e37.fb3c1",
+ "x": 564,
+ "y": 527,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "f0ef60d3.f64f"
+ "3881d027.425ff"
]
]
},
{
- "id": "f0ef60d3.f64f",
+ "id": "3881d027.425ff",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 746,
- "y": 529,
- "z": "802a6e37.fb3c1",
+ "x": 721,
+ "y": 541,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "9f1eacfe.fa54",
+ "id": "2deab8c5.642298",
"type": "outcome",
"name": "empty",
"xml": "<outcome value=\"['']\">\n\n",
"comments": "",
"outputs": 1,
- "x": 588,
- "y": 559,
- "z": "802a6e37.fb3c1",
+ "x": 563,
+ "y": 571,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "f0ef60d3.f64f"
+ "3881d027.425ff"
]
]
},
{
- "id": "26d43493.24ca8c",
+ "id": "153ed401.962ddc",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 1464,
- "y": 394,
- "z": "802a6e37.fb3c1",
+ "x": 1439,
+ "y": 406,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "ad0fd429.dd1178"
+ "3cfaf009.20065"
]
]
},
{
- "id": "ad0fd429.dd1178",
+ "id": "3cfaf009.20065",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1642,
- "y": 394,
- "z": "802a6e37.fb3c1",
+ "x": 1617,
+ "y": 406,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "bbed41e1.ca0c4"
+ "8e725f1f.6662f"
]
]
},
{
- "id": "3935df66.a3be5",
+ "id": "9e70216f.c9b2f",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
"comments": "",
- "x": 1437,
- "y": 447,
- "z": "802a6e37.fb3c1",
+ "x": 1412,
+ "y": 459,
+ "z": "b4969602.e5a2a8",
"wires": []
},
{
- "id": "721a47cc.cdf2d8",
+ "id": "9f78147c.45b0d8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1267,
- "y": 404,
- "z": "802a6e37.fb3c1",
+ "x": 1242,
+ "y": 416,
+ "z": "b4969602.e5a2a8",
"wires": [
[
- "26d43493.24ca8c",
- "3935df66.a3be5"
+ "153ed401.962ddc",
+ "9e70216f.c9b2f"
]
]
},
{
- "id": "bbed41e1.ca0c4",
+ "id": "8e725f1f.6662f",
"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": 1814,
- "y": 392,
- "z": "802a6e37.fb3c1",
+ "x": 1789,
+ "y": 404,
+ "z": "b4969602.e5a2a8",
"wires": [
[]
]
+ },
+ {
+ "id": "af2360f3.a1b32",
+ "type": "execute",
+ "name": "execute jsonStringToCtx",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1616,
+ "y": 750,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "c058b1a3.cafa7",
+ "type": "execute",
+ "name": "execute getAttributeValue",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson' + $outputPayloadField`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1622,
+ "y": 793,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "d59d4575.f7aa08",
+ "type": "switchNode",
+ "name": "switch outputPayload",
+ "xml": "<switch test='`$outputPayload`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1606,
+ "y": 840,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "676d5ce5.e9d864",
+ "8ecd1678.ebdff8"
+ ]
+ ]
+ },
+ {
+ "id": "676d5ce5.e9d864",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1783,
+ "y": 819,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "72836a7a.768624"
+ ]
+ ]
+ },
+ {
+ "id": "8ecd1678.ebdff8",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1782,
+ "y": 859,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "5f5e736e.9d3b8c"
+ ]
+ ]
+ },
+ {
+ "id": "5f5e736e.9d3b8c",
+ "type": "set",
+ "name": "set DmaapReq with payload",
+ "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<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+ "comments": "",
+ "x": 1980,
+ "y": 859,
+ "z": "b4969602.e5a2a8",
+ "wires": []
+ },
+ {
+ "id": "bd7deada.205038",
+ "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": 2322,
+ "y": 937,
+ "z": "b4969602.e5a2a8",
+ "wires": []
+ },
+ {
+ "id": "530e9d63.07dd34",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1788.000244140625,
+ "y": 958.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "aba50f21.a535d"
+ ]
+ ]
+ },
+ {
+ "id": "d6c0e471.9108d8",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1787.000244140625,
+ "y": 1034.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "801dd50e.8622c8"
+ ]
+ ]
+ },
+ {
+ "id": "97b68625.59c538",
+ "type": "switchNode",
+ "name": "switch outputPayload",
+ "xml": "<switch test='`$outputPayload`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1605.000244140625,
+ "y": 994.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "530e9d63.07dd34",
+ "d6c0e471.9108d8"
+ ]
+ ]
+ },
+ {
+ "id": "acbbf9db.eeba28",
+ "type": "returnSuccess",
+ "name": "return success with payload",
+ "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`'/>\n<parameter name='payload' value='`$outputPayload`'/>",
+ "comments": "",
+ "x": 2363.000244140625,
+ "y": 1018.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": []
+ },
+ {
+ "id": "aba50f21.a535d",
+ "type": "switchNode",
+ "name": "switch result code",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1958.000244140625,
+ "y": 958.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "3ac4241b.62144c",
+ "c67e4b5c.d70a28"
+ ]
+ ]
+ },
+ {
+ "id": "801dd50e.8622c8",
+ "type": "switchNode",
+ "name": "switch result code",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1958.000244140625,
+ "y": 1034.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "8dcd3ae3.608a58",
+ "a94e8dc6.52647"
+ ]
+ ]
+ },
+ {
+ "id": "657ecc9e.2687c4",
+ "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": 2316.000244140625,
+ "y": 974.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": []
+ },
+ {
+ "id": "52f49f6f.dcf4",
+ "type": "returnFailure",
+ "name": "return failure with payload",
+ "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",
+ "comments": "",
+ "x": 2359.000244140625,
+ "y": 1056.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": []
+ },
+ {
+ "id": "3ac4241b.62144c",
+ "type": "other",
+ "name": "outcome 400",
+ "xml": "<outcome value='400'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2146.000244140625,
+ "y": 936.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "bd7deada.205038"
+ ]
+ ]
+ },
+ {
+ "id": "c67e4b5c.d70a28",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2127.000244140625,
+ "y": 974.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "657ecc9e.2687c4"
+ ]
+ ]
+ },
+ {
+ "id": "8dcd3ae3.608a58",
+ "type": "other",
+ "name": "outcome 400",
+ "xml": "<outcome value='400'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2147.000244140625,
+ "y": 1018.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "acbbf9db.eeba28"
+ ]
+ ]
+ },
+ {
+ "id": "a94e8dc6.52647",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2129.000244140625,
+ "y": 1056.9999389648438,
+ "z": "b4969602.e5a2a8",
+ "wires": [
+ [
+ "52f49f6f.dcf4"
+ ]
+ ]
}
]
\ No newline at end of file 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 08b896ec..0239c763 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,813 +1,1083 @@ [
{
- "id": "dfc42d29.4066",
+ "id": "e17c1584.f756d8",
"type": "method",
"name": "upgrade-pre-check",
"xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 554,
- "y": 86,
- "z": "a5b492f8.99d13",
+ "x": 552,
+ "y": 67,
+ "z": "df893cfa.16f38",
"wires": [
[
- "dc3f6c8f.49cb4"
+ "4a691c8b.6b9db4"
]
]
},
{
- "id": "ec3ea72c.b00d38",
+ "id": "1f7a861d.c2112a",
"type": "service-logic",
- "name": "LCM 1.4.5",
+ "name": "LCM ${project.version}",
"module": "LCM",
- "version": "1.4.5",
+ "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": 341.99993896484375,
- "y": 87,
- "z": "a5b492f8.99d13",
+ "x": 339.99993896484375,
+ "y": 68,
+ "z": "df893cfa.16f38",
"wires": [
[
- "dfc42d29.4066"
+ "e17c1584.f756d8"
]
]
},
{
- "id": "aa4b4733.b95e98",
+ "id": "bb18ce54.65a6d",
"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='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 409.00001525878906,
- "y": 694,
- "z": "a5b492f8.99d13",
+ "x": 407.00001525878906,
+ "y": 675,
+ "z": "df893cfa.16f38",
"wires": [
[
- "eed23890.382f88",
- "39c73cda.20f284",
- "d5d4d9a.dfdee28"
+ "c6f98872.c067e8",
+ "5614f2d4.83759c",
+ "1beab9a5.7e2366"
]
]
},
{
- "id": "c2461908.a56de8",
+ "id": "8e97cc56.5d143",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 808.9999389648438,
- "y": 802.0000305175781,
- "z": "a5b492f8.99d13",
+ "x": 806.9999389648438,
+ "y": 783.0000305175781,
+ "z": "df893cfa.16f38",
"wires": [
[
- "21b1a494.57eb8c",
- "c0ddf646.939658",
- "c13b6a1f.ac5838"
+ "d5d391c0.e33eb",
+ "96569d9a.8f849",
+ "8eb6da31.c976d8"
]
]
},
{
- "id": "21b1a494.57eb8c",
+ "id": "d5d391c0.e33eb",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 953.9999389648438,
- "y": 800.0000381469727,
- "z": "a5b492f8.99d13",
+ "x": 951.9999389648438,
+ "y": 781.0000381469727,
+ "z": "df893cfa.16f38",
"wires": [
[
- "c0fa5e3.de329a"
+ "261676ae.6c18ea"
]
]
},
{
- "id": "c0ddf646.939658",
+ "id": "96569d9a.8f849",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 950.9999389648438,
- "y": 857.0000305175781,
- "z": "a5b492f8.99d13",
+ "x": 948.9999389648438,
+ "y": 838.0000305175781,
+ "z": "df893cfa.16f38",
"wires": [
[
- "95b7bcea.2185b"
+ "a9aeb5d4.ad8218"
]
]
},
{
- "id": "95b7bcea.2185b",
+ "id": "a9aeb5d4.ad8218",
"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='`$playbookname`'/>\n\t\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1138.9999389648438,
- "y": 856.0000305175781,
- "z": "a5b492f8.99d13",
+ "x": 1136.9999389648438,
+ "y": 837.0000305175781,
+ "z": "df893cfa.16f38",
"wires": [
[
- "205ffc13.4d2b24",
- "c24e2446.933768"
+ "50e30f80.cb97b",
+ "f9b1e44f.cf0bf8"
]
]
},
{
- "id": "39c73cda.20f284",
+ "id": "5614f2d4.83759c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 667.9999389648438,
- "y": 715.0000915527344,
- "z": "a5b492f8.99d13",
+ "x": 665.9999389648438,
+ "y": 696.0000915527344,
+ "z": "df893cfa.16f38",
"wires": [
[
- "c0fa5e3.de329a"
+ "261676ae.6c18ea"
]
]
},
{
- "id": "eed23890.382f88",
+ "id": "c6f98872.c067e8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 669.9999389648438,
- "y": 767.0000610351562,
- "z": "a5b492f8.99d13",
+ "x": 667.9999389648438,
+ "y": 748.0000610351562,
+ "z": "df893cfa.16f38",
"wires": [
[
- "c2461908.a56de8"
+ "8e97cc56.5d143"
]
]
},
{
- "id": "205ffc13.4d2b24",
+ "id": "50e30f80.cb97b",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1307.9999389648438,
- "y": 814.0000381469727,
- "z": "a5b492f8.99d13",
+ "x": 1305.9998779296875,
+ "y": 819.0000610351562,
+ "z": "df893cfa.16f38",
"wires": [
[
- "c0fa5e3.de329a"
+ "7ac364bd.12e01c"
]
]
},
{
- "id": "c13b6a1f.ac5838",
+ "id": "8eb6da31.c976d8",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 950.9999389648438,
- "y": 758.0000686645508,
- "z": "a5b492f8.99d13",
+ "x": 948.9999389648438,
+ "y": 739.0000686645508,
+ "z": "df893cfa.16f38",
"wires": [
[
- "c0fa5e3.de329a"
+ "261676ae.6c18ea"
]
]
},
{
- "id": "c24e2446.933768",
+ "id": "f9b1e44f.cf0bf8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1315.9998779296875,
- "y": 862.0001220703125,
- "z": "a5b492f8.99d13",
+ "x": 1309.9998779296875,
+ "y": 863.0001220703125,
+ "z": "df893cfa.16f38",
"wires": [
[
- "1b8bc484.4e584b"
+ "7ac364bd.12e01c"
]
]
},
{
- "id": "425c7483.101a2c",
- "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": 1609.9998779296875,
- "y": 919.0000610351562,
- "z": "a5b492f8.99d13",
- "wires": []
- },
- {
- "id": "d9f050b3.ea908",
+ "id": "a40759ed.63a388",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 157,
- "y": 86,
- "z": "a5b492f8.99d13",
+ "x": 155,
+ "y": 67,
+ "z": "df893cfa.16f38",
"wires": [
[
- "ec3ea72c.b00d38"
+ "1f7a861d.c2112a"
]
]
},
{
- "id": "dc3f6c8f.49cb4",
+ "id": "4a691c8b.6b9db4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 154.91668701171875,
- "y": 178.08334350585938,
- "z": "a5b492f8.99d13",
+ "x": 152.91668701171875,
+ "y": 159.08334350585938,
+ "z": "df893cfa.16f38",
"wires": [
[
- "aa4b4733.b95e98",
- "ad12ad52.0e14c",
- "494bc731.2b3b38",
- "e7275d95.288b8",
- "790211fa.4ddc3",
- "87c25306.3bca6",
- "54a283d8.5df65c",
- "1cee6cc7.a0f263"
+ "bb18ce54.65a6d",
+ "4f789742.ddd168",
+ "2f15d339.87cf0c",
+ "556d2c3e.217c14",
+ "905f1137.7562f",
+ "5cc58e7c.083a5",
+ "db896c60.3d19a",
+ "ae5d9d02.d1fe4"
]
]
},
{
- "id": "ad12ad52.0e14c",
+ "id": "4f789742.ddd168",
"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": 453.0000305175781,
- "y": 211.08334350585938,
- "z": "a5b492f8.99d13",
+ "x": 451.0000305175781,
+ "y": 192.08334350585938,
+ "z": "df893cfa.16f38",
"wires": [
[]
]
},
{
- "id": "9aa2e4.6e1c5d2",
+ "id": "9f29e934.d196d8",
"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": 1619.9998779296875,
- "y": 664.0834045410156,
- "z": "a5b492f8.99d13",
+ "x": 1617.9998779296875,
+ "y": 645.0834045410156,
+ "z": "df893cfa.16f38",
"wires": [
[
- "fde058a0.d22348"
+ "eff6b07f.5f555"
]
]
},
{
- "id": "fde058a0.d22348",
+ "id": "eff6b07f.5f555",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1789.9998168945312,
- "y": 663.0834045410156,
- "z": "a5b492f8.99d13",
+ "x": 1787.9998168945312,
+ "y": 644.0834045410156,
+ "z": "df893cfa.16f38",
"wires": [
[
- "ff5c4bc7.d7c748"
+ "39c1e046.0c9a2"
]
]
},
{
- "id": "c0fa5e3.de329a",
+ "id": "261676ae.6c18ea",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1422.9998168945312,
- "y": 688.0834045410156,
- "z": "a5b492f8.99d13",
+ "x": 1420.9998168945312,
+ "y": 669.0834045410156,
+ "z": "df893cfa.16f38",
"wires": [
[
- "9aa2e4.6e1c5d2",
- "16091a49.ebb886",
- "320ba499.3a71fc"
+ "9f29e934.d196d8",
+ "20f5321f.fe2dee",
+ "b16d5209.3031f"
]
]
},
{
- "id": "d1627c41.4a916",
+ "id": "dd99789.6491a88",
"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": 1620.4998779296875,
- "y": 869.0833740234375,
- "z": "a5b492f8.99d13",
+ "x": 1653.4998779296875,
+ "y": 911.0833740234375,
+ "z": "df893cfa.16f38",
"wires": [
[
- "cdd5a821.a26858"
+ "16bb547b.d2861c"
]
]
},
{
- "id": "cdd5a821.a26858",
+ "id": "16bb547b.d2861c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1788.4998779296875,
- "y": 869.0833740234375,
- "z": "a5b492f8.99d13",
+ "x": 1838.4998779296875,
+ "y": 911.0833740234375,
+ "z": "df893cfa.16f38",
"wires": [
[
- "6834bf03.5aff8"
+ "95e8f51a.226ea8"
]
]
},
{
- "id": "ff5c4bc7.d7c748",
+ "id": "39c1e046.0c9a2",
"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": 1909.9998779296875,
- "y": 662.0833740234375,
- "z": "a5b492f8.99d13",
+ "x": 1907.9998779296875,
+ "y": 643.0833740234375,
+ "z": "df893cfa.16f38",
"wires": [
[]
]
},
{
- "id": "16091a49.ebb886",
+ "id": "20f5321f.fe2dee",
"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": 1601.91650390625,
- "y": 715.0834045410156,
- "z": "a5b492f8.99d13",
+ "x": 1599.91650390625,
+ "y": 696.0834045410156,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "6834bf03.5aff8",
+ "id": "95e8f51a.226ea8",
"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": 1916.9166259765625,
- "y": 869.0833740234375,
- "z": "a5b492f8.99d13",
+ "x": 1970.9166259765625,
+ "y": 911.0833740234375,
+ "z": "df893cfa.16f38",
"wires": [
[]
]
},
{
- "id": "320ba499.3a71fc",
+ "id": "b16d5209.3031f",
"type": "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": 1606.9998779296875,
- "y": 611.0833740234375,
- "z": "a5b492f8.99d13",
+ "x": 1604.9998779296875,
+ "y": 592.0833740234375,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "1b8bc484.4e584b",
+ "id": "7ac364bd.12e01c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1443.9998779296875,
- "y": 863.0833740234375,
- "z": "a5b492f8.99d13",
+ "x": 1441.9998779296875,
+ "y": 838.0833740234375,
+ "z": "df893cfa.16f38",
"wires": [
[
- "d1627c41.4a916",
- "da2077e7.65e5f8",
- "425c7483.101a2c"
+ "dd99789.6491a88",
+ "66ca1a2.98ef5e4",
+ "6f78d9df.0d3518",
+ "3c0a54ab.00262c",
+ "9977ea00.521808"
]
]
},
{
- "id": "da2077e7.65e5f8",
+ "id": "b364bef1.e2765",
"type": "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": 1610.1666259765625,
- "y": 814.0833740234375,
- "z": "a5b492f8.99d13",
+ "x": 1995.1666259765625,
+ "y": 816.0833740234375,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "d5d4d9a.dfdee28",
+ "id": "1beab9a5.7e2366",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 676.9999389648438,
- "y": 667.0000610351562,
- "z": "a5b492f8.99d13",
+ "x": 674.9999389648438,
+ "y": 648.0000610351562,
+ "z": "df893cfa.16f38",
"wires": [
[
- "c67639b8.92e2d8"
+ "dd0b1351.6bec5"
]
]
},
{
- "id": "1707d581.de00aa",
+ "id": "6e45eb8e.292b44",
"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": 967.9999389648438,
- "y": 626,
- "z": "a5b492f8.99d13",
+ "x": 965.9999389648438,
+ "y": 607,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "c67639b8.92e2d8",
+ "id": "dd0b1351.6bec5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 813.9999389648438,
- "y": 661.0000610351562,
- "z": "a5b492f8.99d13",
+ "x": 811.9999389648438,
+ "y": 642.0000610351562,
+ "z": "df893cfa.16f38",
"wires": [
[
- "1707d581.de00aa",
- "c0fa5e3.de329a"
+ "6e45eb8e.292b44",
+ "261676ae.6c18ea"
]
]
},
{
- "id": "494bc731.2b3b38",
+ "id": "2f15d339.87cf0c",
"type": "set",
"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",
+ "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<parameter name='outputPayloadField' value='.Output' />\n",
"comments": "",
- "x": 446,
- "y": 258,
- "z": "a5b492f8.99d13",
+ "x": 444,
+ "y": 239,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "6e382fc2.9cf55",
+ "id": "3bd1d194.63001e",
"type": "get-resource",
"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": 986,
- "y": 434,
- "z": "a5b492f8.99d13",
+ "x": 984,
+ "y": 415,
+ "z": "df893cfa.16f38",
"wires": [
[
- "d143bfec.8f45b"
+ "d0549989.50cdf8"
]
]
},
{
- "id": "d143bfec.8f45b",
+ "id": "d0549989.50cdf8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1144.3907470703125,
- "y": 432.28399658203125,
- "z": "a5b492f8.99d13",
+ "x": 1142.3907470703125,
+ "y": 413.28399658203125,
+ "z": "df893cfa.16f38",
"wires": [
[
- "19bb6647.2aa81a"
+ "50890a76.58d434"
]
]
},
{
- "id": "54a283d8.5df65c",
+ "id": "db896c60.3d19a",
"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": 374.9998779296875,
- "y": 622,
- "z": "a5b492f8.99d13",
+ "x": 372.9998779296875,
+ "y": 603,
+ "z": "df893cfa.16f38",
"wires": [
[]
]
},
{
- "id": "790211fa.4ddc3",
+ "id": "905f1137.7562f",
"type": "switchNode",
"name": "switch pnf-flag",
"xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
"comments": "",
"outputs": 1,
- "x": 428,
- "y": 359,
- "z": "a5b492f8.99d13",
+ "x": 426,
+ "y": 340,
+ "z": "df893cfa.16f38",
"wires": [
[
- "3deb4f48.5eacb",
- "33286dd4.94fc62"
+ "d4a98e23.62f9b",
+ "a403044b.ebc9f8"
]
]
},
{
- "id": "e7275d95.288b8",
+ "id": "556d2c3e.217c14",
"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": 460,
- "y": 305,
- "z": "a5b492f8.99d13",
+ "x": 458,
+ "y": 286,
+ "z": "df893cfa.16f38",
"wires": [
[]
]
},
{
- "id": "3deb4f48.5eacb",
+ "id": "d4a98e23.62f9b",
"type": "outcome",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 625,
- "y": 338,
- "z": "a5b492f8.99d13",
+ "x": 623,
+ "y": 319,
+ "z": "df893cfa.16f38",
"wires": [
[
- "cb346986.12dd48"
+ "582ec79b.faa468"
]
]
},
{
- "id": "33286dd4.94fc62",
+ "id": "a403044b.ebc9f8",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 624.9999389648438,
- "y": 399,
- "z": "a5b492f8.99d13",
+ "x": 622.9999389648438,
+ "y": 380,
+ "z": "df893cfa.16f38",
"wires": [
[
- "3af30869.256818"
+ "3184e083.2b204"
]
]
},
{
- "id": "3af30869.256818",
+ "id": "3184e083.2b204",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 772.9999389648438,
- "y": 398,
- "z": "a5b492f8.99d13",
+ "x": 770.9999389648438,
+ "y": 379,
+ "z": "df893cfa.16f38",
"wires": [
[
- "6e382fc2.9cf55",
- "ce17fe7f.d3b68"
+ "3bd1d194.63001e",
+ "395906a2.acd1ea"
]
]
},
{
- "id": "cb346986.12dd48",
+ "id": "582ec79b.faa468",
"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",
+ "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<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
"comments": "",
- "x": 786,
- "y": 336,
- "z": "a5b492f8.99d13",
+ "x": 784,
+ "y": 317,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "ce17fe7f.d3b68",
+ "id": "395906a2.acd1ea",
"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": 995,
- "y": 378,
- "z": "a5b492f8.99d13",
+ "x": 993,
+ "y": 359,
+ "z": "df893cfa.16f38",
"wires": [
[]
]
},
{
- "id": "87c25306.3bca6",
+ "id": "5cc58e7c.083a5",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 425,
- "y": 490,
- "z": "a5b492f8.99d13",
+ "x": 423,
+ "y": 471,
+ "z": "df893cfa.16f38",
"wires": [
[
- "4b5ce9b.bbd8818"
+ "b9c121b9.01765"
]
]
},
{
- "id": "4b5ce9b.bbd8818",
+ "id": "b9c121b9.01765",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 596,
- "y": 491,
- "z": "a5b492f8.99d13",
+ "x": 594,
+ "y": 472,
+ "z": "df893cfa.16f38",
"wires": [
[
- "7b056df1.6a5e34"
+ "96dc86e8.19da88"
]
]
},
{
- "id": "7b056df1.6a5e34",
+ "id": "96dc86e8.19da88",
"type": "set",
"name": "set playbookname",
"xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
"comments": "",
- "x": 786,
- "y": 490,
- "z": "a5b492f8.99d13",
+ "x": 784,
+ "y": 471,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "1cee6cc7.a0f263",
+ "id": "ae5d9d02.d1fe4",
"type": "switchNode",
"name": "switch nodelist",
"xml": "<switch test='`$nodelist`'>\n",
"comments": "",
"outputs": 1,
- "x": 415,
- "y": 549,
- "z": "a5b492f8.99d13",
+ "x": 413,
+ "y": 530,
+ "z": "df893cfa.16f38",
"wires": [
[
- "892b8fdd.f84ea",
- "8e25ca9e.be6708"
+ "d47821da.1dd48",
+ "69b2cec2.dd018"
]
]
},
{
- "id": "892b8fdd.f84ea",
+ "id": "d47821da.1dd48",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 595,
- "y": 542,
- "z": "a5b492f8.99d13",
+ "x": 593,
+ "y": 523,
+ "z": "df893cfa.16f38",
"wires": [
[
- "482863bc.936c5c"
+ "dce9b14d.bb77b"
]
]
},
{
- "id": "482863bc.936c5c",
+ "id": "dce9b14d.bb77b",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 752,
- "y": 556,
- "z": "a5b492f8.99d13",
+ "x": 750,
+ "y": 537,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "8e25ca9e.be6708",
+ "id": "69b2cec2.dd018",
"type": "outcome",
"name": "empty",
"xml": "<outcome value=\"['']\">\n\n",
"comments": "",
"outputs": 1,
- "x": 594,
- "y": 586,
- "z": "a5b492f8.99d13",
+ "x": 592,
+ "y": 567,
+ "z": "df893cfa.16f38",
"wires": [
[
- "482863bc.936c5c"
+ "dce9b14d.bb77b"
]
]
},
{
- "id": "75287f66.d6424",
+ "id": "8d045871.31f638",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 1470,
- "y": 421,
- "z": "a5b492f8.99d13",
+ "x": 1468,
+ "y": 402,
+ "z": "df893cfa.16f38",
"wires": [
[
- "cf31ac68.a9966"
+ "ef1e7a17.621f38"
]
]
},
{
- "id": "cf31ac68.a9966",
+ "id": "ef1e7a17.621f38",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1648,
- "y": 421,
- "z": "a5b492f8.99d13",
+ "x": 1646,
+ "y": 402,
+ "z": "df893cfa.16f38",
"wires": [
[
- "822cf6dc.fbd318"
+ "862a6ea8.3ba16"
]
]
},
{
- "id": "f5a8e69f.6d2868",
+ "id": "8543ebcf.2ead48",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
"comments": "",
- "x": 1443,
- "y": 474,
- "z": "a5b492f8.99d13",
+ "x": 1441,
+ "y": 455,
+ "z": "df893cfa.16f38",
"wires": []
},
{
- "id": "19bb6647.2aa81a",
+ "id": "50890a76.58d434",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1273,
- "y": 431,
- "z": "a5b492f8.99d13",
+ "x": 1271,
+ "y": 412,
+ "z": "df893cfa.16f38",
"wires": [
[
- "75287f66.d6424",
- "f5a8e69f.6d2868"
+ "8d045871.31f638",
+ "8543ebcf.2ead48"
]
]
},
{
- "id": "822cf6dc.fbd318",
+ "id": "862a6ea8.3ba16",
"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": 1820,
- "y": 419,
- "z": "a5b492f8.99d13",
+ "x": 1818,
+ "y": 400,
+ "z": "df893cfa.16f38",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "66ca1a2.98ef5e4",
+ "type": "execute",
+ "name": "execute jsonStringToCtx",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1668,
+ "y": 744,
+ "z": "df893cfa.16f38",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "6f78d9df.0d3518",
+ "type": "execute",
+ "name": "execute getAttributeValue",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson' + $outputPayloadField`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1674,
+ "y": 789,
+ "z": "df893cfa.16f38",
"wires": [
[]
]
+ },
+ {
+ "id": "3c0a54ab.00262c",
+ "type": "switchNode",
+ "name": "switch outputPayload",
+ "xml": "<switch test='`$outputPayload`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1660,
+ "y": 836,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "65b8d06e.2f308",
+ "db2edf05.5dbf2"
+ ]
+ ]
+ },
+ {
+ "id": "65b8d06e.2f308",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1838,
+ "y": 816,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "b364bef1.e2765"
+ ]
+ ]
+ },
+ {
+ "id": "db2edf05.5dbf2",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1839,
+ "y": 860,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "3b020d0b.edb822"
+ ]
+ ]
+ },
+ {
+ "id": "3b020d0b.edb822",
+ "type": "set",
+ "name": "set DmaapReq with payload",
+ "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<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+ "comments": "",
+ "x": 2036,
+ "y": 860,
+ "z": "df893cfa.16f38",
+ "wires": []
+ },
+ {
+ "id": "e583cc0b.79586",
+ "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": 2371,
+ "y": 946.9999389648438,
+ "z": "df893cfa.16f38",
+ "wires": []
+ },
+ {
+ "id": "b678b572.4bc6d8",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1837.000244140625,
+ "y": 968.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "bebb9bde.cadbc8"
+ ]
+ ]
+ },
+ {
+ "id": "e71f0e75.f5e6e",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1836.000244140625,
+ "y": 1044.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "a34ae1ab.50555"
+ ]
+ ]
+ },
+ {
+ "id": "9977ea00.521808",
+ "type": "switchNode",
+ "name": "switch outputPayload",
+ "xml": "<switch test='`$outputPayload`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1654.000244140625,
+ "y": 1004.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "b678b572.4bc6d8",
+ "e71f0e75.f5e6e"
+ ]
+ ]
+ },
+ {
+ "id": "c888915f.7e81c",
+ "type": "returnSuccess",
+ "name": "return success with payload",
+ "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`'/>\n<parameter name='payload' value='`$outputPayload`'/>",
+ "comments": "",
+ "x": 2412.000244140625,
+ "y": 1028.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": []
+ },
+ {
+ "id": "bebb9bde.cadbc8",
+ "type": "switchNode",
+ "name": "switch result code",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2007.000244140625,
+ "y": 968.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "1b395046.b5f6",
+ "d4989dec.88a2e"
+ ]
+ ]
+ },
+ {
+ "id": "a34ae1ab.50555",
+ "type": "switchNode",
+ "name": "switch result code",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2007.000244140625,
+ "y": 1044.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "8e9f2082.ee767",
+ "3b44f0c3.4b7c2"
+ ]
+ ]
+ },
+ {
+ "id": "5e9a3c.5f7e95c4",
+ "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": 2365.000244140625,
+ "y": 984.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": []
+ },
+ {
+ "id": "398f4135.fd470e",
+ "type": "returnFailure",
+ "name": "return failure with payload",
+ "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",
+ "comments": "",
+ "x": 2408.000244140625,
+ "y": 1066.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": []
+ },
+ {
+ "id": "1b395046.b5f6",
+ "type": "other",
+ "name": "outcome 400",
+ "xml": "<outcome value='400'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2195.000244140625,
+ "y": 946.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "e583cc0b.79586"
+ ]
+ ]
+ },
+ {
+ "id": "d4989dec.88a2e",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2176.000244140625,
+ "y": 984.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "5e9a3c.5f7e95c4"
+ ]
+ ]
+ },
+ {
+ "id": "8e9f2082.ee767",
+ "type": "other",
+ "name": "outcome 400",
+ "xml": "<outcome value='400'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2196.000244140625,
+ "y": 1028.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "c888915f.7e81c"
+ ]
+ ]
+ },
+ {
+ "id": "3b44f0c3.4b7c2",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2178.000244140625,
+ "y": 1066.9998779296875,
+ "z": "df893cfa.16f38",
+ "wires": [
+ [
+ "398f4135.fd470e"
+ ]
+ ]
}
]
\ 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 4a88aac4..b22f4715 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 @@ -11,6 +11,7 @@ <parameter name='status.code' value='200' />
<parameter name='status.message' value='unexpected return from DG' />
<parameter name='quote' value="'" />
+ <parameter name='outputPayloadField' value='.Output' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
<parameter name='source' value='upgrade-post-check-input.payload' />
@@ -22,6 +23,7 @@ <set>
<parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>
+ <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
</set>
</outcome>
<outcome value='Other'>
@@ -270,23 +272,56 @@ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+ <parameter name='outputPath' value='resultsJson' />
+ <parameter name='isEscaped' value='false' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
+ <parameter name='outputPath' value='outputPayload' />
+ </execute>
+ <switch test='`$outputPayload`'>
+ <outcome value=''>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+ </set>
+ </outcome>
+ </switch>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
<parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -303,31 +338,96 @@ </record>
</outcome>
</execute>
- <return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
- </return>
+ <switch test='`$outputPayload`'>
+ <outcome value=''>
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <outcome value='400'>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <outcome value='400'>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ <parameter name='payload' value='`$outputPayload`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='payload' value='`$outputPayload`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
</block>
</outcome>
<outcome value='success'>
<block>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+ <parameter name='outputPath' value='resultsJson' />
+ <parameter name='isEscaped' value='false' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
+ <parameter name='outputPath' value='outputPayload' />
+ </execute>
+ <switch test='`$outputPayload`'>
+ <outcome value=''>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+ </set>
+ </outcome>
+ </switch>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
<parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -344,10 +444,42 @@ </record>
</outcome>
</execute>
- <return status='success'>
- <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </return>
+ <switch test='`$outputPayload`'>
+ <outcome value=''>
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <outcome value='400'>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <outcome value='400'>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ <parameter name='payload' value='`$outputPayload`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='payload' value='`$outputPayload`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
</block>
</outcome>
</execute>
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 6f89bfcf..89033222 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 @@ -11,6 +11,7 @@ <parameter name='status.code' value='200' />
<parameter name='status.message' value='unexpected return from DG' />
<parameter name='quote' value="'" />
+ <parameter name='outputPayloadField' value='.Output' />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
<parameter name='source' value='upgrade-pre-check-input.payload' />
@@ -22,6 +23,7 @@ <set>
<parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>
+ <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
</set>
</outcome>
<outcome value='Other'>
@@ -270,23 +272,56 @@ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+ <parameter name='outputPath' value='resultsJson' />
+ <parameter name='isEscaped' value='false' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
+ <parameter name='outputPath' value='outputPayload' />
+ </execute>
+ <switch test='`$outputPayload`'>
+ <outcome value=''>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+ </set>
+ </outcome>
+ </switch>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
<parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -303,31 +338,96 @@ </record>
</outcome>
</execute>
- <return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
- </return>
+ <switch test='`$outputPayload`'>
+ <outcome value=''>
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <outcome value='400'>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <outcome value='400'>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ <parameter name='payload' value='`$outputPayload`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='payload' value='`$outputPayload`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
</block>
</outcome>
<outcome value='success'>
<block>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
+ <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
+ <parameter name='outputPath' value='resultsJson' />
+ <parameter name='isEscaped' value='false' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
+ <parameter name='outputPath' value='outputPayload' />
+ </execute>
+ <switch test='`$outputPayload`'>
+ <outcome value=''>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+ </set>
+ </outcome>
+ </switch>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
<parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -344,10 +444,42 @@ </record>
</outcome>
</execute>
- <return status='success'>
- <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </return>
+ <switch test='`$outputPayload`'>
+ <outcome value=''>
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <outcome value='400'>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <outcome value='400'>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ <parameter name='payload' value='`$outputPayload`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='payload' value='`$outputPayload`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </switch>
</block>
</outcome>
</execute>
|