diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2018-11-20 10:13:36 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2018-11-20 17:50:18 -0500 |
| commit | 8e5df419f226842d3d5a370fd2402726858fea46 (patch) | |
| tree | 63e350179b11ff6cb2a6b95cf6cf0dcb7b6699d3 /platform-logic/lcm | |
| parent | 65d64a7776aaea9d45d8948bc92a18751ffbad65 (diff) | |
Mapped status codes
Mapped status code for failure to 201 and success to 400.
Changed vnf-host-ip-address reference to host-ip-address.
Fixed typo in sub-request-id parameter name.
Change-Id: Ie1d0f4f794afd1521637cd0407142b3f7787a140
Issue-ID: SDNC-529
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: 8ceda52ac082772abd0d8d11696c379430bb5edc
Diffstat (limited to 'platform-logic/lcm')
| -rw-r--r--[-rwxr-xr-x] | platform-logic/lcm/src/main/json/LCM_config-scale-out.json | 246 | ||||
| -rw-r--r--[-rwxr-xr-x] | platform-logic/lcm/src/main/json/LCM_health-check.json | 242 | ||||
| -rw-r--r--[-rwxr-xr-x] | platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml | 16 | ||||
| -rw-r--r--[-rwxr-xr-x] | platform-logic/lcm/src/main/xml/LCM_health-check.xml | 6 |
4 files changed, 257 insertions, 253 deletions
diff --git a/platform-logic/lcm/src/main/json/LCM_config-scale-out.json b/platform-logic/lcm/src/main/json/LCM_config-scale-out.json index 870997b1..7f2c79ec 100755..100644 --- a/platform-logic/lcm/src/main/json/LCM_config-scale-out.json +++ b/platform-logic/lcm/src/main/json/LCM_config-scale-out.json @@ -1,22 +1,22 @@ [
{
- "id": "2525c69c.46a53a",
+ "id": "64cd3a77.5ff4fc",
"type": "method",
"name": "config-scale-out",
"xml": "<method rpc='config-scale-out' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 525,
- "y": 310,
- "z": "2e6279df.227e56",
+ "x": 462.08331298828125,
+ "y": 126,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "fbc1ecc4.e47a5"
+ "c9797dda.f8e91"
]
]
},
{
- "id": "71bc22fb.570a1c",
+ "id": "6076a0b4.e26818",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,340 +24,340 @@ "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": 316.99993896484375,
- "y": 312,
- "z": "2e6279df.227e56",
+ "x": 254.083251953125,
+ "y": 128,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "2525c69c.46a53a"
+ "64cd3a77.5ff4fc"
]
]
},
{
- "id": "9aa59a9a.573488",
+ "id": "c1d0e2e8.8fc13",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 535,
- "y": 499.0000305175781,
- "z": "2e6279df.227e56",
+ "x": 472.08331298828125,
+ "y": 315.0000305175781,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "1648f778.245cc9"
+ "90dd6804.22b718"
]
]
},
{
- "id": "af21aba.b59b158",
+ "id": "842ef86d.2b27e8",
"type": "other",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 534,
- "y": 573,
- "z": "2e6279df.227e56",
+ "x": 471.08331298828125,
+ "y": 389,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "4b5b877e.ab2088"
+ "b524752e.e5271"
]
]
},
{
- "id": "def90fda.f980a",
+ "id": "56d941b5.e8a1c",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='status.code' value='`$restconf.response-code`' />\n<parameter name='status.message' value='`$restconf.response-message`' />",
"comments": "",
- "x": 833.9998779296875,
- "y": 629.0000305175781,
- "z": "2e6279df.227e56",
+ "x": 771.0831909179688,
+ "y": 445.0000305175781,
+ "z": "9b7d6405.14e86",
"wires": []
},
{
- "id": "42cca51a.60b21c",
+ "id": "f9b019e2.2db9e",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 132,
- "y": 311,
- "z": "2e6279df.227e56",
+ "x": 103.08331298828125,
+ "y": 76,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "71bc22fb.570a1c"
+ "6076a0b4.e26818"
]
]
},
{
- "id": "fbc1ecc4.e47a5",
+ "id": "c9797dda.f8e91",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 117.91668701171875,
- "y": 448.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 55,
+ "y": 264.0833435058594,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "78a05e7a.6a51e",
- "bafaa90c.54ab78",
- "4ce05c2c.5aa5b4",
- "dfe17100.934dc"
+ "5a2cc7f6.a73bb8",
+ "7b10981f.7e3d9",
+ "9361304a.65cc98",
+ "13ce8862.500be8"
]
]
},
{
- "id": "78a05e7a.6a51e",
+ "id": "5a2cc7f6.a73bb8",
"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": 302.00001525878906,
- "y": 427.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 239.0833282470703,
+ "y": 243.08334350585938,
+ "z": "9b7d6405.14e86",
"wires": [
[]
]
},
{
- "id": "2f415068.43c48",
+ "id": "fe57d8b3.23cf48",
"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='dmaap' />\n",
"comments": "",
"outputs": 1,
- "x": 864.0000610351562,
- "y": 435.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 801.0833740234375,
+ "y": 251.08334350585938,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "fdf40e79.456aa"
+ "39b04a2d.117a6e"
]
]
},
{
- "id": "fdf40e79.456aa",
+ "id": "39b04a2d.117a6e",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1046,
- "y": 434.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 983.0833129882812,
+ "y": 250.08334350585938,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "d3492d84.dee36"
+ "17e0c2c7.e91dc5"
]
]
},
{
- "id": "1648f778.245cc9",
+ "id": "90dd6804.22b718",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 673,
- "y": 500.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 610.0833129882812,
+ "y": 316.0833435058594,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "2f415068.43c48",
- "fb59df11.d6057",
- "aafbe068.0daef"
+ "fe57d8b3.23cf48",
+ "fd4f5a18.ba11e",
+ "afb2b5eb.2e313"
]
]
},
{
- "id": "c832fe63.37e5f",
+ "id": "4f0b30f1.7a364",
"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='dmaap' />\n",
"comments": "",
"outputs": 1,
- "x": 854.4998779296875,
- "y": 578.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 791.5831909179688,
+ "y": 394.0833435058594,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "5e5bf79f.1bf8b8"
+ "50f857ab.e69db"
]
]
},
{
- "id": "5e5bf79f.1bf8b8",
+ "id": "50f857ab.e69db",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1031.4998779296875,
- "y": 577.0833740234375,
- "z": "2e6279df.227e56",
+ "x": 968.5831909179688,
+ "y": 393.0833740234375,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "1e79000b.07848"
+ "18ef6b85.0f0e3c"
]
]
},
{
- "id": "d3492d84.dee36",
+ "id": "17e0c2c7.e91dc5",
"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": 1173,
- "y": 434.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 1110.0833129882812,
+ "y": 250.08334350585938,
+ "z": "9b7d6405.14e86",
"wires": [
[]
]
},
{
- "id": "fb59df11.d6057",
+ "id": "fd4f5a18.ba11e",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='status.code' value= '`$lcm-dmaap.status.code`'/>\n<parameter name='status.message' value='`$lcm-dmaap.status.message`' />\n",
"comments": "",
- "x": 844.9166870117188,
- "y": 485.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 782,
+ "y": 301.0833435058594,
+ "z": "9b7d6405.14e86",
"wires": []
},
{
- "id": "1e79000b.07848",
+ "id": "18ef6b85.0f0e3c",
"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": 1163.9166259765625,
- "y": 575.0833740234375,
- "z": "2e6279df.227e56",
+ "x": 1100.9999389648438,
+ "y": 391.0833740234375,
+ "z": "9b7d6405.14e86",
"wires": [
[]
]
},
{
- "id": "aafbe068.0daef",
+ "id": "afb2b5eb.2e313",
"type": "set",
"name": "set",
- "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$config-scale-out-input.common-header.request-id + '-' + $config-scale-out-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='config-scale-out'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$config-scale-out-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$config-scale-out-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$config-scale-out-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$config-scale-out-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$config-scaleout-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$config-scale-out-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$config-scale-out-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$config-scale-out-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='401' />\n<parameter name='lcm-dmaap.status.message' value=\"`'DG-Failure ' + $restconf.response-message + ' RestConf ResponseCode=' + $restconf.response-code`\"/>\n",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$config-scale-out-input.common-header.request-id + '-' + $config-scale-out-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='config-scale-out'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$config-scale-out-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$config-scale-out-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$config-scale-out-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$config-scale-out-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$config-scale-out-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$config-scale-out-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$config-scale-out-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$config-scale-out-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='201' />\n<parameter name='restconf.response-code' value='201' />\n<parameter name='lcm-dmaap.status.message' value=\"`'DG-Failure ' + $restconf.response-message + ' RestConf ResponseCode=' + $restconf.response-code`\"/>\n",
"comments": "",
- "x": 832.0000610351562,
- "y": 379.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 768.0833740234375,
+ "y": 195.08334350585938,
+ "z": "9b7d6405.14e86",
"wires": []
},
{
- "id": "4b5b877e.ab2088",
+ "id": "b524752e.e5271",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 683.9998779296875,
- "y": 577.0833129882812,
- "z": "2e6279df.227e56",
+ "x": 621.0831909179688,
+ "y": 393.08331298828125,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "c832fe63.37e5f",
- "654b3892.a14d08",
- "def90fda.f980a"
+ "4f0b30f1.7a364",
+ "d3bca4e4.ce0d58",
+ "56d941b5.e8a1c"
]
]
},
{
- "id": "654b3892.a14d08",
+ "id": "d3bca4e4.ce0d58",
"type": "set",
"name": "set",
- "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$config-scale-out-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='config-scale-out'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$config-scale-out-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$config-scaleout-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$config-scale-out-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$config-scale-out-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$config-scale-out-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$config-scale-out-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$config-scale-out-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$config-scale-out-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$restconf.response-code`' />\n<parameter name='lcm-dmaap.status.message' value='`$restconf.response-message`'/>\n\n",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$config-scale-out-input.common-header.request-id + '-' + $config-scale-out-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='config-scale-out'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$config-scale-out-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$config-scale-out-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$config-scale-out-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$config-scale-out-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$config-scale-out-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$config-scale-out-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$config-scale-out-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$config-scale-out-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='restconf.response-code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='`$restconf.response-message`'/>\n\n",
"comments": "",
- "x": 814.1666259765625,
- "y": 530.0833435058594,
- "z": "2e6279df.227e56",
+ "x": 751.2499389648438,
+ "y": 347.0833435058594,
+ "z": "9b7d6405.14e86",
"wires": []
},
{
- "id": "bafaa90c.54ab78",
+ "id": "7b10981f.7e3d9",
"type": "set",
"name": "set default status value",
"xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from LCM DG' />",
"comments": "",
- "x": 310,
- "y": 473,
- "z": "2e6279df.227e56",
+ "x": 247.08331298828125,
+ "y": 289,
+ "z": "9b7d6405.14e86",
"wires": []
},
{
- "id": "dfe17100.934dc",
+ "id": "13ce8862.500be8",
"type": "execute",
"name": "execute RestConfAPI",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.lcm.restconf.configscaleout.templatefile`\" />\n <parameter name='restapiUrl' value=\"`'http://' + $payloadJson.request-parameters.host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.urlpath + $payloadJson.configuration-parameters.ip-addr`\" />\n <parameter name='restapiUser' value='`$prop.lcm.restconf.configscaleout.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.restconf.configscaleout.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"restconf\" />",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.lcm.restconf.configscaleout.templatefile`\" />\n <parameter name='restapiUrl' value=\"`'http://' + $payloadJson.request-parameters.vnf-host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.urlpath + $payloadJson.configuration-parameters.ip-addr`\" />\n <parameter name='restapiUser' value='`$prop.lcm.restconf.configscaleout.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.restconf.configscaleout.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name='contentType' value='application/json' />\n <parameter name=\"responsePrefix\" value=\"restconf\" />",
"comments": "",
"outputs": 1,
- "x": 302,
- "y": 582,
- "z": "2e6279df.227e56",
+ "x": 239.08331298828125,
+ "y": 398,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "9aa59a9a.573488",
- "af21aba.b59b158"
+ "c1d0e2e8.8fc13",
+ "842ef86d.2b27e8"
]
]
},
{
- "id": "4ce05c2c.5aa5b4",
+ "id": "9361304a.65cc98",
"type": "execute",
"name": "execute jsonStringToCtx",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='config-scale-out-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
"comments": "",
"outputs": 1,
- "x": 310,
- "y": 520,
- "z": "2e6279df.227e56",
+ "x": 247.08331298828125,
+ "y": 336,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "e5f5e49e.ae0018"
+ "9fca940d.88928"
]
]
},
{
- "id": "874cba8d.9da118",
+ "id": "6dd37665.eb9c48",
"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='`$payloadJson.request-parameters.host-ip-address`'/>\n\t<parameter name='field2' value='`$payloadJson.configuration-parameters.ip-addr`'/>",
+ "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='`$payloadJson.request-parameters.vnf-host-ip-address`'/>\n\t<parameter name='field2' value='`$payloadJson.configuration-parameters.ip-addr`'/>",
"comments": "",
"outputs": 1,
- "x": 678,
- "y": 430,
- "z": "2e6279df.227e56",
+ "x": 615.0833129882812,
+ "y": 246,
+ "z": "9b7d6405.14e86",
"wires": [
[]
]
},
{
- "id": "e5f5e49e.ae0018",
+ "id": "9fca940d.88928",
"type": "other",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 536,
- "y": 429,
- "z": "2e6279df.227e56",
+ "x": 473.08331298828125,
+ "y": 245,
+ "z": "9b7d6405.14e86",
"wires": [
[
- "874cba8d.9da118"
+ "6dd37665.eb9c48"
]
]
}
diff --git a/platform-logic/lcm/src/main/json/LCM_health-check.json b/platform-logic/lcm/src/main/json/LCM_health-check.json index 60e65b68..8f0fcb80 100755..100644 --- a/platform-logic/lcm/src/main/json/LCM_health-check.json +++ b/platform-logic/lcm/src/main/json/LCM_health-check.json @@ -1,22 +1,22 @@ [
{
- "id": "2b8f6748.3fa5c8",
+ "id": "f0c1e8d0.8a6a48",
"type": "method",
"name": "health-check",
"xml": "<method rpc='health-check' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 691,
- "y": 201,
- "z": "bbb5423b.9a29f",
+ "x": 913,
+ "y": 635,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "86fd93d8.101eb"
+ "853fa235.049d4"
]
]
},
{
- "id": "785dd229.90154c",
+ "id": "de0f24db.4eaba",
"type": "service-logic",
"name": "LCM ${project.version}",
"module": "LCM",
@@ -24,341 +24,341 @@ "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": 482.99993896484375,
- "y": 203,
- "z": "bbb5423b.9a29f",
+ "x": 704.9999389648438,
+ "y": 637,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "2b8f6748.3fa5c8"
+ "f0c1e8d0.8a6a48"
]
]
},
{
- "id": "a28eb083.f3e5f",
+ "id": "2b397ec4.ccbe72",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 298,
- "y": 202,
- "z": "bbb5423b.9a29f",
+ "x": 520,
+ "y": 636,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "785dd229.90154c"
+ "de0f24db.4eaba"
]
]
},
{
- "id": "86fd93d8.101eb",
+ "id": "853fa235.049d4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 283.91668701171875,
- "y": 339.0833435058594,
- "z": "bbb5423b.9a29f",
+ "x": 505.91668701171875,
+ "y": 773.0833435058594,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "bbe42636.ef2208",
- "e6df0ad2.e107d8",
- "671ded81.c280d4",
- "a0daec6.f75351"
+ "fcf00818.6c7e18",
+ "e4025e39.9738e",
+ "f55f50f4.a68878",
+ "7e6c97ec.f376f"
]
]
},
{
- "id": "bbe42636.ef2208",
+ "id": "fcf00818.6c7e18",
"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": 468.00001525878906,
- "y": 318.0833435058594,
- "z": "bbb5423b.9a29f",
+ "x": 690.0000152587891,
+ "y": 752.0833435058594,
+ "z": "3fdf1812.0d3d18",
"wires": [
[]
]
},
{
- "id": "e6df0ad2.e107d8",
+ "id": "e4025e39.9738e",
"type": "set",
"name": "set default status value",
"xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from LCM DG' />",
"comments": "",
- "x": 476,
- "y": 364,
- "z": "bbb5423b.9a29f",
+ "x": 698,
+ "y": 798,
+ "z": "3fdf1812.0d3d18",
"wires": []
},
{
- "id": "a0daec6.f75351",
+ "id": "7e6c97ec.f376f",
"type": "execute",
"name": "execute RestConfAPI",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`'http://' + $payloadJson.request-parameters.host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.geturlpath`\" />\n <parameter name='restapiUser' value='`$prop.lcm.restconf.user`' />\n <parameter name='restapiPassword' value='`$prop.lcm.restconf.password`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"restconf\" />",
"comments": "",
"outputs": 1,
- "x": 465,
- "y": 474,
- "z": "bbb5423b.9a29f",
+ "x": 687,
+ "y": 908,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "a0cf136b.8e462",
- "239d5c1.593a9a4"
+ "9cca7aa0.5ab04",
+ "737f02f8.cc1dac"
]
]
},
{
- "id": "671ded81.c280d4",
+ "id": "f55f50f4.a68878",
"type": "execute",
"name": "execute jsonStringToCtx",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='health-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
"comments": "",
"outputs": 1,
- "x": 476,
- "y": 411,
- "z": "bbb5423b.9a29f",
+ "x": 698,
+ "y": 845,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "8008fd81.155e7"
+ "5694ee6.d3a3a9"
]
]
},
{
- "id": "289cee6b.89c1d2",
+ "id": "c747475e.b6484",
"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='`$payloadJson.request-parameters.host-ip-address`'/>",
"comments": "",
"outputs": 1,
- "x": 845,
- "y": 299,
- "z": "bbb5423b.9a29f",
+ "x": 1067,
+ "y": 733,
+ "z": "3fdf1812.0d3d18",
"wires": [
[]
]
},
{
- "id": "8008fd81.155e7",
+ "id": "5694ee6.d3a3a9",
"type": "other",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 702,
- "y": 302,
- "z": "bbb5423b.9a29f",
+ "x": 924,
+ "y": 736,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "289cee6b.89c1d2"
+ "c747475e.b6484"
]
]
},
{
- "id": "a0cf136b.8e462",
+ "id": "9cca7aa0.5ab04",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 722,
- "y": 379,
- "z": "bbb5423b.9a29f",
+ "x": 944,
+ "y": 813,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "d1efbb12.8f20b8"
+ "eb242a2e.1024e8"
]
]
},
{
- "id": "239d5c1.593a9a4",
+ "id": "737f02f8.cc1dac",
"type": "other",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 724,
- "y": 503.9999694824219,
- "z": "bbb5423b.9a29f",
+ "x": 946,
+ "y": 937.9999694824219,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "d97877e8.182738"
+ "fa7eab9b.3596f"
]
]
},
{
- "id": "8d0805b4.65dad8",
+ "id": "e4477bc4.663c68",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='status.code' value='`$restconf.response-code`' />\n<parameter name='status.message' value='`$restconf.response-message`' />",
"comments": "",
- "x": 1022.9998779296875,
- "y": 555,
- "z": "bbb5423b.9a29f",
+ "x": 1244.9998779296875,
+ "y": 989,
+ "z": "3fdf1812.0d3d18",
"wires": []
},
{
- "id": "e12b38ab.e68b38",
+ "id": "619a4b64.2ce6e4",
"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='dmaap' />\n",
"comments": "",
"outputs": 1,
- "x": 1061.0000610351562,
- "y": 363.08331298828125,
- "z": "bbb5423b.9a29f",
+ "x": 1283.0000610351562,
+ "y": 797.0833129882812,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "46030217.bb5c0c"
+ "9b219722.0d4788"
]
]
},
{
- "id": "46030217.bb5c0c",
+ "id": "9b219722.0d4788",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1236,
- "y": 364.08331298828125,
- "z": "bbb5423b.9a29f",
+ "x": 1458,
+ "y": 798.0833129882812,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "c10a4371.c7e1"
+ "f68eadc0.88287"
]
]
},
{
- "id": "d1efbb12.8f20b8",
+ "id": "eb242a2e.1024e8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 848,
- "y": 376.08331298828125,
- "z": "bbb5423b.9a29f",
+ "x": 1070,
+ "y": 810.0833129882812,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "e12b38ab.e68b38",
- "55604be3.6c4c94",
- "48cd4e57.0a075"
+ "619a4b64.2ce6e4",
+ "5be2a804.097e1",
+ "adb2d40.456a0b"
]
]
},
{
- "id": "2473531d.cd328c",
+ "id": "4fca28d.56025d8",
"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='dmaap' />\n",
"comments": "",
"outputs": 1,
- "x": 1043.4998779296875,
- "y": 504.08331298828125,
- "z": "bbb5423b.9a29f",
+ "x": 1265.4998779296875,
+ "y": 938.0833129882812,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "5e7f5a6e.1235f4"
+ "2fb1a71e.cc06b8"
]
]
},
{
- "id": "5e7f5a6e.1235f4",
+ "id": "2fb1a71e.cc06b8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1220.4998779296875,
- "y": 503.0833435058594,
- "z": "bbb5423b.9a29f",
+ "x": 1442.4998779296875,
+ "y": 937.0833435058594,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "395b2b90.bcb3e4"
+ "c22deb3c.13b9c"
]
]
},
{
- "id": "c10a4371.c7e1",
+ "id": "f68eadc0.88287",
"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": 1362,
- "y": 360.08331298828125,
- "z": "bbb5423b.9a29f",
+ "x": 1584,
+ "y": 794.0833129882812,
+ "z": "3fdf1812.0d3d18",
"wires": [
[]
]
},
{
- "id": "55604be3.6c4c94",
+ "id": "5be2a804.097e1",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='status.code' value= '`$lcm-dmaap.status.code`'/>\n<parameter name='status.message' value='`$lcm-dmaap.status.message`' />\n",
"comments": "",
- "x": 1033.9166870117188,
- "y": 411.08331298828125,
- "z": "bbb5423b.9a29f",
+ "x": 1255.9166870117188,
+ "y": 845.0833129882812,
+ "z": "3fdf1812.0d3d18",
"wires": []
},
{
- "id": "395b2b90.bcb3e4",
+ "id": "c22deb3c.13b9c",
"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": 1352.9166259765625,
- "y": 501.0833435058594,
- "z": "bbb5423b.9a29f",
+ "x": 1574.9166259765625,
+ "y": 935.0833435058594,
+ "z": "3fdf1812.0d3d18",
"wires": [
[]
]
},
{
- "id": "d97877e8.182738",
+ "id": "fa7eab9b.3596f",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 862.9998779296875,
- "y": 501.0832824707031,
- "z": "bbb5423b.9a29f",
+ "x": 1084.9998779296875,
+ "y": 935.0832824707031,
+ "z": "3fdf1812.0d3d18",
"wires": [
[
- "2473531d.cd328c",
- "fc35ebb1.2e7db8",
- "8d0805b4.65dad8"
+ "4fca28d.56025d8",
+ "c6b2bcb4.1fa5d8",
+ "e4477bc4.663c68"
]
]
},
{
- "id": "fc35ebb1.2e7db8",
+ "id": "c6b2bcb4.1fa5d8",
"type": "set",
"name": "set",
- "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$health-check-input.common-header.request-id + '-' + $health-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='health-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$health-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$health-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$health-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$health-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$health-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$health-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$health-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$health-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$restconf.response-code`' />\n<parameter name='lcm-dmaap.status.message' value='`$restconf.response-message`'/>\n\n",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$health-check-input.common-header.request-id + '-' + $health-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='health-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$health-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$health-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$health-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$health-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$health-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$health-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$health-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$health-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='400' />\n<parameter name='restconf.response-code' value='400' />\n<parameter name='lcm-dmaap.status.message' value='`$restconf.response-message`'/>\n\n",
"comments": "",
- "x": 1003.1666259765625,
- "y": 456.08331298828125,
- "z": "bbb5423b.9a29f",
+ "x": 1225.1666259765625,
+ "y": 890.0833129882812,
+ "z": "3fdf1812.0d3d18",
"wires": []
},
{
- "id": "48cd4e57.0a075",
+ "id": "adb2d40.456a0b",
"type": "set",
"name": "set",
- "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$health-check-input.common-header.request-id + '-' + $health-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='health-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$health-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$health-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$health-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$health-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$health-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$health-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$health-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$health-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='401' />\n<parameter name='lcm-dmaap.status.message' value=\"`'DG-Failure ' + $restconf.response-message + ' RestConf ResponseCode=' + $restconf.response-code`\"/>\n",
+ "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$health-check-input.common-header.request-id + '-' + $health-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='health-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$health-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$health-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$health-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$health-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$health-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$health-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$health-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$health-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='201' />\n<parameter name='restconf.response-code' value='201' />\n<parameter name='lcm-dmaap.status.message' value=\"`'DG-Failure ' + $restconf.response-message + ' RestConf ResponseCode=' + $restconf.response-code`\"/>\n",
"comments": "",
- "x": 1019,
- "y": 306,
- "z": "bbb5423b.9a29f",
+ "x": 1241,
+ "y": 740,
+ "z": "3fdf1812.0d3d18",
"wires": []
}
]
\ No newline at end of file diff --git a/platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml b/platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml index ce836e21..344b9ecb 100755..100644 --- a/platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml +++ b/platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml @@ -18,14 +18,14 @@ <outcome value='success'>
<record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>
<parameter name='logger' value='message-log'/>
- <parameter name='field1' value='`$payloadJson.request-parameters.host-ip-address`'/>
+ <parameter name='field1' value='`$payloadJson.request-parameters.vnf-host-ip-address`'/>
<parameter name='field2' value='`$payloadJson.configuration-parameters.ip-addr`'/>
</record>
</outcome>
</execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.lcm.restconf.configscaleout.templatefile`" />
- <parameter name='restapiUrl' value="`'http://' + $payloadJson.request-parameters.host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.urlpath + $payloadJson.configuration-parameters.ip-addr`" />
+ <parameter name='restapiUrl' value="`'http://' + $payloadJson.request-parameters.vnf-host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.urlpath + $payloadJson.configuration-parameters.ip-addr`" />
<parameter name='restapiUser' value='`$prop.lcm.restconf.configscaleout.user`' />
<parameter name='restapiPassword' value='`$prop.lcm.restconf.configscaleout.password`' />
<parameter name='format' value='json' />
@@ -44,11 +44,12 @@ <parameter name='lcm-dmaap.api-ver' value='`$config-scale-out-input.common-header.api-ver`'/>
<parameter name='lcm-dmaap.originator-id' value='`$config-scale-out-input.common-header.originator-id`'/>
<parameter name='lcm-dmaap.request-id' value='`$config-scale-out-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$config-scaleout-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$config-scale-out-input.common-header.sub-request-id`'/>
<parameter name='lcm-dmaap.flags.mode' value='`$config-scale-out-input.common-header.flags.mode`'/>
<parameter name='lcm-dmaap.flags.force' value='`$config-scale-out-input.common-header.flags.force`'/>
<parameter name='lcm-dmaap.flags.ttl' value='`$config-scale-out-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='401' />
+ <parameter name='lcm-dmaap.status.code' value='201' />
+ <parameter name='restconf.response-code' value='201' />
<parameter name='lcm-dmaap.status.message' value="`'DG-Failure ' + $restconf.response-message + ' RestConf ResponseCode=' + $restconf.response-code`"/>
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
@@ -77,19 +78,20 @@ <block>
<set>
<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$config-scale-out-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$config-scale-out-input.common-header.request-id + '-' + $config-scale-out-input.common-header.sub-request-id`"/>
<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
<parameter name='lcm-dmaap.rpc-name' value='config-scale-out'/>
<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
<parameter name='lcm-dmaap.timestamp' value='`$config-scale-out-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$config-scaleout-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$config-scale-out-input.common-header.api-ver`'/>
<parameter name='lcm-dmaap.originator-id' value='`$config-scale-out-input.common-header.originator-id`'/>
<parameter name='lcm-dmaap.request-id' value='`$config-scale-out-input.common-header.request-id`'/>
<parameter name='lcm-dmaap.sub-request-id' value='`$config-scale-out-input.common-header.sub-request-id`'/>
<parameter name='lcm-dmaap.flags.mode' value='`$config-scale-out-input.common-header.flags.mode`'/>
<parameter name='lcm-dmaap.flags.force' value='`$config-scale-out-input.common-header.flags.force`'/>
<parameter name='lcm-dmaap.flags.ttl' value='`$config-scale-out-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$restconf.response-code`' />
+ <parameter name='lcm-dmaap.status.code' value='400' />
+ <parameter name='restconf.response-code' value='400' />
<parameter name='lcm-dmaap.status.message' value='`$restconf.response-message`'/>
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
diff --git a/platform-logic/lcm/src/main/xml/LCM_health-check.xml b/platform-logic/lcm/src/main/xml/LCM_health-check.xml index d706aac6..a35bd193 100755..100644 --- a/platform-logic/lcm/src/main/xml/LCM_health-check.xml +++ b/platform-logic/lcm/src/main/xml/LCM_health-check.xml @@ -45,7 +45,8 @@ <parameter name='lcm-dmaap.flags.mode' value='`$health-check-input.common-header.flags.mode`'/>
<parameter name='lcm-dmaap.flags.force' value='`$health-check-input.common-header.flags.force`'/>
<parameter name='lcm-dmaap.flags.ttl' value='`$health-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='401' />
+ <parameter name='lcm-dmaap.status.code' value='201' />
+ <parameter name='restconf.response-code' value='201' />
<parameter name='lcm-dmaap.status.message' value="`'DG-Failure ' + $restconf.response-message + ' RestConf ResponseCode=' + $restconf.response-code`"/>
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
@@ -86,7 +87,8 @@ <parameter name='lcm-dmaap.flags.mode' value='`$health-check-input.common-header.flags.mode`'/>
<parameter name='lcm-dmaap.flags.force' value='`$health-check-input.common-header.flags.force`'/>
<parameter name='lcm-dmaap.flags.ttl' value='`$health-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$restconf.response-code`' />
+ <parameter name='lcm-dmaap.status.code' value='400' />
+ <parameter name='restconf.response-code' value='400' />
<parameter name='lcm-dmaap.status.message' value='`$restconf.response-message`'/>
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
|