summaryrefslogtreecommitdiffstats
path: root/platform-logic
diff options
context:
space:
mode:
authorEnbo Wang <wangenbo@huawei.com>2019-12-23 12:09:35 +0800
committerEnbo Wang <wangenbo@huawei.com>2019-12-23 12:21:24 +0800
commit93a7ad8c9fa1d9631fcaaad359f32e956ac984ed (patch)
tree62adff615f896dd0ad8030c32df272a71c1646f0 /platform-logic
parentf5a63c57879141bd9e1054de41a901cdbd802e7f (diff)
Support playbook-name in payload of PNF S/W upgrade LCM API's request
Support playbook-name parameter in payload of PNF software upgrade LCM API's request. So, the DGs can get the playbook name from API's request, not just get it from the config file lcm-dg.properties. Change-Id: I82a1fda266f4deab04aca336b69b963c73de9668 Issue-ID: SDNC-1012 Signed-off-by: Enbo Wang <wangenbo@huawei.com> Former-commit-id: 6da28287686395bdeae3959a2ba7bdd98db62434
Diffstat (limited to 'platform-logic')
-rw-r--r--platform-logic/lcm/src/main/json/LCM_rollback.json940
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json817
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json817
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-software.json897
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_rollback.xml159
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml125
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml125
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml125
8 files changed, 2173 insertions, 1832 deletions
diff --git a/platform-logic/lcm/src/main/json/LCM_rollback.json b/platform-logic/lcm/src/main/json/LCM_rollback.json
index 108d0156..e783ec00 100644
--- a/platform-logic/lcm/src/main/json/LCM_rollback.json
+++ b/platform-logic/lcm/src/main/json/LCM_rollback.json
@@ -1,22 +1,22 @@
[
{
- "id": "603c1b6d.6124c4",
+ "id": "22644446.031e2c",
"type": "method",
"name": "rollback",
"xml": "<method rpc='rollback' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 577,
- "y": 47,
- "z": "deca6c6e.62787",
+ "x": 567.5,
+ "y": 73.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "8f078f23.03658"
+ "79b7cec0.5cb7d"
]
]
},
{
- "id": "88cbe26c.f2c83",
+ "id": "f17bcbcb.0eb2c8",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,949 +24,1133 @@
"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": 364.99993896484375,
- "y": 48,
- "z": "deca6c6e.62787",
+ "x": 355.49993896484375,
+ "y": 74.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "603c1b6d.6124c4"
+ "22644446.031e2c"
]
]
},
{
- "id": "76631d3d.b2bda4",
+ "id": "f9678654.f75948",
"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='`$rollback-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='`$rollback-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 432.00001525878906,
- "y": 655,
- "z": "deca6c6e.62787",
+ "x": 469.50001525878906,
+ "y": 720.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "86dfcb26.6ad318",
- "ace54675.d37718",
- "bac4c91b.f07a18"
+ "30da80ae.d9fb4",
+ "4fe2be8b.9f8b9",
+ "29b2f38.ce75c0c"
]
]
},
{
- "id": "4b37ff5.334c5",
+ "id": "db88e5a7.4dcf28",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 831.9999389648438,
- "y": 763.0000305175781,
- "z": "deca6c6e.62787",
+ "x": 869.4999389648438,
+ "y": 828.7500305175781,
+ "z": "369f92b4.305cce",
"wires": [
[
- "9a0bf3d2.1d44f",
- "2ee77d61.9094f2",
- "c9baa5a1.b1a3e8"
+ "96dbcf56.55476",
+ "22a86bdb.ccad74",
+ "80a5dac3.8e7148"
]
]
},
{
- "id": "9a0bf3d2.1d44f",
+ "id": "96dbcf56.55476",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 976.9999389648438,
- "y": 761.0000381469727,
- "z": "deca6c6e.62787",
+ "x": 1014.4999389648438,
+ "y": 826.7500381469727,
+ "z": "369f92b4.305cce",
"wires": [
[
- "c81014d9.4af6a8"
+ "56f57.16a810aa"
]
]
},
{
- "id": "2ee77d61.9094f2",
+ "id": "22a86bdb.ccad74",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 973.9999389648438,
- "y": 818.0000305175781,
- "z": "deca6c6e.62787",
+ "x": 1011.4999389648438,
+ "y": 883.7500305175781,
+ "z": "369f92b4.305cce",
"wires": [
[
- "b8c25e18.a4534"
+ "283d6739.74f598"
]
]
},
{
- "id": "b8c25e18.a4534",
+ "id": "283d6739.74f598",
"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": 1161,
- "y": 818.0000610351562,
- "z": "deca6c6e.62787",
+ "x": 1199.4999389648438,
+ "y": 882.7500305175781,
+ "z": "369f92b4.305cce",
"wires": [
[
- "9fd8cd6c.24d13",
- "f0a35f4d.9195a"
+ "d1f8a15d.af493",
+ "caff8737.7aa8b8"
]
]
},
{
- "id": "ace54675.d37718",
+ "id": "4fe2be8b.9f8b9",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 690.9999389648438,
- "y": 676.0000915527344,
- "z": "deca6c6e.62787",
+ "x": 728.4999389648438,
+ "y": 741.7500915527344,
+ "z": "369f92b4.305cce",
"wires": [
[
- "c81014d9.4af6a8"
+ "56f57.16a810aa"
]
]
},
{
- "id": "86dfcb26.6ad318",
+ "id": "30da80ae.d9fb4",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 692.9999389648438,
- "y": 728.0000610351562,
- "z": "deca6c6e.62787",
+ "x": 730.4999389648438,
+ "y": 793.7500610351562,
+ "z": "369f92b4.305cce",
"wires": [
[
- "4b37ff5.334c5"
+ "db88e5a7.4dcf28"
]
]
},
{
- "id": "c9baa5a1.b1a3e8",
+ "id": "d1f8a15d.af493",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1368.4998779296875,
+ "y": 864.7500610351562,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "18cd1743.3c3df9"
+ ]
+ ]
+ },
+ {
+ "id": "80a5dac3.8e7148",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 973.9999389648438,
- "y": 719.0000686645508,
- "z": "deca6c6e.62787",
+ "x": 1011.4999389648438,
+ "y": 784.7500686645508,
+ "z": "369f92b4.305cce",
"wires": [
[
- "c81014d9.4af6a8"
+ "56f57.16a810aa"
]
]
},
{
- "id": "8024a972.fa79a8",
- "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`'/>",
+ "id": "caff8737.7aa8b8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
"comments": "",
- "x": 2413.999755859375,
- "y": 948.0000610351562,
- "z": "deca6c6e.62787",
- "wires": []
+ "outputs": 1,
+ "x": 1372.4998779296875,
+ "y": 908.7501220703125,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "18cd1743.3c3df9"
+ ]
+ ]
},
{
- "id": "9e6a1fde.3d38e",
+ "id": "eca36d4e.0587d",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 180,
- "y": 47,
- "z": "deca6c6e.62787",
+ "x": 170.5,
+ "y": 73.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "88cbe26c.f2c83"
+ "f17bcbcb.0eb2c8"
]
]
},
{
- "id": "8f078f23.03658",
+ "id": "79b7cec0.5cb7d",
"type": "block",
- "name": "block : atomic",
- "xml": "<block atomic='true'>",
- "atomic": "true",
+ "name": "block",
+ "xml": "<block atomic='true'>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 177.9166259765625,
- "y": 139.08331298828125,
- "z": "deca6c6e.62787",
+ "x": 215.41669082641602,
+ "y": 224.83334636688232,
+ "z": "369f92b4.305cce",
"wires": [
[
- "76631d3d.b2bda4",
- "18f99414.0f1f5c",
- "e9a0ae4a.a010c",
- "720dbe92.a2daf",
- "90d2eba5.bddd78",
- "e456084e.3d1b28",
- "abd53cca.80312",
- "86b92780.e4fd18"
+ "f9678654.f75948",
+ "3150eb49.56b364",
+ "3d311f40.b0356",
+ "d04dafe1.a776a",
+ "d6a84e4d.99cf8",
+ "23c2b9e5.228a76",
+ "f65e13cf.33e86",
+ "78201e79.92779"
]
]
},
{
- "id": "18f99414.0f1f5c",
+ "id": "3150eb49.56b364",
"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": 476.0000305175781,
- "y": 172.08334350585938,
- "z": "deca6c6e.62787",
+ "x": 513.5000305175781,
+ "y": 184.83334350585938,
+ "z": "369f92b4.305cce",
"wires": [
[]
]
},
{
- "id": "dd58ea95.701bc8",
+ "id": "d6380b3d.e7dd58",
"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": 1642.9998779296875,
- "y": 625.0834045410156,
- "z": "deca6c6e.62787",
+ "x": 1680.4998779296875,
+ "y": 690.8334045410156,
+ "z": "369f92b4.305cce",
"wires": [
[
- "79c12f79.46a5"
+ "7d366735.40b318"
]
]
},
{
- "id": "79c12f79.46a5",
+ "id": "7d366735.40b318",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1812.9998168945312,
- "y": 624.0834045410156,
- "z": "deca6c6e.62787",
+ "x": 1850.4998168945312,
+ "y": 689.8334045410156,
+ "z": "369f92b4.305cce",
"wires": [
[
- "69422560.e902dc"
+ "d429f6f2.1a8228"
]
]
},
{
- "id": "c81014d9.4af6a8",
+ "id": "56f57.16a810aa",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1445.9998168945312,
- "y": 649.0834045410156,
- "z": "deca6c6e.62787",
+ "x": 1483.4998168945312,
+ "y": 714.8334045410156,
+ "z": "369f92b4.305cce",
"wires": [
[
- "dd58ea95.701bc8",
- "5a6746.ee1428bc",
- "3c47a348.5e546c"
+ "d6380b3d.e7dd58",
+ "712abf34.0d6f",
+ "d1b68f91.c944a"
]
]
},
{
- "id": "12844f47.97d421",
+ "id": "906287db.12ffb8",
"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": 1690.4998779296875,
- "y": 924.0833740234375,
- "z": "deca6c6e.62787",
+ "x": 1715.9998779296875,
+ "y": 956.8333740234375,
+ "z": "369f92b4.305cce",
"wires": [
[
- "cbef2423.2a36b8"
+ "3cbc715a.7ae70e"
]
]
},
{
- "id": "cbef2423.2a36b8",
+ "id": "3cbc715a.7ae70e",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1877.5,
- "y": 924.0833740234375,
- "z": "deca6c6e.62787",
+ "x": 1900.9998779296875,
+ "y": 956.8333740234375,
+ "z": "369f92b4.305cce",
"wires": [
[
- "9fd0c5ed.f195b8"
+ "6851419b.3c644"
]
]
},
{
- "id": "69422560.e902dc",
+ "id": "d429f6f2.1a8228",
"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": 1932.9998779296875,
- "y": 623.0833740234375,
- "z": "deca6c6e.62787",
+ "x": 1970.4998779296875,
+ "y": 688.8333740234375,
+ "z": "369f92b4.305cce",
"wires": [
[]
]
},
{
- "id": "5a6746.ee1428bc",
+ "id": "712abf34.0d6f",
"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": 1624.91650390625,
- "y": 676.0834045410156,
- "z": "deca6c6e.62787",
+ "x": 1662.41650390625,
+ "y": 741.8334045410156,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "9fd0c5ed.f195b8",
+ "id": "6851419b.3c644",
"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": 2019.91650390625,
- "y": 924.0833740234375,
- "z": "deca6c6e.62787",
+ "x": 2033.4166259765625,
+ "y": 956.8333740234375,
+ "z": "369f92b4.305cce",
"wires": [
[]
]
},
{
- "id": "3c47a348.5e546c",
+ "id": "d1b68f91.c944a",
"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=\"`$rollback-input.common-header.request-id + '-' + $rollback-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='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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": 1629.9998779296875,
- "y": 572.0833740234375,
- "z": "deca6c6e.62787",
+ "x": 1667.4998779296875,
+ "y": 637.8333740234375,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "542925f0.27fbdc",
+ "id": "18cd1743.3c3df9",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1482.9998779296875,
- "y": 821.0833740234375,
- "z": "deca6c6e.62787",
+ "x": 1504.4998779296875,
+ "y": 883.8333740234375,
+ "z": "369f92b4.305cce",
"wires": [
[
- "12844f47.97d421",
- "e3737dc2.9a3b6",
- "764a748a.61b14c",
- "9775ae82.61b25",
- "9a61d7f0.2347b8"
+ "906287db.12ffb8",
+ "eb7f81a3.42757",
+ "ec9cf419.aed218",
+ "822ef90c.18eff8",
+ "abc170de.d927e",
+ "81befc92.0842f"
]
]
},
{
- "id": "63386817.4a7cc8",
+ "id": "81befc92.0842f",
"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=\"`$rollback-input.common-header.request-id + '-' + $rollback-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='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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`'/>",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-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='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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": 2042.16650390625,
- "y": 827.0833740234375,
- "z": "deca6c6e.62787",
+ "x": 1702.6666564941406,
+ "y": 870.5833864212036,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "bac4c91b.f07a18",
+ "id": "29b2f38.ce75c0c",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 699.9999389648438,
- "y": 628.0000610351562,
- "z": "deca6c6e.62787",
+ "x": 737.4999389648438,
+ "y": 693.7500610351562,
+ "z": "369f92b4.305cce",
"wires": [
[
- "2763f6ed.1a7e1a"
+ "c004f41.ad08008"
]
]
},
{
- "id": "eb87e665.0acf88",
+ "id": "aec7b25c.15792",
"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": 990.9999389648438,
- "y": 587,
- "z": "deca6c6e.62787",
+ "x": 1028.4999389648438,
+ "y": 652.75,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "2763f6ed.1a7e1a",
+ "id": "c004f41.ad08008",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 836.9999389648438,
- "y": 622.0000610351562,
- "z": "deca6c6e.62787",
+ "x": 874.4999389648438,
+ "y": 687.7500610351562,
+ "z": "369f92b4.305cce",
"wires": [
[
- "eb87e665.0acf88",
- "c81014d9.4af6a8"
+ "aec7b25c.15792",
+ "56f57.16a810aa"
]
]
},
{
- "id": "e9a0ae4a.a010c",
+ "id": "3d311f40.b0356",
"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": 469,
- "y": 219,
- "z": "deca6c6e.62787",
+ "x": 506.5,
+ "y": 231.75,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "abd53cca.80312",
+ "id": "1785264e.51581a",
+ "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 = $rollback-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
+ "comments": "",
+ "outputs": 1,
+ "x": 1046.5,
+ "y": 460.75,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "64e1e5a.ee16c1c"
+ ]
+ ]
+ },
+ {
+ "id": "64e1e5a.ee16c1c",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1204.8907470703125,
+ "y": 459.03399658203125,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "31c7d490.843fdc"
+ ]
+ ]
+ },
+ {
+ "id": "f65e13cf.33e86",
"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": 397.9998779296875,
- "y": 583,
- "z": "deca6c6e.62787",
+ "x": 435.4998779296875,
+ "y": 648.75,
+ "z": "369f92b4.305cce",
"wires": [
[]
]
},
{
- "id": "90d2eba5.bddd78",
+ "id": "d6a84e4d.99cf8",
"type": "switchNode",
"name": "switch pnf-flag",
"xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
"comments": "",
"outputs": 1,
- "x": 451,
- "y": 320,
- "z": "deca6c6e.62787",
+ "x": 492.25000762939453,
+ "y": 379.5000057220459,
+ "z": "369f92b4.305cce",
"wires": [
[
- "97096eec.158be",
- "db62c67c.f16678"
+ "30e4f46c.d1480c",
+ "a2013485.ae3d68"
]
]
},
{
- "id": "720dbe92.a2daf",
+ "id": "d04dafe1.a776a",
"type": "execute",
"name": "execute jsonStringToCtx",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='rollback-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
"comments": "",
"outputs": 1,
- "x": 483,
- "y": 266,
- "z": "deca6c6e.62787",
+ "x": 520.5,
+ "y": 278.75,
+ "z": "369f92b4.305cce",
"wires": [
[]
]
},
{
- "id": "97096eec.158be",
+ "id": "30e4f46c.d1480c",
"type": "outcome",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 648,
- "y": 299,
- "z": "deca6c6e.62787",
+ "x": 676.7500076293945,
+ "y": 323.5000057220459,
+ "z": "369f92b4.305cce",
"wires": [
[
- "2baa8c31.1c7364"
+ "c022042b.de2278"
]
]
},
{
- "id": "db62c67c.f16678",
+ "id": "a2013485.ae3d68",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 648,
- "y": 360,
- "z": "deca6c6e.62787",
+ "x": 679.2499465942383,
+ "y": 431.2500057220459,
+ "z": "369f92b4.305cce",
"wires": [
[
- "e8ec5d49.26bb5"
+ "8adc4a30.e8aab8"
]
]
},
{
- "id": "e8ec5d49.26bb5",
+ "id": "8adc4a30.e8aab8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 795.9999389648438,
- "y": 359,
- "z": "deca6c6e.62787",
+ "x": 833.4999504089355,
+ "y": 432.2500057220459,
+ "z": "369f92b4.305cce",
"wires": [
[
- "d1d2edc3.c0ebb"
+ "1785264e.51581a",
+ "6b67b6b7.0fe388"
]
]
},
{
- "id": "2baa8c31.1c7364",
+ "id": "ba864124.fbd17",
"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.rollback.playbookname`'/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
"comments": "",
- "x": 809,
- "y": 297,
- "z": "deca6c6e.62787",
+ "x": 1004.0000152587891,
+ "y": 231.50000381469727,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "e456084e.3d1b28",
+ "id": "6b67b6b7.0fe388",
+ "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 + '.rollback.playbookname'`\" />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1055.5,
+ "y": 404.75,
+ "z": "369f92b4.305cce",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "23c2b9e5.228a76",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 448,
- "y": 451,
- "z": "deca6c6e.62787",
+ "x": 485.5,
+ "y": 516.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "852cba96.1b8598"
+ "c70d3d1f.891ee"
]
]
},
{
- "id": "852cba96.1b8598",
+ "id": "c70d3d1f.891ee",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 619,
- "y": 452,
- "z": "deca6c6e.62787",
+ "x": 656.5,
+ "y": 517.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "c3a06545.f22d98"
+ "83a84acf.4bd078"
]
]
},
{
- "id": "c3a06545.f22d98",
+ "id": "83a84acf.4bd078",
"type": "set",
"name": "set playbookname",
- "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.rollback.playbookname`'/>",
+ "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.rollback.playbookname`'/>",
"comments": "",
- "x": 809,
- "y": 451,
- "z": "deca6c6e.62787",
+ "x": 846.5,
+ "y": 516.75,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "86b92780.e4fd18",
+ "id": "78201e79.92779",
"type": "switchNode",
"name": "switch nodelist",
"xml": "<switch test='`$nodelist`'>\n",
"comments": "",
"outputs": 1,
- "x": 438,
- "y": 510,
- "z": "deca6c6e.62787",
+ "x": 475.5,
+ "y": 575.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "314228d.17719d8",
- "d39f4666.4c5158"
+ "cd45c66d.ce9838",
+ "17f4d31.c678b2d"
]
]
},
{
- "id": "314228d.17719d8",
+ "id": "cd45c66d.ce9838",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 618,
- "y": 503,
- "z": "deca6c6e.62787",
+ "x": 655.5,
+ "y": 568.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "e384eccc.6fd13"
+ "54593bc3.251964"
]
]
},
{
- "id": "e384eccc.6fd13",
+ "id": "54593bc3.251964",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 775,
- "y": 517,
- "z": "deca6c6e.62787",
+ "x": 812.5,
+ "y": 582.75,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "d39f4666.4c5158",
+ "id": "17f4d31.c678b2d",
"type": "outcome",
"name": "empty",
"xml": "<outcome value=\"['']\">\n\n",
"comments": "",
"outputs": 1,
- "x": 617,
- "y": 547,
- "z": "deca6c6e.62787",
+ "x": 654.5,
+ "y": 612.75,
+ "z": "369f92b4.305cce",
"wires": [
[
- "e384eccc.6fd13"
+ "54593bc3.251964"
]
]
},
{
- "id": "d1d2edc3.c0ebb",
- "type": "returnFailure",
- "name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='Currently only support PNF.' />",
+ "id": "26a968e7.f7bf98",
+ "type": "switchNode",
+ "name": "switch playbookname",
+ "xml": "<switch test='`$playbookname`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1530.5,
+ "y": 447.75,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "5f54def1.a67ca"
+ ]
+ ]
+ },
+ {
+ "id": "5f54def1.a67ca",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
"comments": "",
- "x": 969,
- "y": 359,
- "z": "deca6c6e.62787",
+ "outputs": 1,
+ "x": 1708.5,
+ "y": 447.75,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "b2eb228.3781ce"
+ ]
+ ]
+ },
+ {
+ "id": "294832a2.42287e",
+ "type": "set",
+ "name": "set nodelist",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
+ "comments": "",
+ "x": 1503.5,
+ "y": 500.75,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "e3737dc2.9a3b6",
- "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",
+ "id": "31c7d490.843fdc",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1703,
- "y": 741,
- "z": "deca6c6e.62787",
+ "x": 1333.5,
+ "y": 457.75,
+ "z": "369f92b4.305cce",
"wires": [
- []
+ [
+ "26a968e7.f7bf98",
+ "294832a2.42287e"
+ ]
]
},
{
- "id": "764a748a.61b14c",
+ "id": "b2eb228.3781ce",
"type": "execute",
- "name": "execute getAttributeValue",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",
+ "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 + '.rollback.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 1709,
- "y": 796,
- "z": "deca6c6e.62787",
+ "x": 1880.5,
+ "y": 445.75,
+ "z": "369f92b4.305cce",
"wires": [
[]
]
},
{
- "id": "9775ae82.61b25",
- "type": "switchNode",
- "name": "switch outputPayload",
- "xml": "<switch test='`$outputPayload`'>\n",
+ "id": "eb7f81a3.42757",
+ "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": 1694,
- "y": 854,
- "z": "deca6c6e.62787",
+ "x": 1730.5,
+ "y": 789.75,
+ "z": "369f92b4.305cce",
"wires": [
- [
- "17082276.b4933e",
- "55bb01f1.008aa"
- ]
+ []
]
},
{
- "id": "ba985798.6d2de8",
- "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=\"`$rollback-input.common-header.request-id + '-' + $rollback-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='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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`'/>",
+ "id": "ec9cf419.aed218",
+ "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": "",
- "x": 2080,
- "y": 873,
- "z": "deca6c6e.62787",
- "wires": []
+ "outputs": 1,
+ "x": 1736.5,
+ "y": 834.75,
+ "z": "369f92b4.305cce",
+ "wires": [
+ []
+ ]
},
{
- "id": "17082276.b4933e",
- "type": "outcome",
- "name": "null",
- "xml": "<outcome value=''>\n",
+ "id": "822ef90c.18eff8",
+ "type": "switchNode",
+ "name": "switch outputPayload",
+ "xml": "<switch test='`$outputPayload`'>\n",
"comments": "",
"outputs": 1,
- "x": 1876,
- "y": 827,
- "z": "deca6c6e.62787",
+ "x": 1722.5000228881836,
+ "y": 910.5000133514404,
+ "z": "369f92b4.305cce",
"wires": [
[
- "63386817.4a7cc8"
+ "c302475b.9df818"
]
]
},
{
- "id": "55bb01f1.008aa",
+ "id": "c302475b.9df818",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1875,
- "y": 873,
- "z": "deca6c6e.62787",
+ "x": 1896.5000267028809,
+ "y": 910.7500133514404,
+ "z": "369f92b4.305cce",
"wires": [
[
- "ba985798.6d2de8"
+ "a48299cb.b78bd8"
]
]
},
{
- "id": "a556bfd0.26234",
+ "id": "a48299cb.b78bd8",
+ "type": "set",
+ "name": "set DmaapReq with payload",
+ "xml": "<set>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+ "comments": "",
+ "x": 2094.750030517578,
+ "y": 911.2500133514404,
+ "z": "369f92b4.305cce",
+ "wires": []
+ },
+ {
+ "id": "6c329a17.f8bc34",
+ "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": 2433.5,
+ "y": 992.7499389648438,
+ "z": "369f92b4.305cce",
+ "wires": []
+ },
+ {
+ "id": "6f27e34f.bfe1bc",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1875,
- "y": 970,
- "z": "deca6c6e.62787",
+ "x": 1899.500244140625,
+ "y": 1014.7498779296875,
+ "z": "369f92b4.305cce",
"wires": [
[
- "921bd724.038378"
+ "ecb031ca.9f34d"
]
]
},
{
- "id": "bfa7e392.13bb3",
+ "id": "aba48551.b856a8",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1875,
- "y": 1046,
- "z": "deca6c6e.62787",
+ "x": 1898.500244140625,
+ "y": 1090.7498779296875,
+ "z": "369f92b4.305cce",
"wires": [
[
- "37bee539.62e3ea"
+ "6bf32a4b.832444"
]
]
},
{
- "id": "9a61d7f0.2347b8",
+ "id": "abc170de.d927e",
"type": "switchNode",
"name": "switch outputPayload",
"xml": "<switch test='`$outputPayload`'>\n",
"comments": "",
"outputs": 1,
- "x": 1691,
- "y": 1009,
- "z": "deca6c6e.62787",
+ "x": 1716.500244140625,
+ "y": 1050.7498779296875,
+ "z": "369f92b4.305cce",
"wires": [
[
- "a556bfd0.26234",
- "bfa7e392.13bb3"
+ "6f27e34f.bfe1bc",
+ "aba48551.b856a8"
]
]
},
{
- "id": "dbab97fc.ffb6e8",
+ "id": "a234b745.0050e8",
"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": 2455,
- "y": 1030,
- "z": "deca6c6e.62787",
+ "x": 2474.500244140625,
+ "y": 1074.7498779296875,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "f0a35f4d.9195a",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1343.9998779296875,
- "y": 841.0001220703125,
- "z": "deca6c6e.62787",
- "wires": [
- [
- "542925f0.27fbdc"
- ]
- ]
- },
- {
- "id": "9fd8cd6c.24d13",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1340.9998779296875,
- "y": 799.0000610351562,
- "z": "deca6c6e.62787",
- "wires": [
- [
- "542925f0.27fbdc"
- ]
- ]
- },
- {
- "id": "921bd724.038378",
+ "id": "ecb031ca.9f34d",
"type": "switchNode",
"name": "switch result code",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 2050,
- "y": 970,
- "z": "deca6c6e.62787",
+ "x": 2069.500244140625,
+ "y": 1014.7498779296875,
+ "z": "369f92b4.305cce",
"wires": [
[
- "292c4dcf.7880e2",
- "73b035d4.ad062c"
+ "7828ddac.7113c4",
+ "50103e86.045b8"
]
]
},
{
- "id": "37bee539.62e3ea",
+ "id": "6bf32a4b.832444",
"type": "switchNode",
"name": "switch result code",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 2050,
- "y": 1046,
- "z": "deca6c6e.62787",
+ "x": 2069.500244140625,
+ "y": 1090.7498779296875,
+ "z": "369f92b4.305cce",
"wires": [
[
- "7e470c4a.386af4",
- "5feb02a4.d890ac"
+ "6e3f91ae.9416f",
+ "bbd2dd1d.f1bdc"
]
]
},
{
- "id": "7ef093b7.2cf64c",
+ "id": "c74eca80.53d6a8",
"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": 2408,
- "y": 986,
- "z": "deca6c6e.62787",
+ "x": 2427.500244140625,
+ "y": 1030.7498779296875,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "b08c6ff3.d3ef1",
+ "id": "6a92df8c.f43f7",
"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": 2451,
- "y": 1068,
- "z": "deca6c6e.62787",
+ "x": 2470.500244140625,
+ "y": 1112.7498779296875,
+ "z": "369f92b4.305cce",
"wires": []
},
{
- "id": "292c4dcf.7880e2",
+ "id": "7828ddac.7113c4",
"type": "other",
"name": "outcome 400",
"xml": "<outcome value='400'>\n",
"comments": "",
"outputs": 1,
- "x": 2238,
- "y": 948,
- "z": "deca6c6e.62787",
+ "x": 2257.500244140625,
+ "y": 992.7498779296875,
+ "z": "369f92b4.305cce",
"wires": [
[
- "8024a972.fa79a8"
+ "6c329a17.f8bc34"
]
]
},
{
- "id": "73b035d4.ad062c",
+ "id": "50103e86.045b8",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2219,
- "y": 986,
- "z": "deca6c6e.62787",
+ "x": 2238.500244140625,
+ "y": 1030.7498779296875,
+ "z": "369f92b4.305cce",
"wires": [
[
- "7ef093b7.2cf64c"
+ "c74eca80.53d6a8"
]
]
},
{
- "id": "7e470c4a.386af4",
+ "id": "6e3f91ae.9416f",
"type": "other",
"name": "outcome 400",
"xml": "<outcome value='400'>\n",
"comments": "",
"outputs": 1,
- "x": 2239,
- "y": 1030,
- "z": "deca6c6e.62787",
+ "x": 2258.500244140625,
+ "y": 1074.7498779296875,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "a234b745.0050e8"
+ ]
+ ]
+ },
+ {
+ "id": "bbd2dd1d.f1bdc",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2240.500244140625,
+ "y": 1112.7498779296875,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "6a92df8c.f43f7"
+ ]
+ ]
+ },
+ {
+ "id": "c022042b.de2278",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 835.7500114440918,
+ "y": 282.00000381469727,
+ "z": "369f92b4.305cce",
"wires": [
[
- "dbab97fc.ffb6e8"
+ "ba864124.fbd17",
+ "8483b1ff.62265"
]
]
},
{
- "id": "5feb02a4.d890ac",
+ "id": "8483b1ff.62265",
+ "type": "switchNode",
+ "name": "switch playbook-name in req",
+ "xml": "<switch test='`$payloadJson.playbook-name`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1042.0000133514404,
+ "y": 326.50000381469727,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "bb00ffff.87cfb",
+ "433808fa.337a18"
+ ]
+ ]
+ },
+ {
+ "id": "bb00ffff.87cfb",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1249.5000190734863,
+ "y": 290.25000381469727,
+ "z": "369f92b4.305cce",
+ "wires": [
+ [
+ "33939f7.002cb6"
+ ]
+ ]
+ },
+ {
+ "id": "433808fa.337a18",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2221,
- "y": 1068,
- "z": "deca6c6e.62787",
+ "x": 1248.2500228881836,
+ "y": 355.25000381469727,
+ "z": "369f92b4.305cce",
"wires": [
[
- "b08c6ff3.d3ef1"
+ "4b181e16.e7061"
]
]
+ },
+ {
+ "id": "33939f7.002cb6",
+ "type": "set",
+ "name": "set playbookname from prop",
+ "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.pnf.rollback.playbookname`'/>\n",
+ "comments": "",
+ "x": 1452.0000228881836,
+ "y": 290.25000381469727,
+ "z": "369f92b4.305cce",
+ "wires": []
+ },
+ {
+ "id": "4b181e16.e7061",
+ "type": "set",
+ "name": "set playbookname from req",
+ "xml": "<set>\n<parameter name='playbookname' value='`$payloadJson.playbook-name`'/>\n",
+ "comments": "",
+ "x": 1447.0000228881836,
+ "y": 355.25000381469727,
+ "z": "369f92b4.305cce",
+ "wires": []
}
] \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
index 781faaa6..a17cdf76 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
@@ -1,22 +1,22 @@
[
{
- "id": "fe0acee3.b3d4f",
+ "id": "c2e43cb1.7f88d",
"type": "method",
"name": "upgrade-post-check",
"xml": "<method rpc='upgrade-post-check' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 523,
- "y": 71,
- "z": "b4969602.e5a2a8",
+ "x": 521.25,
+ "y": 45,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "88d3f9c3.91e818"
+ "7a82a4e1.74051c"
]
]
},
{
- "id": "dd69f330.0db38",
+ "id": "c7c3a05a.217d3",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,1060 +24,1133 @@
"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": 310.99993896484375,
- "y": 72,
- "z": "b4969602.e5a2a8",
+ "x": 309.24993896484375,
+ "y": 46,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "fe0acee3.b3d4f"
+ "c2e43cb1.7f88d"
]
]
},
{
- "id": "ca77e1d2.5f235",
+ "id": "4aa2e04.16b662",
"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": 378.00001525878906,
- "y": 679,
- "z": "b4969602.e5a2a8",
+ "x": 423.25001525878906,
+ "y": 692,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "98532a13.9e8648",
- "300b9189.6839ae",
- "93689f4a.8157"
+ "dfb73c1.130adc",
+ "ba520b63.5fbad8",
+ "37993504.393d8a"
]
]
},
{
- "id": "338f7649.ef4e9a",
+ "id": "22e681c3.fbf5ce",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 777.9999389648438,
- "y": 787.0000305175781,
- "z": "b4969602.e5a2a8",
+ "x": 823.2499389648438,
+ "y": 800.0000305175781,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "13e6fdd5.284672",
- "558456ec.861628",
- "d84c0d6b.4e961"
+ "a39e090c.01cdb8",
+ "5c6685ba.e0353c",
+ "875ad319.3c857"
]
]
},
{
- "id": "13e6fdd5.284672",
+ "id": "a39e090c.01cdb8",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 922.9999389648438,
- "y": 785.0000381469727,
- "z": "b4969602.e5a2a8",
+ "x": 968.2499389648438,
+ "y": 798.0000381469727,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "d4f3b77a.b39508"
+ "35d55016.e4b95"
]
]
},
{
- "id": "558456ec.861628",
+ "id": "5c6685ba.e0353c",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 919.9999389648438,
- "y": 842.0000305175781,
- "z": "b4969602.e5a2a8",
+ "x": 965.2499389648438,
+ "y": 855.0000305175781,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "a1c39fcf.a06c"
+ "57b98d51.2b4284"
]
]
},
{
- "id": "a1c39fcf.a06c",
+ "id": "57b98d51.2b4284",
"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": 1107.9999389648438,
- "y": 841.0000305175781,
- "z": "b4969602.e5a2a8",
+ "x": 1153.2499389648438,
+ "y": 854.0000305175781,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "f58c60bb.b391f",
- "b18d4538.e8ef28"
+ "6c05563.cc2bca8",
+ "37d17f6d.5fa27"
]
]
},
{
- "id": "300b9189.6839ae",
+ "id": "ba520b63.5fbad8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 636.9999389648438,
- "y": 700.0000915527344,
- "z": "b4969602.e5a2a8",
+ "x": 682.2499389648438,
+ "y": 713.0000915527344,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "d4f3b77a.b39508"
+ "35d55016.e4b95"
]
]
},
{
- "id": "98532a13.9e8648",
+ "id": "dfb73c1.130adc",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 638.9999389648438,
- "y": 752.0000610351562,
- "z": "b4969602.e5a2a8",
+ "x": 684.2499389648438,
+ "y": 765.0000610351562,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "338f7649.ef4e9a"
+ "22e681c3.fbf5ce"
]
]
},
{
- "id": "f58c60bb.b391f",
+ "id": "6c05563.cc2bca8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1278.9998779296875,
- "y": 820.0000610351562,
- "z": "b4969602.e5a2a8",
+ "x": 1322.2498779296875,
+ "y": 836.0000610351562,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "44e1b1d0.b5bf9"
+ "9c19d3c7.c09df"
]
]
},
{
- "id": "d84c0d6b.4e961",
+ "id": "875ad319.3c857",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 919.9999389648438,
- "y": 743.0000686645508,
- "z": "b4969602.e5a2a8",
+ "x": 965.2499389648438,
+ "y": 756.0000686645508,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "d4f3b77a.b39508"
+ "35d55016.e4b95"
]
]
},
{
- "id": "b18d4538.e8ef28",
+ "id": "37d17f6d.5fa27",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1281.9998779296875,
- "y": 871.0001220703125,
- "z": "b4969602.e5a2a8",
+ "x": 1326.2498779296875,
+ "y": 880.0001220703125,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "44e1b1d0.b5bf9"
+ "9c19d3c7.c09df"
]
]
},
{
- "id": "67392fb2.3fda3",
+ "id": "3d249d1c.21ada2",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 126,
- "y": 71,
- "z": "b4969602.e5a2a8",
+ "x": 124.25,
+ "y": 45,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "dd69f330.0db38"
+ "c7c3a05a.217d3"
]
]
},
{
- "id": "88d3f9c3.91e818",
+ "id": "7a82a4e1.74051c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 123.91668701171875,
- "y": 163.08334350585938,
- "z": "b4969602.e5a2a8",
+ "x": 169.16669082641602,
+ "y": 196.08334636688232,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "ca77e1d2.5f235",
- "c7ec6050.45978",
- "889f84ed.e111e8",
- "40652fca.65d24",
- "983b7f00.0aa95",
- "43b098aa.2b8088",
- "3c8d18f4.57a768",
- "5c9efc94.d81d24"
+ "4aa2e04.16b662",
+ "b3d629e9.2c9188",
+ "ab162f45.fae5a",
+ "f7de272b.bbcd78",
+ "3899b5e2.384a4a",
+ "72e148f.bd2b1b8",
+ "5a9e7617.91c178",
+ "6cd92845.9c27d8"
]
]
},
{
- "id": "c7ec6050.45978",
+ "id": "b3d629e9.2c9188",
"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": 422.0000305175781,
- "y": 196.08334350585938,
- "z": "b4969602.e5a2a8",
+ "x": 467.2500305175781,
+ "y": 156.08334350585938,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "d9d2286.379c4d8",
+ "id": "5f58bf2c.b9548",
"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": 1588.9998779296875,
- "y": 649.0834045410156,
- "z": "b4969602.e5a2a8",
+ "x": 1634.2498779296875,
+ "y": 662.0834045410156,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "642ae55d.535a7c"
+ "6180b71a.bb2e58"
]
]
},
{
- "id": "642ae55d.535a7c",
+ "id": "6180b71a.bb2e58",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1758.9998168945312,
- "y": 648.0834045410156,
- "z": "b4969602.e5a2a8",
+ "x": 1804.2498168945312,
+ "y": 661.0834045410156,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "7969554f.e56e0c"
+ "b7860b2.f448af8"
]
]
},
{
- "id": "d4f3b77a.b39508",
+ "id": "35d55016.e4b95",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1391.9998168945312,
- "y": 673.0834045410156,
- "z": "b4969602.e5a2a8",
+ "x": 1437.2498168945312,
+ "y": 686.0834045410156,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "d9d2286.379c4d8",
- "8a00ee98.85d8c",
- "a967853.2e08a78"
+ "5f58bf2c.b9548",
+ "da507cbc.1345a",
+ "e8bf8d4b.e71c5"
]
]
},
{
- "id": "61a865a3.81374c",
+ "id": "df593d16.3a873",
"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": 1600.4998779296875,
- "y": 904.0833740234375,
- "z": "b4969602.e5a2a8",
+ "x": 1669.7498779296875,
+ "y": 928.0833740234375,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "bf6e3414.ac0ab8"
+ "8cde94cd.183ad8"
]
]
},
{
- "id": "bf6e3414.ac0ab8",
+ "id": "8cde94cd.183ad8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1782.4998779296875,
- "y": 904.0833740234375,
- "z": "b4969602.e5a2a8",
+ "x": 1854.7498779296875,
+ "y": 928.0833740234375,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "a98ac8b6.1c8b18"
+ "97083a8c.a99408"
]
]
},
{
- "id": "7969554f.e56e0c",
+ "id": "b7860b2.f448af8",
"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": 1878.9998779296875,
- "y": 647.0833740234375,
- "z": "b4969602.e5a2a8",
+ "x": 1924.2498779296875,
+ "y": 660.0833740234375,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "8a00ee98.85d8c",
+ "id": "da507cbc.1345a",
"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": 1570.91650390625,
- "y": 700.0834045410156,
- "z": "b4969602.e5a2a8",
+ "x": 1616.16650390625,
+ "y": 713.0834045410156,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "a98ac8b6.1c8b18",
+ "id": "97083a8c.a99408",
"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": 1912.9166259765625,
- "y": 904.0833740234375,
- "z": "b4969602.e5a2a8",
+ "x": 1987.1666259765625,
+ "y": 928.0833740234375,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "a967853.2e08a78",
+ "id": "e8bf8d4b.e71c5",
"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": 1575.9998779296875,
- "y": 596.0833740234375,
- "z": "b4969602.e5a2a8",
+ "x": 1621.2498779296875,
+ "y": 609.0833740234375,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "44e1b1d0.b5bf9",
+ "id": "9c19d3c7.c09df",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1406.9998779296875,
- "y": 845.0833740234375,
- "z": "b4969602.e5a2a8",
+ "x": 1458.2498779296875,
+ "y": 855.0833740234375,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "61a865a3.81374c",
- "af2360f3.a1b32",
- "c058b1a3.cafa7",
- "d59d4575.f7aa08",
- "97b68625.59c538"
+ "df593d16.3a873",
+ "60d331ee.302dd",
+ "89d6b5d0.08f888",
+ "35e221ba.99c04e",
+ "25b31875.8826d8",
+ "2a38d6be.132baa"
]
]
},
{
- "id": "72836a7a.768624",
+ "id": "2a38d6be.132baa",
"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": 1938.1666259765625,
- "y": 819.0833740234375,
- "z": "b4969602.e5a2a8",
+ "x": 1656.4166564941406,
+ "y": 841.8333864212036,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "93689f4a.8157",
+ "id": "37993504.393d8a",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 645.9999389648438,
- "y": 652.0000610351562,
- "z": "b4969602.e5a2a8",
+ "x": 691.2499389648438,
+ "y": 665.0000610351562,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "c92e96da.bead68"
+ "d005c7d.aef5638"
]
]
},
{
- "id": "3705b5ae.a55ada",
+ "id": "4c48a33.c60a15c",
"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": 936.9999389648438,
- "y": 611,
- "z": "b4969602.e5a2a8",
+ "x": 982.2499389648438,
+ "y": 624,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "c92e96da.bead68",
+ "id": "d005c7d.aef5638",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 782.9999389648438,
- "y": 646.0000610351562,
- "z": "b4969602.e5a2a8",
+ "x": 828.2499389648438,
+ "y": 659.0000610351562,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "3705b5ae.a55ada",
- "d4f3b77a.b39508"
+ "4c48a33.c60a15c",
+ "35d55016.e4b95"
]
]
},
{
- "id": "889f84ed.e111e8",
+ "id": "ab162f45.fae5a",
"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<parameter name='outputPayloadField' value='.Output' />\n",
"comments": "",
- "x": 415,
- "y": 243,
- "z": "b4969602.e5a2a8",
+ "x": 460.25,
+ "y": 203,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "9e2047bf.84ca98",
+ "id": "c357a4ca.bfb1f8",
"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": 955,
- "y": 419,
- "z": "b4969602.e5a2a8",
+ "x": 1000.25,
+ "y": 432,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "db67679b.d5f7f8"
+ "92bfd5f6.6a14f8"
]
]
},
{
- "id": "db67679b.d5f7f8",
+ "id": "92bfd5f6.6a14f8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1113.3907470703125,
- "y": 417.28399658203125,
- "z": "b4969602.e5a2a8",
+ "x": 1158.6407470703125,
+ "y": 430.28399658203125,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "9f78147c.45b0d8"
+ "98d72ef7.86e05"
]
]
},
{
- "id": "3c8d18f4.57a768",
+ "id": "5a9e7617.91c178",
"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": 343.9998779296875,
- "y": 607,
- "z": "b4969602.e5a2a8",
+ "x": 389.2498779296875,
+ "y": 620,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "983b7f00.0aa95",
+ "id": "3899b5e2.384a4a",
"type": "switchNode",
"name": "switch pnf-flag",
"xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
"comments": "",
"outputs": 1,
- "x": 397,
- "y": 344,
- "z": "b4969602.e5a2a8",
+ "x": 446.00000762939453,
+ "y": 350.7500057220459,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "6ab53366.6b679c",
- "c2f80dd0.8d1"
+ "64bc4358.92afbc",
+ "2ae0f373.dadc4c"
]
]
},
{
- "id": "40652fca.65d24",
+ "id": "f7de272b.bbcd78",
"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": 429,
- "y": 290,
- "z": "b4969602.e5a2a8",
+ "x": 474.25,
+ "y": 250,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "6ab53366.6b679c",
+ "id": "64bc4358.92afbc",
"type": "outcome",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 594,
- "y": 323,
- "z": "b4969602.e5a2a8",
+ "x": 630.5000076293945,
+ "y": 294.7500057220459,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "b2f335c.b319ac8"
+ "e0a7ad5f.00f71"
]
]
},
{
- "id": "c2f80dd0.8d1",
+ "id": "2ae0f373.dadc4c",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 593.9999389648438,
- "y": 384,
- "z": "b4969602.e5a2a8",
+ "x": 632.9999465942383,
+ "y": 402.5000057220459,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "64084999.263e28"
+ "b6955f66.1b829"
]
]
},
{
- "id": "64084999.263e28",
+ "id": "b6955f66.1b829",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 741.9999389648438,
- "y": 383,
- "z": "b4969602.e5a2a8",
+ "x": 787.2499504089355,
+ "y": 403.5000057220459,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "9e2047bf.84ca98",
- "1c2838e7.02c327"
+ "c357a4ca.bfb1f8",
+ "828681ee.30745"
]
]
},
{
- "id": "b2f335c.b319ac8",
+ "id": "c2ca99f8.c4bfb8",
"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<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
"comments": "",
- "x": 755,
- "y": 321,
- "z": "b4969602.e5a2a8",
+ "x": 957.7500152587891,
+ "y": 202.75000381469727,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "1c2838e7.02c327",
+ "id": "828681ee.30745",
"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": 964,
- "y": 363,
- "z": "b4969602.e5a2a8",
+ "x": 1009.25,
+ "y": 376,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "43b098aa.2b8088",
+ "id": "72e148f.bd2b1b8",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 394,
- "y": 475,
- "z": "b4969602.e5a2a8",
+ "x": 439.25,
+ "y": 488,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "f5a4d554.8310a8"
+ "3583e961.20f9b6"
]
]
},
{
- "id": "f5a4d554.8310a8",
+ "id": "3583e961.20f9b6",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 565,
- "y": 476,
- "z": "b4969602.e5a2a8",
+ "x": 610.25,
+ "y": 489,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "e3207caa.85b44"
+ "7bde6693.6b25d8"
]
]
},
{
- "id": "e3207caa.85b44",
+ "id": "7bde6693.6b25d8",
"type": "set",
"name": "set playbookname",
"xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",
"comments": "",
- "x": 755,
- "y": 475,
- "z": "b4969602.e5a2a8",
+ "x": 800.25,
+ "y": 488,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "5c9efc94.d81d24",
+ "id": "6cd92845.9c27d8",
"type": "switchNode",
"name": "switch nodelist",
"xml": "<switch test='`$nodelist`'>\n",
"comments": "",
"outputs": 1,
- "x": 384,
- "y": 534,
- "z": "b4969602.e5a2a8",
+ "x": 429.25,
+ "y": 547,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "77224991.c20a78",
- "2deab8c5.642298"
+ "8b89b139.925f3",
+ "8a45ae4e.0ff3c"
]
]
},
{
- "id": "77224991.c20a78",
+ "id": "8b89b139.925f3",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 564,
- "y": 527,
- "z": "b4969602.e5a2a8",
+ "x": 609.25,
+ "y": 540,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "3881d027.425ff"
+ "27015581.7c7d8a"
]
]
},
{
- "id": "3881d027.425ff",
+ "id": "27015581.7c7d8a",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 721,
- "y": 541,
- "z": "b4969602.e5a2a8",
+ "x": 766.25,
+ "y": 554,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "2deab8c5.642298",
+ "id": "8a45ae4e.0ff3c",
"type": "outcome",
"name": "empty",
"xml": "<outcome value=\"['']\">\n\n",
"comments": "",
"outputs": 1,
- "x": 563,
- "y": 571,
- "z": "b4969602.e5a2a8",
+ "x": 608.25,
+ "y": 584,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "3881d027.425ff"
+ "27015581.7c7d8a"
]
]
},
{
- "id": "153ed401.962ddc",
+ "id": "b77da834.ba8d48",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 1439,
- "y": 406,
- "z": "b4969602.e5a2a8",
+ "x": 1484.25,
+ "y": 419,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "3cfaf009.20065"
+ "3d1d8601.0e200a"
]
]
},
{
- "id": "3cfaf009.20065",
+ "id": "3d1d8601.0e200a",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1617,
- "y": 406,
- "z": "b4969602.e5a2a8",
+ "x": 1662.25,
+ "y": 419,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "8e725f1f.6662f"
+ "eccd491.aeea6b8"
]
]
},
{
- "id": "9e70216f.c9b2f",
+ "id": "de4502a8.6c8e4",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
"comments": "",
- "x": 1412,
- "y": 459,
- "z": "b4969602.e5a2a8",
+ "x": 1457.25,
+ "y": 472,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "9f78147c.45b0d8",
+ "id": "98d72ef7.86e05",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1242,
- "y": 416,
- "z": "b4969602.e5a2a8",
+ "x": 1287.25,
+ "y": 429,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "153ed401.962ddc",
- "9e70216f.c9b2f"
+ "b77da834.ba8d48",
+ "de4502a8.6c8e4"
]
]
},
{
- "id": "8e725f1f.6662f",
+ "id": "eccd491.aeea6b8",
"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": 1789,
- "y": 404,
- "z": "b4969602.e5a2a8",
+ "x": 1834.25,
+ "y": 417,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "af2360f3.a1b32",
+ "id": "60d331ee.302dd",
"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",
+ "x": 1684.25,
+ "y": 761,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "c058b1a3.cafa7",
+ "id": "89d6b5d0.08f888",
"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",
+ "x": 1690.25,
+ "y": 806,
+ "z": "29d3492e.6e65c6",
"wires": [
[]
]
},
{
- "id": "d59d4575.f7aa08",
+ "id": "35e221ba.99c04e",
"type": "switchNode",
"name": "switch outputPayload",
"xml": "<switch test='`$outputPayload`'>\n",
"comments": "",
"outputs": 1,
- "x": 1606,
- "y": 840,
- "z": "b4969602.e5a2a8",
+ "x": 1676.2500228881836,
+ "y": 881.7500133514404,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "676d5ce5.e9d864",
- "8ecd1678.ebdff8"
+ "f003e098.7e521"
]
]
},
{
- "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",
+ "id": "f003e098.7e521",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1782,
- "y": 859,
- "z": "b4969602.e5a2a8",
+ "x": 1850.2500267028809,
+ "y": 882.0000133514404,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "5f5e736e.9d3b8c"
+ "75f79f60.b6817"
]
]
},
{
- "id": "5f5e736e.9d3b8c",
+ "id": "75f79f60.b6817",
"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`'/>",
+ "xml": "<set>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
"comments": "",
- "x": 1980,
- "y": 859,
- "z": "b4969602.e5a2a8",
+ "x": 2048.500030517578,
+ "y": 882.5000133514404,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "bd7deada.205038",
+ "id": "2277df4f.e54cc",
"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",
+ "x": 2387.25,
+ "y": 963.9999389648438,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "530e9d63.07dd34",
+ "id": "ce7bf734.28bda8",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1788.000244140625,
- "y": 958.9999389648438,
- "z": "b4969602.e5a2a8",
+ "x": 1853.250244140625,
+ "y": 985.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "aba50f21.a535d"
+ "d2e205c4.4281f8"
]
]
},
{
- "id": "d6c0e471.9108d8",
+ "id": "d19e0c7b.53065",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1787.000244140625,
- "y": 1034.9999389648438,
- "z": "b4969602.e5a2a8",
+ "x": 1852.250244140625,
+ "y": 1061.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "801dd50e.8622c8"
+ "514b412e.93d64"
]
]
},
{
- "id": "97b68625.59c538",
+ "id": "25b31875.8826d8",
"type": "switchNode",
"name": "switch outputPayload",
"xml": "<switch test='`$outputPayload`'>\n",
"comments": "",
"outputs": 1,
- "x": 1605.000244140625,
- "y": 994.9999389648438,
- "z": "b4969602.e5a2a8",
+ "x": 1670.250244140625,
+ "y": 1021.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "530e9d63.07dd34",
- "d6c0e471.9108d8"
+ "ce7bf734.28bda8",
+ "d19e0c7b.53065"
]
]
},
{
- "id": "acbbf9db.eeba28",
+ "id": "155bb7c3.d857e8",
"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",
+ "x": 2428.250244140625,
+ "y": 1045.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "aba50f21.a535d",
+ "id": "d2e205c4.4281f8",
"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",
+ "x": 2023.250244140625,
+ "y": 985.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "3ac4241b.62144c",
- "c67e4b5c.d70a28"
+ "98292b3a.f54c38",
+ "ca11ee2d.ab69a"
]
]
},
{
- "id": "801dd50e.8622c8",
+ "id": "514b412e.93d64",
"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",
+ "x": 2023.250244140625,
+ "y": 1061.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "8dcd3ae3.608a58",
- "a94e8dc6.52647"
+ "337c58c3.55ed98",
+ "7cab1d0c.110394"
]
]
},
{
- "id": "657ecc9e.2687c4",
+ "id": "41ed8585.4713cc",
"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",
+ "x": 2381.250244140625,
+ "y": 1001.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "52f49f6f.dcf4",
+ "id": "448216a9.053268",
"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",
+ "x": 2424.250244140625,
+ "y": 1083.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": []
},
{
- "id": "3ac4241b.62144c",
+ "id": "98292b3a.f54c38",
"type": "other",
"name": "outcome 400",
"xml": "<outcome value='400'>\n",
"comments": "",
"outputs": 1,
- "x": 2146.000244140625,
- "y": 936.9999389648438,
- "z": "b4969602.e5a2a8",
+ "x": 2211.250244140625,
+ "y": 963.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "bd7deada.205038"
+ "2277df4f.e54cc"
]
]
},
{
- "id": "c67e4b5c.d70a28",
+ "id": "ca11ee2d.ab69a",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2127.000244140625,
- "y": 974.9999389648438,
- "z": "b4969602.e5a2a8",
+ "x": 2192.250244140625,
+ "y": 1001.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "657ecc9e.2687c4"
+ "41ed8585.4713cc"
]
]
},
{
- "id": "8dcd3ae3.608a58",
+ "id": "337c58c3.55ed98",
"type": "other",
"name": "outcome 400",
"xml": "<outcome value='400'>\n",
"comments": "",
"outputs": 1,
- "x": 2147.000244140625,
- "y": 1018.9999389648438,
- "z": "b4969602.e5a2a8",
+ "x": 2212.250244140625,
+ "y": 1045.9998779296875,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "acbbf9db.eeba28"
+ "155bb7c3.d857e8"
]
]
},
{
- "id": "a94e8dc6.52647",
+ "id": "7cab1d0c.110394",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2129.000244140625,
- "y": 1056.9999389648438,
- "z": "b4969602.e5a2a8",
+ "x": 2194.250244140625,
+ "y": 1083.9998779296875,
+ "z": "29d3492e.6e65c6",
+ "wires": [
+ [
+ "448216a9.053268"
+ ]
+ ]
+ },
+ {
+ "id": "e0a7ad5f.00f71",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 789.5000114440918,
+ "y": 253.25000381469727,
+ "z": "29d3492e.6e65c6",
"wires": [
[
- "52f49f6f.dcf4"
+ "c2ca99f8.c4bfb8",
+ "5b8c934.62b5e6c"
]
]
+ },
+ {
+ "id": "5b8c934.62b5e6c",
+ "type": "switchNode",
+ "name": "switch playbook-name in req",
+ "xml": "<switch test='`$payloadJson.playbook-name`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 995.7500133514404,
+ "y": 297.75000381469727,
+ "z": "29d3492e.6e65c6",
+ "wires": [
+ [
+ "779f8f25.8993f",
+ "4556266f.9d5cb8"
+ ]
+ ]
+ },
+ {
+ "id": "779f8f25.8993f",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1203.2500190734863,
+ "y": 261.50000381469727,
+ "z": "29d3492e.6e65c6",
+ "wires": [
+ [
+ "de8d7bd8.ab0a48"
+ ]
+ ]
+ },
+ {
+ "id": "4556266f.9d5cb8",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1202.0000228881836,
+ "y": 326.50000381469727,
+ "z": "29d3492e.6e65c6",
+ "wires": [
+ [
+ "d0603697.a5edb8"
+ ]
+ ]
+ },
+ {
+ "id": "de8d7bd8.ab0a48",
+ "type": "set",
+ "name": "set playbookname from prop",
+ "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n",
+ "comments": "",
+ "x": 1405.7500228881836,
+ "y": 261.50000381469727,
+ "z": "29d3492e.6e65c6",
+ "wires": []
+ },
+ {
+ "id": "d0603697.a5edb8",
+ "type": "set",
+ "name": "set playbookname from req",
+ "xml": "<set>\n<parameter name='playbookname' value='`$payloadJson.playbook-name`'/>\n",
+ "comments": "",
+ "x": 1400.7500228881836,
+ "y": 326.50000381469727,
+ "z": "29d3492e.6e65c6",
+ "wires": []
}
] \ 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 0239c763..d6a43175 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
@@ -1,22 +1,22 @@
[
{
- "id": "e17c1584.f756d8",
+ "id": "79123894.fcdcc8",
"type": "method",
"name": "upgrade-pre-check",
"xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 552,
- "y": 67,
- "z": "df893cfa.16f38",
+ "x": 498.75,
+ "y": 41.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "4a691c8b.6b9db4"
+ "54c3a48c.9ff08c"
]
]
},
{
- "id": "1f7a861d.c2112a",
+ "id": "700edfe2.db0dd",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,1060 +24,1133 @@
"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": 339.99993896484375,
- "y": 68,
- "z": "df893cfa.16f38",
+ "x": 286.74993896484375,
+ "y": 42.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "e17c1584.f756d8"
+ "79123894.fcdcc8"
]
]
},
{
- "id": "bb18ce54.65a6d",
+ "id": "63cab8d6.48eba8",
"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": 407.00001525878906,
- "y": 675,
- "z": "df893cfa.16f38",
+ "x": 400.75001525878906,
+ "y": 688.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "c6f98872.c067e8",
- "5614f2d4.83759c",
- "1beab9a5.7e2366"
+ "be544d01.a8609",
+ "1f309cc0.2f6233",
+ "cca4076a.107908"
]
]
},
{
- "id": "8e97cc56.5d143",
+ "id": "eb1a1ff1.d1c85",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 806.9999389648438,
- "y": 783.0000305175781,
- "z": "df893cfa.16f38",
+ "x": 800.7499389648438,
+ "y": 796.2500305175781,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "d5d391c0.e33eb",
- "96569d9a.8f849",
- "8eb6da31.c976d8"
+ "1ecad72d.159dd9",
+ "61406129.c065d",
+ "e371269b.c16e28"
]
]
},
{
- "id": "d5d391c0.e33eb",
+ "id": "1ecad72d.159dd9",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 951.9999389648438,
- "y": 781.0000381469727,
- "z": "df893cfa.16f38",
+ "x": 945.7499389648438,
+ "y": 794.2500381469727,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "261676ae.6c18ea"
+ "a19523e1.35cbd"
]
]
},
{
- "id": "96569d9a.8f849",
+ "id": "61406129.c065d",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 948.9999389648438,
- "y": 838.0000305175781,
- "z": "df893cfa.16f38",
+ "x": 942.7499389648438,
+ "y": 851.2500305175781,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "a9aeb5d4.ad8218"
+ "21d794bd.98632c"
]
]
},
{
- "id": "a9aeb5d4.ad8218",
+ "id": "21d794bd.98632c",
"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": 1136.9999389648438,
- "y": 837.0000305175781,
- "z": "df893cfa.16f38",
+ "x": 1130.7499389648438,
+ "y": 850.2500305175781,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "50e30f80.cb97b",
- "f9b1e44f.cf0bf8"
+ "10f75364.16ad2d",
+ "6e5d5eb.c0cdfa"
]
]
},
{
- "id": "5614f2d4.83759c",
+ "id": "1f309cc0.2f6233",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 665.9999389648438,
- "y": 696.0000915527344,
- "z": "df893cfa.16f38",
+ "x": 659.7499389648438,
+ "y": 709.2500915527344,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "261676ae.6c18ea"
+ "a19523e1.35cbd"
]
]
},
{
- "id": "c6f98872.c067e8",
+ "id": "be544d01.a8609",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 667.9999389648438,
- "y": 748.0000610351562,
- "z": "df893cfa.16f38",
+ "x": 661.7499389648438,
+ "y": 761.2500610351562,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "8e97cc56.5d143"
+ "eb1a1ff1.d1c85"
]
]
},
{
- "id": "50e30f80.cb97b",
+ "id": "10f75364.16ad2d",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1305.9998779296875,
- "y": 819.0000610351562,
- "z": "df893cfa.16f38",
+ "x": 1299.7498779296875,
+ "y": 832.2500610351562,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "7ac364bd.12e01c"
+ "35aa42ce.44d35e"
]
]
},
{
- "id": "8eb6da31.c976d8",
+ "id": "e371269b.c16e28",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 948.9999389648438,
- "y": 739.0000686645508,
- "z": "df893cfa.16f38",
+ "x": 942.7499389648438,
+ "y": 752.2500686645508,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "261676ae.6c18ea"
+ "a19523e1.35cbd"
]
]
},
{
- "id": "f9b1e44f.cf0bf8",
+ "id": "6e5d5eb.c0cdfa",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1309.9998779296875,
- "y": 863.0001220703125,
- "z": "df893cfa.16f38",
+ "x": 1303.7498779296875,
+ "y": 876.2501220703125,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "7ac364bd.12e01c"
+ "35aa42ce.44d35e"
]
]
},
{
- "id": "a40759ed.63a388",
+ "id": "17dc23e5.79688c",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 155,
- "y": 67,
- "z": "df893cfa.16f38",
+ "x": 101.75,
+ "y": 41.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "1f7a861d.c2112a"
+ "700edfe2.db0dd"
]
]
},
{
- "id": "4a691c8b.6b9db4",
+ "id": "54c3a48c.9ff08c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 152.91668701171875,
- "y": 159.08334350585938,
- "z": "df893cfa.16f38",
+ "x": 146.66669082641602,
+ "y": 192.33334636688232,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "bb18ce54.65a6d",
- "4f789742.ddd168",
- "2f15d339.87cf0c",
- "556d2c3e.217c14",
- "905f1137.7562f",
- "5cc58e7c.083a5",
- "db896c60.3d19a",
- "ae5d9d02.d1fe4"
+ "63cab8d6.48eba8",
+ "e0ff5747.e0e408",
+ "28a0da8f.9238c6",
+ "9d9af3e3.66cfb",
+ "fb9c8e38.ca40a",
+ "51abfe6f.79ea7",
+ "97847ebc.c54a9",
+ "b335e1b5.94d26"
]
]
},
{
- "id": "4f789742.ddd168",
+ "id": "e0ff5747.e0e408",
"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": 451.0000305175781,
- "y": 192.08334350585938,
- "z": "df893cfa.16f38",
+ "x": 444.7500305175781,
+ "y": 152.33334350585938,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "9f29e934.d196d8",
+ "id": "a9d7923c.2ca01",
"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": 1617.9998779296875,
- "y": 645.0834045410156,
- "z": "df893cfa.16f38",
+ "x": 1611.7498779296875,
+ "y": 658.3334045410156,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "eff6b07f.5f555"
+ "f8292962.0b6818"
]
]
},
{
- "id": "eff6b07f.5f555",
+ "id": "f8292962.0b6818",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1787.9998168945312,
- "y": 644.0834045410156,
- "z": "df893cfa.16f38",
+ "x": 1781.7498168945312,
+ "y": 657.3334045410156,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "39c1e046.0c9a2"
+ "2356f9f0.a42e76"
]
]
},
{
- "id": "261676ae.6c18ea",
+ "id": "a19523e1.35cbd",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1420.9998168945312,
- "y": 669.0834045410156,
- "z": "df893cfa.16f38",
+ "x": 1414.7498168945312,
+ "y": 682.3334045410156,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "9f29e934.d196d8",
- "20f5321f.fe2dee",
- "b16d5209.3031f"
+ "a9d7923c.2ca01",
+ "f3ee8743.36d458",
+ "f66a0341.fd891"
]
]
},
{
- "id": "dd99789.6491a88",
+ "id": "a59867f8.a2eaa8",
"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": 1653.4998779296875,
- "y": 911.0833740234375,
- "z": "df893cfa.16f38",
+ "x": 1647.2498779296875,
+ "y": 924.3333740234375,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "16bb547b.d2861c"
+ "712d36ea.cfb478"
]
]
},
{
- "id": "16bb547b.d2861c",
+ "id": "712d36ea.cfb478",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1838.4998779296875,
- "y": 911.0833740234375,
- "z": "df893cfa.16f38",
+ "x": 1832.2498779296875,
+ "y": 924.3333740234375,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "95e8f51a.226ea8"
+ "a57d56eb.e502e8"
]
]
},
{
- "id": "39c1e046.0c9a2",
+ "id": "2356f9f0.a42e76",
"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": 1907.9998779296875,
- "y": 643.0833740234375,
- "z": "df893cfa.16f38",
+ "x": 1901.7498779296875,
+ "y": 656.3333740234375,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "20f5321f.fe2dee",
+ "id": "f3ee8743.36d458",
"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": 1599.91650390625,
- "y": 696.0834045410156,
- "z": "df893cfa.16f38",
+ "x": 1593.66650390625,
+ "y": 709.3334045410156,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "95e8f51a.226ea8",
+ "id": "a57d56eb.e502e8",
"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": 1970.9166259765625,
- "y": 911.0833740234375,
- "z": "df893cfa.16f38",
+ "x": 1964.6666259765625,
+ "y": 924.3333740234375,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "b16d5209.3031f",
+ "id": "f66a0341.fd891",
"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": 1604.9998779296875,
- "y": 592.0833740234375,
- "z": "df893cfa.16f38",
+ "x": 1598.7498779296875,
+ "y": 605.3333740234375,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "7ac364bd.12e01c",
+ "id": "35aa42ce.44d35e",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1441.9998779296875,
- "y": 838.0833740234375,
- "z": "df893cfa.16f38",
+ "x": 1435.7498779296875,
+ "y": 851.3333740234375,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "dd99789.6491a88",
- "66ca1a2.98ef5e4",
- "6f78d9df.0d3518",
- "3c0a54ab.00262c",
- "9977ea00.521808"
+ "a59867f8.a2eaa8",
+ "556a3910.4bdad8",
+ "e92cf733.30ba38",
+ "e3dfd6bf.4ead58",
+ "ce2a6d93.154ee",
+ "4de0f71c.f3cdf8"
]
]
},
{
- "id": "b364bef1.e2765",
+ "id": "4de0f71c.f3cdf8",
"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": 1995.1666259765625,
- "y": 816.0833740234375,
- "z": "df893cfa.16f38",
+ "x": 1633.9166564941406,
+ "y": 838.0833864212036,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "1beab9a5.7e2366",
+ "id": "cca4076a.107908",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 674.9999389648438,
- "y": 648.0000610351562,
- "z": "df893cfa.16f38",
+ "x": 668.7499389648438,
+ "y": 661.2500610351562,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "dd0b1351.6bec5"
+ "8e5e5147.24c25"
]
]
},
{
- "id": "6e45eb8e.292b44",
+ "id": "e1a3d0c1.ed1c7",
"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": 965.9999389648438,
- "y": 607,
- "z": "df893cfa.16f38",
+ "x": 959.7499389648438,
+ "y": 620.25,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "dd0b1351.6bec5",
+ "id": "8e5e5147.24c25",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 811.9999389648438,
- "y": 642.0000610351562,
- "z": "df893cfa.16f38",
+ "x": 805.7499389648438,
+ "y": 655.2500610351562,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "6e45eb8e.292b44",
- "261676ae.6c18ea"
+ "e1a3d0c1.ed1c7",
+ "a19523e1.35cbd"
]
]
},
{
- "id": "2f15d339.87cf0c",
+ "id": "28a0da8f.9238c6",
"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<parameter name='outputPayloadField' value='.Output' />\n",
"comments": "",
- "x": 444,
- "y": 239,
- "z": "df893cfa.16f38",
+ "x": 437.75,
+ "y": 199.25,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "3bd1d194.63001e",
+ "id": "b9d0103e.a3c0f",
"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": 984,
- "y": 415,
- "z": "df893cfa.16f38",
+ "x": 977.75,
+ "y": 428.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "d0549989.50cdf8"
+ "707a6dc2.a56554"
]
]
},
{
- "id": "d0549989.50cdf8",
+ "id": "707a6dc2.a56554",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1142.3907470703125,
- "y": 413.28399658203125,
- "z": "df893cfa.16f38",
+ "x": 1136.1407470703125,
+ "y": 426.53399658203125,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "50890a76.58d434"
+ "f770f730.800e58"
]
]
},
{
- "id": "db896c60.3d19a",
+ "id": "97847ebc.c54a9",
"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": 372.9998779296875,
- "y": 603,
- "z": "df893cfa.16f38",
+ "x": 366.7498779296875,
+ "y": 616.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "905f1137.7562f",
+ "id": "fb9c8e38.ca40a",
"type": "switchNode",
"name": "switch pnf-flag",
"xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
"comments": "",
"outputs": 1,
- "x": 426,
- "y": 340,
- "z": "df893cfa.16f38",
+ "x": 423.50000762939453,
+ "y": 347.0000057220459,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "d4a98e23.62f9b",
- "a403044b.ebc9f8"
+ "335af4ab.8619ac",
+ "deac08e0.fa0578"
]
]
},
{
- "id": "556d2c3e.217c14",
+ "id": "9d9af3e3.66cfb",
"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": 458,
- "y": 286,
- "z": "df893cfa.16f38",
+ "x": 451.75,
+ "y": 246.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "d4a98e23.62f9b",
+ "id": "335af4ab.8619ac",
"type": "outcome",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 623,
- "y": 319,
- "z": "df893cfa.16f38",
+ "x": 608.0000076293945,
+ "y": 291.0000057220459,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "582ec79b.faa468"
+ "7ba201ed.e5e12"
]
]
},
{
- "id": "a403044b.ebc9f8",
+ "id": "deac08e0.fa0578",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 622.9999389648438,
- "y": 380,
- "z": "df893cfa.16f38",
+ "x": 610.4999465942383,
+ "y": 398.7500057220459,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "3184e083.2b204"
+ "b91d48aa.1e6708"
]
]
},
{
- "id": "3184e083.2b204",
+ "id": "b91d48aa.1e6708",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 770.9999389648438,
- "y": 379,
- "z": "df893cfa.16f38",
+ "x": 764.7499504089355,
+ "y": 399.7500057220459,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "3bd1d194.63001e",
- "395906a2.acd1ea"
+ "b9d0103e.a3c0f",
+ "df4c69bf.c75128"
]
]
},
{
- "id": "582ec79b.faa468",
+ "id": "b9826fbc.acb59",
"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<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
"comments": "",
- "x": 784,
- "y": 317,
- "z": "df893cfa.16f38",
+ "x": 935.2500152587891,
+ "y": 199.00000381469727,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "395906a2.acd1ea",
+ "id": "df4c69bf.c75128",
"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": 993,
- "y": 359,
- "z": "df893cfa.16f38",
+ "x": 986.75,
+ "y": 372.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "5cc58e7c.083a5",
+ "id": "51abfe6f.79ea7",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 423,
- "y": 471,
- "z": "df893cfa.16f38",
+ "x": 416.75,
+ "y": 484.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "b9c121b9.01765"
+ "159a0737.e614f9"
]
]
},
{
- "id": "b9c121b9.01765",
+ "id": "159a0737.e614f9",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 594,
- "y": 472,
- "z": "df893cfa.16f38",
+ "x": 587.75,
+ "y": 485.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "96dc86e8.19da88"
+ "7c0bd670.f80e88"
]
]
},
{
- "id": "96dc86e8.19da88",
+ "id": "7c0bd670.f80e88",
"type": "set",
"name": "set playbookname",
"xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",
"comments": "",
- "x": 784,
- "y": 471,
- "z": "df893cfa.16f38",
+ "x": 777.75,
+ "y": 484.25,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "ae5d9d02.d1fe4",
+ "id": "b335e1b5.94d26",
"type": "switchNode",
"name": "switch nodelist",
"xml": "<switch test='`$nodelist`'>\n",
"comments": "",
"outputs": 1,
- "x": 413,
- "y": 530,
- "z": "df893cfa.16f38",
+ "x": 406.75,
+ "y": 543.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "d47821da.1dd48",
- "69b2cec2.dd018"
+ "bcd038e8.2000e8",
+ "438394.8dcf2c6c"
]
]
},
{
- "id": "d47821da.1dd48",
+ "id": "bcd038e8.2000e8",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 593,
- "y": 523,
- "z": "df893cfa.16f38",
+ "x": 586.75,
+ "y": 536.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "dce9b14d.bb77b"
+ "7554d6f5.ecbc18"
]
]
},
{
- "id": "dce9b14d.bb77b",
+ "id": "7554d6f5.ecbc18",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 750,
- "y": 537,
- "z": "df893cfa.16f38",
+ "x": 743.75,
+ "y": 550.25,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "69b2cec2.dd018",
+ "id": "438394.8dcf2c6c",
"type": "outcome",
"name": "empty",
"xml": "<outcome value=\"['']\">\n\n",
"comments": "",
"outputs": 1,
- "x": 592,
- "y": 567,
- "z": "df893cfa.16f38",
+ "x": 585.75,
+ "y": 580.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "dce9b14d.bb77b"
+ "7554d6f5.ecbc18"
]
]
},
{
- "id": "8d045871.31f638",
+ "id": "81ee25ea.70a5d8",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 1468,
- "y": 402,
- "z": "df893cfa.16f38",
+ "x": 1461.75,
+ "y": 415.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "ef1e7a17.621f38"
+ "aa8d4256.96bc7"
]
]
},
{
- "id": "ef1e7a17.621f38",
+ "id": "aa8d4256.96bc7",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1646,
- "y": 402,
- "z": "df893cfa.16f38",
+ "x": 1639.75,
+ "y": 415.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "862a6ea8.3ba16"
+ "25ca05e6.56319a"
]
]
},
{
- "id": "8543ebcf.2ead48",
+ "id": "e6663d9a.24393",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
"comments": "",
- "x": 1441,
- "y": 455,
- "z": "df893cfa.16f38",
+ "x": 1434.75,
+ "y": 468.25,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "50890a76.58d434",
+ "id": "f770f730.800e58",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1271,
- "y": 412,
- "z": "df893cfa.16f38",
+ "x": 1264.75,
+ "y": 425.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "8d045871.31f638",
- "8543ebcf.2ead48"
+ "81ee25ea.70a5d8",
+ "e6663d9a.24393"
]
]
},
{
- "id": "862a6ea8.3ba16",
+ "id": "25ca05e6.56319a",
"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": 1818,
- "y": 400,
- "z": "df893cfa.16f38",
+ "x": 1811.75,
+ "y": 413.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "66ca1a2.98ef5e4",
+ "id": "556a3910.4bdad8",
"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",
+ "x": 1661.75,
+ "y": 757.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "6f78d9df.0d3518",
+ "id": "e92cf733.30ba38",
"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",
+ "x": 1667.75,
+ "y": 802.25,
+ "z": "98ab1d2d.2aba2",
"wires": [
[]
]
},
{
- "id": "3c0a54ab.00262c",
+ "id": "e3dfd6bf.4ead58",
"type": "switchNode",
"name": "switch outputPayload",
"xml": "<switch test='`$outputPayload`'>\n",
"comments": "",
"outputs": 1,
- "x": 1660,
- "y": 836,
- "z": "df893cfa.16f38",
+ "x": 1653.7500228881836,
+ "y": 878.0000133514404,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "65b8d06e.2f308",
- "db2edf05.5dbf2"
+ "2d71184f.d707e8"
]
]
},
{
- "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",
+ "id": "2d71184f.d707e8",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1839,
- "y": 860,
- "z": "df893cfa.16f38",
+ "x": 1827.7500267028809,
+ "y": 878.2500133514404,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "3b020d0b.edb822"
+ "17ec9bb3.6c7794"
]
]
},
{
- "id": "3b020d0b.edb822",
+ "id": "17ec9bb3.6c7794",
"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`'/>",
+ "xml": "<set>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
"comments": "",
- "x": 2036,
- "y": 860,
- "z": "df893cfa.16f38",
+ "x": 2026.0000305175781,
+ "y": 878.7500133514404,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "e583cc0b.79586",
+ "id": "421baef1.ca44d",
"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",
+ "x": 2364.75,
+ "y": 960.2499389648438,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "b678b572.4bc6d8",
+ "id": "52010210.9a3a3c",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1837.000244140625,
- "y": 968.9998779296875,
- "z": "df893cfa.16f38",
+ "x": 1830.750244140625,
+ "y": 982.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "bebb9bde.cadbc8"
+ "86cbc6a0.b5d6e8"
]
]
},
{
- "id": "e71f0e75.f5e6e",
+ "id": "555ad08b.2b8e",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1836.000244140625,
- "y": 1044.9998779296875,
- "z": "df893cfa.16f38",
+ "x": 1829.750244140625,
+ "y": 1058.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "a34ae1ab.50555"
+ "4f3f37a2.c71f38"
]
]
},
{
- "id": "9977ea00.521808",
+ "id": "ce2a6d93.154ee",
"type": "switchNode",
"name": "switch outputPayload",
"xml": "<switch test='`$outputPayload`'>\n",
"comments": "",
"outputs": 1,
- "x": 1654.000244140625,
- "y": 1004.9998779296875,
- "z": "df893cfa.16f38",
+ "x": 1647.750244140625,
+ "y": 1018.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "b678b572.4bc6d8",
- "e71f0e75.f5e6e"
+ "52010210.9a3a3c",
+ "555ad08b.2b8e"
]
]
},
{
- "id": "c888915f.7e81c",
+ "id": "18ff9108.05c38f",
"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",
+ "x": 2405.750244140625,
+ "y": 1042.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "bebb9bde.cadbc8",
+ "id": "86cbc6a0.b5d6e8",
"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",
+ "x": 2000.750244140625,
+ "y": 982.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "1b395046.b5f6",
- "d4989dec.88a2e"
+ "1e14d58a.ceb40a",
+ "1771d8c.468b627"
]
]
},
{
- "id": "a34ae1ab.50555",
+ "id": "4f3f37a2.c71f38",
"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",
+ "x": 2000.750244140625,
+ "y": 1058.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "8e9f2082.ee767",
- "3b44f0c3.4b7c2"
+ "e5846df5.e9d01",
+ "6896eb19.633b54"
]
]
},
{
- "id": "5e9a3c.5f7e95c4",
+ "id": "257794.a39f786c",
"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",
+ "x": 2358.750244140625,
+ "y": 998.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "398f4135.fd470e",
+ "id": "dac7ab2b.e0d178",
"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",
+ "x": 2401.750244140625,
+ "y": 1080.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": []
},
{
- "id": "1b395046.b5f6",
+ "id": "1e14d58a.ceb40a",
"type": "other",
"name": "outcome 400",
"xml": "<outcome value='400'>\n",
"comments": "",
"outputs": 1,
- "x": 2195.000244140625,
- "y": 946.9998779296875,
- "z": "df893cfa.16f38",
+ "x": 2188.750244140625,
+ "y": 960.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "e583cc0b.79586"
+ "421baef1.ca44d"
]
]
},
{
- "id": "d4989dec.88a2e",
+ "id": "1771d8c.468b627",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2176.000244140625,
- "y": 984.9998779296875,
- "z": "df893cfa.16f38",
+ "x": 2169.750244140625,
+ "y": 998.2498779296875,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "5e9a3c.5f7e95c4"
+ "257794.a39f786c"
]
]
},
{
- "id": "8e9f2082.ee767",
+ "id": "e5846df5.e9d01",
"type": "other",
"name": "outcome 400",
"xml": "<outcome value='400'>\n",
"comments": "",
"outputs": 1,
- "x": 2196.000244140625,
- "y": 1028.9998779296875,
- "z": "df893cfa.16f38",
+ "x": 2189.750244140625,
+ "y": 1042.2498779296875,
+ "z": "98ab1d2d.2aba2",
+ "wires": [
+ [
+ "18ff9108.05c38f"
+ ]
+ ]
+ },
+ {
+ "id": "6896eb19.633b54",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2171.750244140625,
+ "y": 1080.2498779296875,
+ "z": "98ab1d2d.2aba2",
+ "wires": [
+ [
+ "dac7ab2b.e0d178"
+ ]
+ ]
+ },
+ {
+ "id": "7ba201ed.e5e12",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 767.0000114440918,
+ "y": 249.50000381469727,
+ "z": "98ab1d2d.2aba2",
+ "wires": [
+ [
+ "b9826fbc.acb59",
+ "c9d057b5.ff9928"
+ ]
+ ]
+ },
+ {
+ "id": "c9d057b5.ff9928",
+ "type": "switchNode",
+ "name": "switch playbook-name in req",
+ "xml": "<switch test='`$payloadJson.playbook-name`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 973.2500133514404,
+ "y": 294.00000381469727,
+ "z": "98ab1d2d.2aba2",
+ "wires": [
+ [
+ "b044a404.bd11f8",
+ "a1cad1b1.1a72f"
+ ]
+ ]
+ },
+ {
+ "id": "b044a404.bd11f8",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1180.7500190734863,
+ "y": 257.75000381469727,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "c888915f.7e81c"
+ "c89043b.0269bc"
]
]
},
{
- "id": "3b44f0c3.4b7c2",
+ "id": "a1cad1b1.1a72f",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2178.000244140625,
- "y": 1066.9998779296875,
- "z": "df893cfa.16f38",
+ "x": 1179.5000228881836,
+ "y": 322.75000381469727,
+ "z": "98ab1d2d.2aba2",
"wires": [
[
- "398f4135.fd470e"
+ "b3960e3d.f7841"
]
]
+ },
+ {
+ "id": "c89043b.0269bc",
+ "type": "set",
+ "name": "set playbookname from prop",
+ "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n",
+ "comments": "",
+ "x": 1383.2500228881836,
+ "y": 257.75000381469727,
+ "z": "98ab1d2d.2aba2",
+ "wires": []
+ },
+ {
+ "id": "b3960e3d.f7841",
+ "type": "set",
+ "name": "set playbookname from req",
+ "xml": "<set>\n<parameter name='playbookname' value='`$payloadJson.playbook-name`'/>\n",
+ "comments": "",
+ "x": 1378.2500228881836,
+ "y": 322.75000381469727,
+ "z": "98ab1d2d.2aba2",
+ "wires": []
}
] \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
index 98bb939d..fc3c5efb 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
@@ -1,22 +1,22 @@
[
{
- "id": "700a0160.004aa",
+ "id": "517ee996.cae498",
"type": "method",
"name": "upgrade-software",
"xml": "<method rpc='upgrade-software' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 567,
- "y": 95,
- "z": "ec3deb45.e00818",
+ "x": 605,
+ "y": 67.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "bd9b1e7b.c0a1e"
+ "c922d1b5.fc117"
]
]
},
{
- "id": "fa41fb4b.580858",
+ "id": "d43cd7d9.c78888",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,1060 +24,1133 @@
"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": 354.99993896484375,
- "y": 96,
- "z": "ec3deb45.e00818",
+ "x": 392.99993896484375,
+ "y": 68.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "700a0160.004aa"
+ "517ee996.cae498"
]
]
},
{
- "id": "e9118cc6.cb56",
+ "id": "586243ba.e81c7c",
"type": "execute",
"name": "execute AnsibleA.reqExec",
"xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-software-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
"comments": "",
"outputs": 1,
- "x": 422.00001525878906,
- "y": 703,
- "z": "ec3deb45.e00818",
+ "x": 507.00001525878906,
+ "y": 714.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "a4805e06.99a58",
- "c3cf6822.251028",
- "8fa9e7e9.017688"
+ "25a6718e.235c7e",
+ "fa9dc7b3.2d7ec8",
+ "1eebcb5b.232c35"
]
]
},
{
- "id": "53951e82.372c1",
+ "id": "26321155.b353fe",
"type": "switchNode",
"name": "switch",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 821.9999389648438,
- "y": 811.0000305175781,
- "z": "ec3deb45.e00818",
+ "x": 906.9999389648438,
+ "y": 822.5000305175781,
+ "z": "4789a293.82478c",
"wires": [
[
- "46287bfa.134154",
- "b76b1945.f582c8",
- "c42f2303.695eb"
+ "5f3de043.7bdd3",
+ "3a969e87.f80f62",
+ "e134b022.4c628"
]
]
},
{
- "id": "46287bfa.134154",
+ "id": "5f3de043.7bdd3",
"type": "other",
"name": "outcome 500",
"xml": "<outcome value='500'>\n",
"comments": "",
"outputs": 1,
- "x": 966.9999389648438,
- "y": 809.0000381469727,
- "z": "ec3deb45.e00818",
+ "x": 1051.9999389648438,
+ "y": 820.5000381469727,
+ "z": "4789a293.82478c",
"wires": [
[
- "cd8ebd14.23c24"
+ "523752f4.cd144c"
]
]
},
{
- "id": "b76b1945.f582c8",
+ "id": "3a969e87.f80f62",
"type": "other",
"name": "outcome 100",
"xml": "<outcome value='100'>\n",
"comments": "",
"outputs": 1,
- "x": 963.9999389648438,
- "y": 866.0000305175781,
- "z": "ec3deb45.e00818",
+ "x": 1048.9999389648438,
+ "y": 877.5000305175781,
+ "z": "4789a293.82478c",
"wires": [
[
- "6450772a.c289b8"
+ "199f46f9.4e7679"
]
]
},
{
- "id": "6450772a.c289b8",
+ "id": "199f46f9.4e7679",
"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": 1151.9999389648438,
- "y": 865.0000305175781,
- "z": "ec3deb45.e00818",
+ "x": 1236.9999389648438,
+ "y": 876.5000305175781,
+ "z": "4789a293.82478c",
"wires": [
[
- "e139990d.0bffa8",
- "d862bbfb.0fc3d8"
+ "d5847215.a9d3",
+ "e3bd3bae.380ab8"
]
]
},
{
- "id": "c3cf6822.251028",
+ "id": "fa9dc7b3.2d7ec8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 680.9999389648438,
- "y": 724.0000915527344,
- "z": "ec3deb45.e00818",
+ "x": 765.9999389648438,
+ "y": 735.5000915527344,
+ "z": "4789a293.82478c",
"wires": [
[
- "cd8ebd14.23c24"
+ "523752f4.cd144c"
]
]
},
{
- "id": "a4805e06.99a58",
+ "id": "25a6718e.235c7e",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 682.9999389648438,
- "y": 776.0000610351562,
- "z": "ec3deb45.e00818",
+ "x": 767.9999389648438,
+ "y": 787.5000610351562,
+ "z": "4789a293.82478c",
"wires": [
[
- "53951e82.372c1"
+ "26321155.b353fe"
]
]
},
{
- "id": "e139990d.0bffa8",
+ "id": "d5847215.a9d3",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1320.9998779296875,
- "y": 841.0000610351562,
- "z": "ec3deb45.e00818",
+ "x": 1405.9998779296875,
+ "y": 858.5000610351562,
+ "z": "4789a293.82478c",
"wires": [
[
- "c8609f9e.cb4cc"
+ "ab2173fb.6155"
]
]
},
{
- "id": "c42f2303.695eb",
+ "id": "e134b022.4c628",
"type": "other",
"name": "outcome 101",
"xml": "<outcome value='101'>\n",
"comments": "",
"outputs": 1,
- "x": 963.9999389648438,
- "y": 767.0000686645508,
- "z": "ec3deb45.e00818",
+ "x": 1048.9999389648438,
+ "y": 778.5000686645508,
+ "z": "4789a293.82478c",
"wires": [
[
- "cd8ebd14.23c24"
+ "523752f4.cd144c"
]
]
},
{
- "id": "d862bbfb.0fc3d8",
+ "id": "e3bd3bae.380ab8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1324.9998779296875,
- "y": 895.0001220703125,
- "z": "ec3deb45.e00818",
+ "x": 1409.9998779296875,
+ "y": 902.5001220703125,
+ "z": "4789a293.82478c",
"wires": [
[
- "c8609f9e.cb4cc"
+ "ab2173fb.6155"
]
]
},
{
- "id": "a498eeb0.e871c",
+ "id": "f07d79e5.f968a8",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 170,
- "y": 95,
- "z": "ec3deb45.e00818",
+ "x": 208,
+ "y": 67.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "fa41fb4b.580858"
+ "d43cd7d9.c78888"
]
]
},
{
- "id": "bd9b1e7b.c0a1e",
+ "id": "c922d1b5.fc117",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 167.91668701171875,
- "y": 187.08334350585938,
- "z": "ec3deb45.e00818",
+ "x": 252.91669082641602,
+ "y": 218.58334636688232,
+ "z": "4789a293.82478c",
"wires": [
[
- "e9118cc6.cb56",
- "8f2cdd2c.cf15b",
- "881e51a9.bba9",
- "3bae173d.769688",
- "f24727d0.cfe3a8",
- "a40512f5.69e4d",
- "57b0407c.30e16",
- "2f8a882.7fbf078"
+ "586243ba.e81c7c",
+ "68e0f4a4.159fdc",
+ "f1ebf11a.c5bc5",
+ "d12b72c5.d2a0d",
+ "189980b6.f2823f",
+ "6c9cb3dc.03d7bc",
+ "ab634dae.7862b",
+ "f7c7e177.43b44"
]
]
},
{
- "id": "8f2cdd2c.cf15b",
+ "id": "68e0f4a4.159fdc",
"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": 466.0000305175781,
- "y": 220.08334350585938,
- "z": "ec3deb45.e00818",
+ "x": 551.0000305175781,
+ "y": 178.58334350585938,
+ "z": "4789a293.82478c",
"wires": [
[]
]
},
{
- "id": "f33bb583.25a398",
+ "id": "8c604a5b.b81f18",
"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": 1632.9998779296875,
- "y": 673.0834045410156,
- "z": "ec3deb45.e00818",
+ "x": 1717.9998779296875,
+ "y": 684.5834045410156,
+ "z": "4789a293.82478c",
"wires": [
[
- "1ec548c6.857767"
+ "881c1cd9.b1846"
]
]
},
{
- "id": "1ec548c6.857767",
+ "id": "881c1cd9.b1846",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1802.9998168945312,
- "y": 672.0834045410156,
- "z": "ec3deb45.e00818",
+ "x": 1887.9998168945312,
+ "y": 683.5834045410156,
+ "z": "4789a293.82478c",
"wires": [
[
- "f99d1384.2dae"
+ "dadc2809.14b598"
]
]
},
{
- "id": "cd8ebd14.23c24",
+ "id": "523752f4.cd144c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1435.9998168945312,
- "y": 697.0834045410156,
- "z": "ec3deb45.e00818",
+ "x": 1520.9998168945312,
+ "y": 708.5834045410156,
+ "z": "4789a293.82478c",
"wires": [
[
- "f33bb583.25a398",
- "bfff1f61.da463",
- "b136bf71.fb6b9"
+ "8c604a5b.b81f18",
+ "653d2841.a51248",
+ "12dd9e68.21d922"
]
]
},
{
- "id": "f99d1384.2dae",
+ "id": "41cf8a88.900054",
+ "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": 1753.4998779296875,
+ "y": 950.5833740234375,
+ "z": "4789a293.82478c",
+ "wires": [
+ [
+ "9f640519.9a44f8"
+ ]
+ ]
+ },
+ {
+ "id": "9f640519.9a44f8",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1938.4998779296875,
+ "y": 950.5833740234375,
+ "z": "4789a293.82478c",
+ "wires": [
+ [
+ "447afdf7.f2c9a4"
+ ]
+ ]
+ },
+ {
+ "id": "dadc2809.14b598",
"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": 1922.9998779296875,
- "y": 671.0833740234375,
- "z": "ec3deb45.e00818",
+ "x": 2007.9998779296875,
+ "y": 682.5833740234375,
+ "z": "4789a293.82478c",
"wires": [
[]
]
},
{
- "id": "bfff1f61.da463",
+ "id": "653d2841.a51248",
"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": 1614.91650390625,
- "y": 724.0834045410156,
- "z": "ec3deb45.e00818",
+ "x": 1699.91650390625,
+ "y": 735.5834045410156,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "b136bf71.fb6b9",
+ "id": "447afdf7.f2c9a4",
+ "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": 2070.9166259765625,
+ "y": 950.5833740234375,
+ "z": "4789a293.82478c",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "12dd9e68.21d922",
"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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
"comments": "",
- "x": 1619.9998779296875,
- "y": 620.0833740234375,
- "z": "ec3deb45.e00818",
+ "x": 1704.9998779296875,
+ "y": 631.5833740234375,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "c8609f9e.cb4cc",
+ "id": "ab2173fb.6155",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1453.9998779296875,
- "y": 864.0833740234375,
- "z": "ec3deb45.e00818",
+ "x": 1541.9998779296875,
+ "y": 877.5833740234375,
+ "z": "4789a293.82478c",
"wires": [
[
- "77de5f8d.0aa37",
- "87eb757f.5a9998",
- "d4c78c4a.10f57",
- "9253558b.1de3f8",
- "abc5eb21.233c78"
+ "41cf8a88.900054",
+ "6a05d1a3.c6749",
+ "9ad5d754.15c1a8",
+ "63045d28.4542d4",
+ "9a5d17c7.55f4a8",
+ "18ebed43.15cc23"
]
]
},
{
- "id": "8fa9e7e9.017688",
+ "id": "18ebed43.15cc23",
+ "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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
+ "comments": "",
+ "x": 1740.1666564941406,
+ "y": 864.3333864212036,
+ "z": "4789a293.82478c",
+ "wires": []
+ },
+ {
+ "id": "1eebcb5b.232c35",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 689.9999389648438,
- "y": 676.0000610351562,
- "z": "ec3deb45.e00818",
+ "x": 774.9999389648438,
+ "y": 687.5000610351562,
+ "z": "4789a293.82478c",
"wires": [
[
- "8d1a07a6.9f8f38"
+ "bd3250c4.fa4cd"
]
]
},
{
- "id": "d1a59bdb.49c988",
+ "id": "c1824b8f.435ad8",
"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": 980.9999389648438,
- "y": 635,
- "z": "ec3deb45.e00818",
+ "x": 1065.9999389648438,
+ "y": 646.5,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "8d1a07a6.9f8f38",
+ "id": "bd3250c4.fa4cd",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 826.9999389648438,
- "y": 670.0000610351562,
- "z": "ec3deb45.e00818",
+ "x": 911.9999389648438,
+ "y": 681.5000610351562,
+ "z": "4789a293.82478c",
"wires": [
[
- "d1a59bdb.49c988",
- "cd8ebd14.23c24"
+ "c1824b8f.435ad8",
+ "523752f4.cd144c"
]
]
},
{
- "id": "881e51a9.bba9",
+ "id": "f1ebf11a.c5bc5",
"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<parameter name='outputPayloadField' value='.Output' />\n",
"comments": "",
- "x": 459,
- "y": 267,
- "z": "ec3deb45.e00818",
+ "x": 544,
+ "y": 225.5,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "27e24246.a44b8e",
+ "id": "948df1b1.145e8",
"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-software-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
"comments": "",
"outputs": 1,
- "x": 999,
- "y": 443,
- "z": "ec3deb45.e00818",
+ "x": 1084,
+ "y": 454.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "4d967fc5.86e13"
+ "e8ff611b.49a6e"
]
]
},
{
- "id": "4d967fc5.86e13",
+ "id": "e8ff611b.49a6e",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1157.3907470703125,
- "y": 441.28399658203125,
- "z": "ec3deb45.e00818",
+ "x": 1242.3907470703125,
+ "y": 452.78399658203125,
+ "z": "4789a293.82478c",
"wires": [
[
- "363cf7ac.eea978"
+ "e295e5e6.4c6048"
]
]
},
{
- "id": "57b0407c.30e16",
+ "id": "ab634dae.7862b",
"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": 387.9998779296875,
- "y": 631,
- "z": "ec3deb45.e00818",
+ "x": 472.9998779296875,
+ "y": 642.5,
+ "z": "4789a293.82478c",
"wires": [
[]
]
},
{
- "id": "f24727d0.cfe3a8",
+ "id": "189980b6.f2823f",
"type": "switchNode",
"name": "switch pnf-flag",
"xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
"comments": "",
"outputs": 1,
- "x": 441,
- "y": 368,
- "z": "ec3deb45.e00818",
+ "x": 529.7500076293945,
+ "y": 373.2500057220459,
+ "z": "4789a293.82478c",
"wires": [
[
- "ebcaa444.5c15f8",
- "200181e1.aab39e"
+ "9f0534ad.d03f28",
+ "a5db95d8.460d78"
]
]
},
{
- "id": "3bae173d.769688",
+ "id": "d12b72c5.d2a0d",
"type": "execute",
"name": "execute jsonStringToCtx",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-software-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
"comments": "",
"outputs": 1,
- "x": 473,
- "y": 314,
- "z": "ec3deb45.e00818",
+ "x": 558,
+ "y": 272.5,
+ "z": "4789a293.82478c",
"wires": [
[]
]
},
{
- "id": "ebcaa444.5c15f8",
+ "id": "9f0534ad.d03f28",
"type": "outcome",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 638,
- "y": 347,
- "z": "ec3deb45.e00818",
+ "x": 714.2500076293945,
+ "y": 317.2500057220459,
+ "z": "4789a293.82478c",
"wires": [
[
- "4f4ae7b6.577da8"
+ "a7f091ea.70c67"
]
]
},
{
- "id": "200181e1.aab39e",
+ "id": "a5db95d8.460d78",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 637.9999389648438,
- "y": 408,
- "z": "ec3deb45.e00818",
+ "x": 716.7499465942383,
+ "y": 425.0000057220459,
+ "z": "4789a293.82478c",
"wires": [
[
- "b59848fc.f07918"
+ "b2749711.a1e1b8"
]
]
},
{
- "id": "b59848fc.f07918",
+ "id": "b2749711.a1e1b8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 785.9999389648438,
- "y": 407,
- "z": "ec3deb45.e00818",
+ "x": 870.9999504089355,
+ "y": 426.0000057220459,
+ "z": "4789a293.82478c",
"wires": [
[
- "27e24246.a44b8e",
- "91c96ed6.a5b05"
+ "948df1b1.145e8",
+ "1c9a4267.83f8fe"
]
]
},
{
- "id": "4f4ae7b6.577da8",
+ "id": "9dbe8b14.8545c8",
"type": "set",
"name": "set AnsibleReq",
- "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\n<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
+ "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`\"/>\n<parameter name='outputPayloadField' value=\"`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`\"/>\n",
"comments": "",
- "x": 799,
- "y": 345,
- "z": "ec3deb45.e00818",
+ "x": 1041.500015258789,
+ "y": 225.25000381469727,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "91c96ed6.a5b05",
+ "id": "1c9a4267.83f8fe",
"type": "execute",
"name": "set playbookname",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 1008,
- "y": 387,
- "z": "ec3deb45.e00818",
+ "x": 1093,
+ "y": 398.5,
+ "z": "4789a293.82478c",
"wires": [
[]
]
},
{
- "id": "a40512f5.69e4d",
+ "id": "6c9cb3dc.03d7bc",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 438,
- "y": 499,
- "z": "ec3deb45.e00818",
+ "x": 523,
+ "y": 510.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "e6c437a6.29de58"
+ "e38d4527.338bb8"
]
]
},
{
- "id": "e6c437a6.29de58",
+ "id": "e38d4527.338bb8",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 609,
- "y": 500,
- "z": "ec3deb45.e00818",
+ "x": 694,
+ "y": 511.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "a4fde5cc.d4c598"
+ "afd73c41.dd42d"
]
]
},
{
- "id": "a4fde5cc.d4c598",
+ "id": "afd73c41.dd42d",
"type": "set",
"name": "set playbookname",
"xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",
"comments": "",
- "x": 799,
- "y": 499,
- "z": "ec3deb45.e00818",
+ "x": 884,
+ "y": 510.5,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "2f8a882.7fbf078",
+ "id": "f7c7e177.43b44",
"type": "switchNode",
"name": "switch nodelist",
"xml": "<switch test='`$nodelist`'>\n",
"comments": "",
"outputs": 1,
- "x": 428,
- "y": 558,
- "z": "ec3deb45.e00818",
+ "x": 513,
+ "y": 569.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "fc8a62b5.226f9",
- "174740d3.bb580f"
+ "244a7ef9.90d572",
+ "efb7985a.a80778"
]
]
},
{
- "id": "fc8a62b5.226f9",
+ "id": "244a7ef9.90d572",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 608,
- "y": 551,
- "z": "ec3deb45.e00818",
+ "x": 693,
+ "y": 562.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "82a452fa.2b2b4"
+ "e6b6586a.90a5f8"
]
]
},
{
- "id": "82a452fa.2b2b4",
+ "id": "e6b6586a.90a5f8",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
"comments": "",
- "x": 765,
- "y": 565,
- "z": "ec3deb45.e00818",
+ "x": 850,
+ "y": 576.5,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "174740d3.bb580f",
+ "id": "efb7985a.a80778",
"type": "outcome",
"name": "empty",
"xml": "<outcome value=\"['']\">\n\n",
"comments": "",
"outputs": 1,
- "x": 607,
- "y": 595,
- "z": "ec3deb45.e00818",
+ "x": 692,
+ "y": 606.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "82a452fa.2b2b4"
+ "e6b6586a.90a5f8"
]
]
},
{
- "id": "2651af68.3f9dc",
+ "id": "6652a4df.406dfc",
"type": "switchNode",
"name": "switch playbookname",
"xml": "<switch test='`$playbookname`'>\n",
"comments": "",
"outputs": 1,
- "x": 1483,
- "y": 430,
- "z": "ec3deb45.e00818",
+ "x": 1568,
+ "y": 441.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "bf08f71c.7cf758"
+ "fdf6c8e8.296a38"
]
]
},
{
- "id": "bf08f71c.7cf758",
+ "id": "fdf6c8e8.296a38",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1661,
- "y": 430,
- "z": "ec3deb45.e00818",
+ "x": 1746,
+ "y": 441.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "61379210.f96dcc"
+ "590854b0.7ac97c"
]
]
},
{
- "id": "5f26038d.9f08dc",
+ "id": "ec745eef.b48a",
"type": "set",
"name": "set nodelist",
"xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`\"/>\n",
"comments": "",
- "x": 1456,
- "y": 483,
- "z": "ec3deb45.e00818",
+ "x": 1541,
+ "y": 494.5,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "363cf7ac.eea978",
+ "id": "e295e5e6.4c6048",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1286,
- "y": 440,
- "z": "ec3deb45.e00818",
+ "x": 1371,
+ "y": 451.5,
+ "z": "4789a293.82478c",
"wires": [
[
- "2651af68.3f9dc",
- "5f26038d.9f08dc"
+ "6652a4df.406dfc",
+ "ec745eef.b48a"
]
]
},
{
- "id": "61379210.f96dcc",
+ "id": "590854b0.7ac97c",
"type": "execute",
"name": "set playbookname",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-software.playbookname'`\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 1833,
- "y": 428,
- "z": "ec3deb45.e00818",
- "wires": [
- []
- ]
- },
- {
- "id": "9253558b.1de3f8",
- "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": 1648,
- "y": 939,
- "z": "ec3deb45.e00818",
- "wires": [
- [
- "a452deae.c86e6"
- ]
- ]
- },
- {
- "id": "a452deae.c86e6",
- "type": "failure",
- "name": "failure",
- "xml": "<outcome value='failure'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1830,
- "y": 939,
- "z": "ec3deb45.e00818",
- "wires": [
- [
- "fedb3391.b66c"
- ]
- ]
- },
- {
- "id": "fedb3391.b66c",
- "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": 1960.416748046875,
- "y": 939,
- "z": "ec3deb45.e00818",
+ "x": 1918,
+ "y": 439.5,
+ "z": "4789a293.82478c",
"wires": [
[]
]
},
{
- "id": "4f44742c.4c245c",
- "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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
- "comments": "",
- "x": 1985.666748046875,
- "y": 854,
- "z": "ec3deb45.e00818",
- "wires": []
- },
- {
- "id": "77de5f8d.0aa37",
+ "id": "6a05d1a3.c6749",
"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": 1663.5001220703125,
- "y": 784.9166259765625,
- "z": "ec3deb45.e00818",
+ "x": 1768,
+ "y": 783.5,
+ "z": "4789a293.82478c",
"wires": [
[]
]
},
{
- "id": "87eb757f.5a9998",
+ "id": "9ad5d754.15c1a8",
"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": 1669.5001220703125,
- "y": 827.9166259765625,
- "z": "ec3deb45.e00818",
+ "x": 1774,
+ "y": 828.5,
+ "z": "4789a293.82478c",
"wires": [
[]
]
},
{
- "id": "d4c78c4a.10f57",
+ "id": "63045d28.4542d4",
"type": "switchNode",
"name": "switch outputPayload",
"xml": "<switch test='`$outputPayload`'>\n",
"comments": "",
"outputs": 1,
- "x": 1653.5001220703125,
- "y": 874.9166259765625,
- "z": "ec3deb45.e00818",
- "wires": [
- [
- "52af5803.b461c8",
- "f8c7b0fd.65877"
- ]
- ]
- },
- {
- "id": "52af5803.b461c8",
- "type": "outcome",
- "name": "null",
- "xml": "<outcome value=''>\n",
- "comments": "",
- "outputs": 1,
- "x": 1830.5001220703125,
- "y": 853.9166259765625,
- "z": "ec3deb45.e00818",
+ "x": 1760.0000228881836,
+ "y": 904.2500133514404,
+ "z": "4789a293.82478c",
"wires": [
[
- "4f44742c.4c245c"
+ "c0b5f473.074fe8"
]
]
},
{
- "id": "f8c7b0fd.65877",
+ "id": "c0b5f473.074fe8",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1829.5001220703125,
- "y": 893.9166259765625,
- "z": "ec3deb45.e00818",
+ "x": 1934.0000267028809,
+ "y": 904.5000133514404,
+ "z": "4789a293.82478c",
"wires": [
[
- "596dd9e6.b15a48"
+ "bbcdc831.3c9348"
]
]
},
{
- "id": "596dd9e6.b15a48",
+ "id": "bbcdc831.3c9348",
"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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
+ "xml": "<set>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",
"comments": "",
- "x": 2027.5001220703125,
- "y": 893.9166259765625,
- "z": "ec3deb45.e00818",
+ "x": 2132.250030517578,
+ "y": 905.0000133514404,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "1310b766.620cb9",
+ "id": "35b87e9e.4b4612",
"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": 2369.5001220703125,
- "y": 971.9166259765625,
- "z": "ec3deb45.e00818",
+ "x": 2471,
+ "y": 986.4999389648438,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "94ccd9bd.ce5728",
+ "id": "17165733.b036f9",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1835.5003662109375,
- "y": 993.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 1937.000244140625,
+ "y": 1008.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "acf117a7.e47ff8"
+ "71c2529a.2b6c4c"
]
]
},
{
- "id": "af6eae51.b597d",
+ "id": "6e335499.cca56c",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1834.5003662109375,
- "y": 1069.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 1936.000244140625,
+ "y": 1084.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "526dfc55.6eeaf4"
+ "586f871e.a07558"
]
]
},
{
- "id": "abc5eb21.233c78",
+ "id": "9a5d17c7.55f4a8",
"type": "switchNode",
"name": "switch outputPayload",
"xml": "<switch test='`$outputPayload`'>\n",
"comments": "",
"outputs": 1,
- "x": 1652.5003662109375,
- "y": 1029.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 1754.000244140625,
+ "y": 1044.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "94ccd9bd.ce5728",
- "af6eae51.b597d"
+ "17165733.b036f9",
+ "6e335499.cca56c"
]
]
},
{
- "id": "d4fc7ba0.d97cd8",
+ "id": "a751cca6.d89a",
"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": 2410.5003662109375,
- "y": 1053.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2512.000244140625,
+ "y": 1068.4998779296875,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "acf117a7.e47ff8",
+ "id": "71c2529a.2b6c4c",
"type": "switchNode",
"name": "switch result code",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 2005.5003662109375,
- "y": 993.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2107.000244140625,
+ "y": 1008.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "7b6a7dcd.0bf034",
- "964b16ae.6cb568"
+ "b3616040.dfb69",
+ "fd22e048.3d737"
]
]
},
{
- "id": "526dfc55.6eeaf4",
+ "id": "586f871e.a07558",
"type": "switchNode",
"name": "switch result code",
"xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
"comments": "",
"outputs": 1,
- "x": 2005.5003662109375,
- "y": 1069.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2107.000244140625,
+ "y": 1084.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "116f67f9.8b84e8",
- "b7261460.4d2728"
+ "6dbe7e48.8df42",
+ "3f429d60.7d5362"
]
]
},
{
- "id": "270915b4.03f91a",
+ "id": "f97605a1.be13b8",
"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": 2363.5003662109375,
- "y": 1009.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2465.000244140625,
+ "y": 1024.4998779296875,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "ba208b9e.ce90f8",
+ "id": "6a5ea797.248c88",
"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": 2406.5003662109375,
- "y": 1091.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2508.000244140625,
+ "y": 1106.4998779296875,
+ "z": "4789a293.82478c",
"wires": []
},
{
- "id": "7b6a7dcd.0bf034",
+ "id": "b3616040.dfb69",
"type": "other",
"name": "outcome 400",
"xml": "<outcome value='400'>\n",
"comments": "",
"outputs": 1,
- "x": 2193.5003662109375,
- "y": 971.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2295.000244140625,
+ "y": 986.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "1310b766.620cb9"
+ "35b87e9e.4b4612"
]
]
},
{
- "id": "964b16ae.6cb568",
+ "id": "fd22e048.3d737",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2174.5003662109375,
- "y": 1009.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2276.000244140625,
+ "y": 1024.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "270915b4.03f91a"
+ "f97605a1.be13b8"
]
]
},
{
- "id": "116f67f9.8b84e8",
+ "id": "6dbe7e48.8df42",
"type": "other",
"name": "outcome 400",
"xml": "<outcome value='400'>\n",
"comments": "",
"outputs": 1,
- "x": 2194.5003662109375,
- "y": 1053.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2296.000244140625,
+ "y": 1068.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "d4fc7ba0.d97cd8"
+ "a751cca6.d89a"
]
]
},
{
- "id": "b7261460.4d2728",
+ "id": "3f429d60.7d5362",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2176.5003662109375,
- "y": 1091.9165649414062,
- "z": "ec3deb45.e00818",
+ "x": 2278.000244140625,
+ "y": 1106.4998779296875,
+ "z": "4789a293.82478c",
"wires": [
[
- "ba208b9e.ce90f8"
+ "6a5ea797.248c88"
]
]
+ },
+ {
+ "id": "a7f091ea.70c67",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 873.2500114440918,
+ "y": 275.75000381469727,
+ "z": "4789a293.82478c",
+ "wires": [
+ [
+ "9dbe8b14.8545c8",
+ "8eab321.a8fd0d"
+ ]
+ ]
+ },
+ {
+ "id": "8eab321.a8fd0d",
+ "type": "switchNode",
+ "name": "switch playbook-name in req",
+ "xml": "<switch test='`$payloadJson.playbook-name`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1079.5000133514404,
+ "y": 320.25000381469727,
+ "z": "4789a293.82478c",
+ "wires": [
+ [
+ "b9ffda2e.115ef8",
+ "b261fc07.37395"
+ ]
+ ]
+ },
+ {
+ "id": "b9ffda2e.115ef8",
+ "type": "outcome",
+ "name": "null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1287.0000190734863,
+ "y": 284.00000381469727,
+ "z": "4789a293.82478c",
+ "wires": [
+ [
+ "5945cca6.5e9904"
+ ]
+ ]
+ },
+ {
+ "id": "b261fc07.37395",
+ "type": "outcome",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1285.7500228881836,
+ "y": 349.00000381469727,
+ "z": "4789a293.82478c",
+ "wires": [
+ [
+ "366917bb.643c18"
+ ]
+ ]
+ },
+ {
+ "id": "5945cca6.5e9904",
+ "type": "set",
+ "name": "set playbookname from prop",
+ "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\n",
+ "comments": "",
+ "x": 1489.5000228881836,
+ "y": 284.00000381469727,
+ "z": "4789a293.82478c",
+ "wires": []
+ },
+ {
+ "id": "366917bb.643c18",
+ "type": "set",
+ "name": "set playbookname from req",
+ "xml": "<set>\n<parameter name='playbookname' value='`$payloadJson.playbook-name`'/>\n",
+ "comments": "",
+ "x": 1484.5000228881836,
+ "y": 349.00000381469727,
+ "z": "4789a293.82478c",
+ "wires": []
}
-]
+] \ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_rollback.xml b/platform-logic/lcm/src/main/xml/LCM_rollback.xml
index dd240633..8c57d027 100644
--- a/platform-logic/lcm/src/main/xml/LCM_rollback.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_rollback.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='rollback-input.payload' />
@@ -19,24 +20,58 @@
</execute>
<switch test='`$payloadJson.pnf-flag`'>
<outcome value='true'>
- <set>
- <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
- <parameter name='playbookname' value='`$prop.lcm.pnf.rollback.playbookname`'/>
- </set>
+ <block>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
+ </set>
+ <switch test='`$payloadJson.playbook-name`'>
+ <outcome value=''>
+ <set>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.rollback.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
+ </set>
+ </outcome>
+ </switch>
+ </block>
</outcome>
<outcome value='Other'>
<block>
- <return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message' value='Currently only support PNF.' />
- </return>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.rollback.playbookname'`" />
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="generic-vnf"
+ key="generic-vnf.vnf-id = $rollback-input.action-identifiers.vnf-id"
+ local-only="false"
+ pfx='aai.generic-vnf'>
+ <outcome value='success'>
+ <block>
+ <switch test='`$playbookname`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+ <parameter name='outputPath' value='playbookname' />
+ <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.rollback.playbookname'`" />
+ </execute>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address + $quote + ']'`"/>
+ </set>
+ </block>
+ </outcome>
+ </get-resource>
</block>
</outcome>
</switch>
<switch test='`$playbookname`'>
<outcome value=''>
<set>
- <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
<parameter name='playbookname' value='`$prop.lcm.rollback.playbookname`'/>
</set>
</outcome>
@@ -256,46 +291,29 @@
<parameter name='isEscaped' value='false' />
</execute>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
- <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+ <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
<parameter name='outputPath' value='outputPayload' />
</execute>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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>
<switch test='`$outputPayload`'>
- <outcome value=''>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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>
@@ -362,46 +380,29 @@
<parameter name='isEscaped' value='false' />
</execute>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
- <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+ <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
<parameter name='outputPath' value='outputPayload' />
</execute>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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>
<switch test='`$outputPayload`'>
- <outcome value=''>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-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>
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 b22f4715..fd1c8b2c 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
@@ -20,11 +20,24 @@
</execute>
<switch test='`$payloadJson.pnf-flag`'>
<outcome value='true'>
- <set>
- <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
- <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>
- <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
- </set>
+ <block>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
+ </set>
+ <switch test='`$payloadJson.playbook-name`'>
+ <outcome value=''>
+ <set>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
+ </set>
+ </outcome>
+ </switch>
+ </block>
</outcome>
<outcome value='Other'>
<block>
@@ -281,43 +294,26 @@
<parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
<parameter name='outputPath' value='outputPayload' />
</execute>
+ <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>
<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>
@@ -387,43 +383,26 @@
<parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
<parameter name='outputPath' value='outputPayload' />
</execute>
+ <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>
<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>
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 89033222..3976fb9a 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
@@ -20,11 +20,24 @@
</execute>
<switch test='`$payloadJson.pnf-flag`'>
<outcome value='true'>
- <set>
- <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
- <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>
- <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
- </set>
+ <block>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
+ </set>
+ <switch test='`$payloadJson.playbook-name`'>
+ <outcome value=''>
+ <set>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
+ </set>
+ </outcome>
+ </switch>
+ </block>
</outcome>
<outcome value='Other'>
<block>
@@ -281,43 +294,26 @@
<parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
<parameter name='outputPath' value='outputPayload' />
</execute>
+ <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>
<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>
@@ -387,43 +383,26 @@
<parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
<parameter name='outputPath' value='outputPayload' />
</execute>
+ <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>
<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>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index af0ee715..cbdb8be2 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -20,11 +20,24 @@
</execute>
<switch test='`$payloadJson.pnf-flag`'>
<outcome value='true'>
- <set>
- <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
- <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>
- <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
- </set>
+ <block>
+ <set>
+ <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam + $quote + ']'`"/>
+ <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
+ </set>
+ <switch test='`$payloadJson.playbook-name`'>
+ <outcome value=''>
+ <set>
+ <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
+ </set>
+ </outcome>
+ </switch>
+ </block>
</outcome>
<outcome value='Other'>
<block>
@@ -281,43 +294,26 @@
<parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
<parameter name='outputPath' value='outputPayload' />
</execute>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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>
<switch test='`$outputPayload`'>
- <outcome value=''>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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>
@@ -387,43 +383,26 @@
<parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
<parameter name='outputPath' value='outputPayload' />
</execute>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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>
<switch test='`$outputPayload`'>
- <outcome value=''>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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>