Code Review / sdnc / oam.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: e4bdeff)
Mapped status codes
authorTimoney, Dan (dt5972) <dtimoney@att.com>
Tue, 20 Nov 2018 15:13:36 +0000 (10:13 -0500)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Tue, 20 Nov 2018 22:50:18 +0000 (17:50 -0500)
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>
platform-logic/lcm/src/main/json/LCM_config-scale-out.json [changed mode: 0755->0644] patch | blob | history
platform-logic/lcm/src/main/json/LCM_health-check.json [changed mode: 0755->0644] patch | blob | history
platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml [changed mode: 0755->0644] patch | blob | history
platform-logic/lcm/src/main/xml/LCM_health-check.xml [changed mode: 0755->0644] patch | blob | history

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