From cd9e16c51daf4af1e74a6d89ee4d240f61b5b7f2 Mon Sep 17 00:00:00 2001
From: Marco Platania <platania@research.att.com>
Date: Fri, 16 Nov 2018 15:35:11 -0500
Subject: [PATCH] Replace vnf-host-ip-address with host-ip-address

Change-Id: I0017318ae9e84c4bd603b8ae13cf026294bf6c5d
Issue-ID: INT-696
Signed-off-by: Marco Platania <platania@research.att.com>
---
 platform-logic/lcm/src/main/json/LCM_config-scale-out.json | 4 ++--
 platform-logic/lcm/src/main/json/LCM_health-check.json     | 4 ++--
 platform-logic/lcm/src/main/xml/LCM_config-scale-out.xml   | 4 ++--
 platform-logic/lcm/src/main/xml/LCM_health-check.xml       | 4 ++--
 4 files changed, 8 insertions(+), 8 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 9d37cf13..870997b1 100755
--- a/platform-logic/lcm/src/main/json/LCM_config-scale-out.json
+++ b/platform-logic/lcm/src/main/json/LCM_config-scale-out.json
@@ -302,7 +302,7 @@
         "id": "dfe17100.934dc",
         "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.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\" />",
+        "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\" />",
         "comments": "",
         "outputs": 1,
         "x": 302,
@@ -335,7 +335,7 @@
         "id": "874cba8d.9da118",
         "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.vnf-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.host-ip-address`'/>\n\t<parameter name='field2' value='`$payloadJson.configuration-parameters.ip-addr`'/>",
         "comments": "",
         "outputs": 1,
         "x": 678,
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 075da772..60e65b68 100755
--- a/platform-logic/lcm/src/main/json/LCM_health-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_health-check.json
@@ -96,7 +96,7 @@
         "id": "a0daec6.f75351",
         "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.vnf-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\" />",
+        "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,
@@ -129,7 +129,7 @@
         "id": "289cee6b.89c1d2",
         "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.vnf-host-ip-address`'/>",
+        "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,
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 6f5163fa..ce836e21 100755
--- 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.vnf-host-ip-address`'/>
+                        <parameter name='field1' value='`$payloadJson.request-parameters.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.vnf-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.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' />
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 90b1cdea..d706aac6 100755
--- a/platform-logic/lcm/src/main/xml/LCM_health-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_health-check.xml
@@ -18,12 +18,12 @@
                 <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.vnf-host-ip-address`'/>
+                        <parameter name='field1' value='`$payloadJson.request-parameters.host-ip-address`'/>
                     </record>
                 </outcome>
             </execute>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='restapiUrl' value="`'http://' + $payloadJson.request-parameters.vnf-host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.geturlpath`" />
+                <parameter name='restapiUrl' value="`'http://' + $payloadJson.request-parameters.host-ip-address + ':' + $prop.lcm.restconf.port + $prop.lcm.restconf.configscaleout.geturlpath`" />
                 <parameter name='restapiUser' value='`$prop.lcm.restconf.user`' />
                 <parameter name='restapiPassword' value='`$prop.lcm.restconf.password`' />
                 <parameter name='format' value='json' />
-- 
2.16.6