Fix XML version of LCM DGs

Wrong XML files submitted in last change.

Change-Id: I2524833eb129fb5d5444907e2102b0eab6dbce51
Issue-ID: SDNC-313
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Former-commit-id: 11e7945edd4f9e8807cc25cc30004d5e48568690

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index 92016c8..91c63c9 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
@@ -4,19 +4,31 @@
        module='LCM' version='${project.version}'>\r
        <method rpc='upgrade-post-check' mode='sync'>\r
                <block>\r
-                       <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'\r
+                       <execute\r
+                               plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'\r
                                method='readProperties'>\r
-                               <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\r
+                               <parameter name='fileName'\r
+                                       value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\r
                                <parameter name='contextPrefix' value='prop' />\r
                        </execute>\r
-                       <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
+                       <set>\r
+                               <parameter name='status.code' value='200' />\r
+                               <parameter name='status.message'\r
+                                       value='unexpected return from DG' />\r
+                       </set>\r
+                       <execute\r
+                               plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
                                method='reqExec'>\r
-                               <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
+                               <parameter name='AgentUrl'\r
+                                       value='`$prop.ansible.agenturl`' />\r
                                <parameter name='User' value='`$prop.ansible.user`' />\r
                                <parameter name='Password' value='`prop.ansible.password`' />\r
-                               <parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`' />\r
-                               <parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`' />\r
-                               <parameter name='NodeList' value='`$prop.ansible.nodelist`' />\r
+                               <parameter name='LocalParameters'\r
+                                       value='`$prop.ansible.lcm.localparameters`' />\r
+                               <parameter name='EnvParameters'\r
+                                       value='`$upgrade-post-check-input.payload`' />\r
+                               <parameter name='NodeList'\r
+                                       value='`$prop.ansible.nodelist`' />\r
                                <parameter name='Timeout' value='`$prop.ansible.timeout`' />\r
                                <parameter name='Version' value='`$prop.ansible.version`' />\r
                                <parameter name='Id'\r
@@ -26,19 +38,23 @@
                                <outcome value='not-found'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'\r
-                                                               value='200' />\r
-                                                       <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'\r
+                                                       <parameter\r
+                                                               name='$org.onap.appc.adapter.ansible.result.code' value='401' />\r
+                                                       <parameter name='org.onap.appc.adapter.ansible.message'\r
                                                                value='Ansible Adapter was not found' />\r
                                                </set>\r
                                                <block>\r
                                                        <set>\r
-                                                               <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                               <parameter name='lcm-dmaap.version'\r
+                                                                       value='`$prop.lcm.dmaap.version`' />\r
                                                                <parameter name='lcm-dmaap.correlation-id'\r
                                                                        value='`$upgrade-post-check-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='upgrade-post-check' />\r
-                                                               <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                               <parameter name='lcm-dmaap.partition'\r
+                                                                       value='`$prop.lcm.dmaap.partition`' />\r
+                                                               <parameter name='lcm-dmaap.rpc-name'\r
+                                                                       value='upgrade-post-check' />\r
+                                                               <parameter name='lcm-dmaap.type'\r
+                                                                       value='`$prop.lcm.dmaap.type`' />\r
                                                                <parameter name='lcm-dmaap.timestamp'\r
                                                                        value='`$upgrade-post-check-input.common-header.timestamp`' />\r
                                                                <parameter name='lcm-dmaap.api-ver'\r
@@ -58,32 +74,38 @@
                                                                <parameter name='lcm-dmaap.payload'\r
                                                                        value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                <parameter name='lcm-dmaap.status.code'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                <parameter name='lcm-dmaap.status.message'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                        </set>\r
-                                                       <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
+                                                       <execute\r
+                                                               plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                method='sendRequest'>\r
                                                                <parameter name='templateFileName'\r
                                                                        value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                               <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                               <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                               <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                               <parameter name='restapiUrl'\r
+                                                                       value='`$prop.lcm.dmaap.url`' />\r
+                                                               <parameter name='restapiUser'\r
+                                                                       value='`$prop.lcm.dmaap.user`' />\r
+                                                               <parameter name='restapiPassword'\r
+                                                                       value='`$prop.lcm.dmaap.password`' />\r
                                                                <parameter name='format' value='json' />\r
                                                                <parameter name='httpMethod' value='POST' />\r
                                                                <parameter name='contentType' value='application/json' />\r
                                                                <parameter name="responsePrefix" value="lcm" />\r
                                                                <outcome value='failure'>\r
-                                                                       <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                       <record\r
+                                                                               plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                <parameter name="logger" value="message-log" />\r
-                                                                               <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                               <parameter name="field1"\r
+                                                                                       value='Failed to Publish to DMaap' />\r
                                                                        </record>\r
                                                                </outcome>\r
                                                        </execute>\r
                                                        <return status='failure'>\r
-                                                               <parameter name='error-code' value='200' />\r
-                                                               <parameter name='error-message'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                               <parameter name='status.code' value='401' />\r
+                                                               <parameter name='status.message'\r
+                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                        </return>\r
                                                </block>\r
                                        </block>\r
@@ -91,12 +113,16 @@
                                <outcome value='failure'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                       <parameter name='lcm-dmaap.version'\r
+                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                value='`$upgrade-post-check-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='upgrade-post-check' />\r
-                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                       <parameter name='lcm-dmaap.partition'\r
+                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                               value='upgrade-post-check' />\r
+                                                       <parameter name='lcm-dmaap.type'\r
+                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                value='`$upgrade-post-check-input.common-header.timestamp`' />\r
                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -116,46 +142,56 @@
                                                        <parameter name='lcm-dmaap.payload'\r
                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                </set>\r
-                                               <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
+                                               <execute\r
+                                                       plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                        method='sendRequest'>\r
                                                        <parameter name='templateFileName'\r
                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                       <parameter name='restapiUrl'\r
+                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                       <parameter name='restapiUser'\r
+                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                       <parameter name='restapiPassword'\r
+                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                        <parameter name='format' value='json' />\r
                                                        <parameter name='httpMethod' value='POST' />\r
                                                        <parameter name='contentType' value='application/json' />\r
                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                        <outcome value='failure'>\r
-                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                               <record\r
+                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                        <parameter name="logger" value="message-log" />\r
-                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                       <parameter name="field1"\r
+                                                                               value='Failed to Publish to DMaap' />\r
                                                                </record>\r
                                                        </outcome>\r
                                                </execute>\r
                                                <return status='failure'>\r
-                                                       <parameter name='error-code' value='200' />\r
-                                                       <parameter name='error-message'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                       <parameter name='status.code' value='401' />\r
+                                                       <parameter name='status.message'\r
+                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                </return>\r
                                        </block>\r
                                </outcome>\r
                                <outcome value='Other'>\r
-                                       <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">\r
+                                       <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
                                                <outcome value='101'>\r
                                                        <block>\r
                                                                <set>\r
-                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                value='`$upgrade-post-check-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='upgrade-post-check' />\r
-                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                               value='upgrade-post-check' />\r
+                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                value='`$upgrade-post-check-input.common-header.timestamp`' />\r
                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -175,45 +211,55 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                        method='sendRequest'>\r
                                                                        <parameter name='templateFileName'\r
                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                       <parameter name='restapiUrl'\r
+                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                       <parameter name='restapiUser'\r
+                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                       <parameter name='restapiPassword'\r
+                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                        <parameter name='format' value='json' />\r
                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                       <parameter name='contentType'\r
+                                                                               value='application/json' />\r
                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                        <outcome value='failure'>\r
-                                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                               <record\r
+                                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                       <parameter name="field1"\r
+                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                </record>\r
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='error-code' value='200' />\r
-                                                                       <parameter name='error-message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       <parameter name='status.code' value='401' />\r
+                                                                       <parameter name='status.message'\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
                                                <outcome value='500'>\r
                                                        <block>\r
                                                                <set>\r
-                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                value='`$upgrade-post-check-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='upgrade-post-check' />\r
-                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                               value='upgrade-post-check' />\r
+                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                value='`$upgrade-post-check-input.common-header.timestamp`' />\r
                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -233,44 +279,53 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                        method='sendRequest'>\r
                                                                        <parameter name='templateFileName'\r
                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                       <parameter name='restapiUrl'\r
+                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                       <parameter name='restapiUser'\r
+                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                       <parameter name='restapiPassword'\r
+                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                        <parameter name='format' value='json' />\r
                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                       <parameter name='contentType'\r
+                                                                               value='application/json' />\r
                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                        <outcome value='failure'>\r
-                                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                               <record\r
+                                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                       <parameter name="field1"\r
+                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                </record>\r
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='error-code' value='200' />\r
-                                                                       <parameter name='error-message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       <parameter name='status.code' value='401' />\r
+                                                                       <parameter name='status.message'\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
                                                <outcome value='100'>\r
-                                                       <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
+                                                       <execute\r
+                                                               plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
                                                                method='reqExecResult'>\r
-                                                               <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
+                                                               <parameter name='AgentUrl'\r
+                                                                       value='`$prop.ansible.agenturl`' />\r
                                                                <parameter name='User' value='`$prop.ansible.user`' />\r
-                                                               <parameter name='Password' value='`$prop.ansible.password`' />\r
+                                                               <parameter name='Password'\r
+                                                                       value='`$prop.ansible.password`' />\r
                                                                <parameter name='Id'\r
-                                                                       value='`$upgrade-post-check-input.common-header.request-id`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.Id`' />\r
                                                                <parameter name='PlaybookName'\r
                                                                        value='`$prop.lcm.upgrade-post-check.playbookname`' />\r
 \r
@@ -281,12 +336,16 @@
                                                                <outcome value='failure'>\r
                                                                        <block>\r
                                                                                <set>\r
-                                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                                value='`$upgrade-post-check-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='upgrade-post-check' />\r
-                                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                                               value='upgrade-post-check' />\r
+                                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                                value='`$upgrade-post-check-input.common-header.timestamp`' />\r
                                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -306,46 +365,55 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                                        method='sendRequest'>\r
                                                                                        <parameter name='templateFileName'\r
                                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                                       <parameter name='restapiUrl'\r
+                                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                                       <parameter name='restapiUser'\r
+                                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                                       <parameter name='restapiPassword'\r
+                                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                                        <parameter name='format' value='json' />\r
                                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                                       <parameter name='contentType'\r
+                                                                                               value='application/json' />\r
                                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                                        <outcome value='failure'>\r
                                                                                                <record\r
                                                                                                        plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                                       <parameter name="field1"\r
+                                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                                </record>\r
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='failure'>\r
-                                                                                       <parameter name='error-code' value='200' />\r
-                                                                                       <parameter name='error-message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                       <parameter name='status.code' value='401' />\r
+                                                                                       <parameter name='status.message'\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r
                                                                <outcome value='success'>\r
                                                                        <block>\r
                                                                                <set>\r
-                                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                                value='`$upgrade-post-check-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='upgrade-post-check' />\r
-                                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                                               value='upgrade-post-check' />\r
+                                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                                value='`$upgrade-post-check-input.common-header.timestamp`' />\r
                                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -365,35 +433,40 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                                        method='sendRequest'>\r
                                                                                        <parameter name='templateFileName'\r
                                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                                       <parameter name='restapiUrl'\r
+                                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                                       <parameter name='restapiUser'\r
+                                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                                       <parameter name='restapiPassword'\r
+                                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                                        <parameter name='format' value='json' />\r
                                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                                       <parameter name='contentType'\r
+                                                                                               value='application/json' />\r
                                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                                        <outcome value='failure'>\r
                                                                                                <record\r
                                                                                                        plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                                       <parameter name="field1"\r
+                                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                                </record>\r
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='success'>\r
                                                                                        <parameter name='status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
index 13ff4a6..ee3bbc9 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
@@ -4,19 +4,31 @@
        module='LCM' version='${project.version}'>\r
        <method rpc='upgrade-pre-check' mode='sync'>\r
                <block>\r
-                       <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'\r
+                       <execute\r
+                               plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'\r
                                method='readProperties'>\r
-                               <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\r
+                               <parameter name='fileName'\r
+                                       value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\r
                                <parameter name='contextPrefix' value='prop' />\r
                        </execute>\r
-                       <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
+                       <set>\r
+                               <parameter name='status.code' value='200' />\r
+                               <parameter name='status.message'\r
+                                       value='unexpected return from DG' />\r
+                       </set>\r
+                       <execute\r
+                               plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
                                method='reqExec'>\r
-                               <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
+                               <parameter name='AgentUrl'\r
+                                       value='`$prop.ansible.agenturl`' />\r
                                <parameter name='User' value='`$prop.ansible.user`' />\r
                                <parameter name='Password' value='`prop.ansible.password`' />\r
-                               <parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`' />\r
-                               <parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`' />\r
-                               <parameter name='NodeList' value='`$prop.ansible.nodelist`' />\r
+                               <parameter name='LocalParameters'\r
+                                       value='`$prop.ansible.lcm.localparameters`' />\r
+                               <parameter name='EnvParameters'\r
+                                       value='`$upgrade-pre-check-input.payload`' />\r
+                               <parameter name='NodeList'\r
+                                       value='`$prop.ansible.nodelist`' />\r
                                <parameter name='Timeout' value='`$prop.ansible.timeout`' />\r
                                <parameter name='Version' value='`$prop.ansible.version`' />\r
                                <parameter name='Id'\r
@@ -26,19 +38,23 @@
                                <outcome value='not-found'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'\r
-                                                               value='200' />\r
-                                                       <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'\r
+                                                       <parameter\r
+                                                               name='org.onap.appc.adapter.ansible.result.code' value='401' />\r
+                                                       <parameter name='org.onap.appc.adapter.ansible.message'\r
                                                                value='Ansible Adapter was not found' />\r
                                                </set>\r
                                                <block>\r
                                                        <set>\r
-                                                               <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                               <parameter name='lcm-dmaap.version'\r
+                                                                       value='`$prop.lcm.dmaap.version`' />\r
                                                                <parameter name='lcm-dmaap.correlation-id'\r
                                                                        value='`$upgrade-pre-check-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='upgrade-pre-check' />\r
-                                                               <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                               <parameter name='lcm-dmaap.partition'\r
+                                                                       value='`$prop.lcm.dmaap.partition`' />\r
+                                                               <parameter name='lcm-dmaap.rpc-name'\r
+                                                                       value='upgrade-pre-check' />\r
+                                                               <parameter name='lcm-dmaap.type'\r
+                                                                       value='`$prop.lcm.dmaap.type`' />\r
                                                                <parameter name='lcm-dmaap.timestamp'\r
                                                                        value='`$upgrade-pre-check-input.common-header.timestamp`' />\r
                                                                <parameter name='lcm-dmaap.api-ver'\r
@@ -58,32 +74,38 @@
                                                                <parameter name='lcm-dmaap.payload'\r
                                                                        value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                <parameter name='lcm-dmaap.status.code'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                <parameter name='lcm-dmaap.status.message'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                        </set>\r
-                                                       <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
+                                                       <execute\r
+                                                               plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                method='sendRequest'>\r
                                                                <parameter name='templateFileName'\r
                                                                        value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                               <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                               <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                               <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                               <parameter name='restapiUrl'\r
+                                                                       value='`$prop.lcm.dmaap.url`' />\r
+                                                               <parameter name='restapiUser'\r
+                                                                       value='`$prop.lcm.dmaap.user`' />\r
+                                                               <parameter name='restapiPassword'\r
+                                                                       value='`$prop.lcm.dmaap.password`' />\r
                                                                <parameter name='format' value='json' />\r
                                                                <parameter name='httpMethod' value='POST' />\r
                                                                <parameter name='contentType' value='application/json' />\r
                                                                <parameter name="responsePrefix" value="lcm" />\r
                                                                <outcome value='failure'>\r
-                                                                       <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                       <record\r
+                                                                               plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                <parameter name="logger" value="message-log" />\r
-                                                                               <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                               <parameter name="field1"\r
+                                                                                       value='Failed to Publish to DMaap' />\r
                                                                        </record>\r
                                                                </outcome>\r
                                                        </execute>\r
                                                        <return status='failure'>\r
-                                                               <parameter name='error-code' value='200' />\r
-                                                               <parameter name='error-message'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                               <parameter name='status.code' value='401' />\r
+                                                               <parameter name='status.message'\r
+                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                        </return>\r
                                                </block>\r
                                        </block>\r
@@ -91,12 +113,16 @@
                                <outcome value='failure'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                       <parameter name='lcm-dmaap.version'\r
+                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                value='`$upgrade-pre-check-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='upgrade-pre-check' />\r
-                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                       <parameter name='lcm-dmaap.partition'\r
+                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                               value='upgrade-pre-check' />\r
+                                                       <parameter name='lcm-dmaap.type'\r
+                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                value='`$upgrade-pre-check-input.common-header.timestamp`' />\r
                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -116,46 +142,56 @@
                                                        <parameter name='lcm-dmaap.payload'\r
                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                </set>\r
-                                               <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
+                                               <execute\r
+                                                       plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                        method='sendRequest'>\r
                                                        <parameter name='templateFileName'\r
                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                       <parameter name='restapiUrl'\r
+                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                       <parameter name='restapiUser'\r
+                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                       <parameter name='restapiPassword'\r
+                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                        <parameter name='format' value='json' />\r
                                                        <parameter name='httpMethod' value='POST' />\r
                                                        <parameter name='contentType' value='application/json' />\r
                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                        <outcome value='failure'>\r
-                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                               <record\r
+                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                        <parameter name="logger" value="message-log" />\r
-                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                       <parameter name="field1"\r
+                                                                               value='Failed to Publish to DMaap' />\r
                                                                </record>\r
                                                        </outcome>\r
                                                </execute>\r
                                                <return status='failure'>\r
-                                                       <parameter name='error-code' value='200' />\r
-                                                       <parameter name='error-message'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                       <parameter name='status.code' value='401' />\r
+                                                       <parameter name='status.message'\r
+                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                </return>\r
                                        </block>\r
                                </outcome>\r
                                <outcome value='Other'>\r
-                                       <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">\r
+                                       <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
                                                <outcome value='101'>\r
                                                        <block>\r
                                                                <set>\r
-                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                value='`$upgrade-pre-check-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='upgrade-pre-check' />\r
-                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                               value='upgrade-pre-check' />\r
+                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                value='`$upgrade-pre-check-input.common-header.timestamp`' />\r
                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -175,45 +211,55 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                        method='sendRequest'>\r
                                                                        <parameter name='templateFileName'\r
                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                       <parameter name='restapiUrl'\r
+                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                       <parameter name='restapiUser'\r
+                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                       <parameter name='restapiPassword'\r
+                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                        <parameter name='format' value='json' />\r
                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                       <parameter name='contentType'\r
+                                                                               value='application/json' />\r
                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                        <outcome value='failure'>\r
-                                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                               <record\r
+                                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                       <parameter name="field1"\r
+                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                </record>\r
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='error-code' value='200' />\r
-                                                                       <parameter name='error-message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       <parameter name='status.code' value='401' />\r
+                                                                       <parameter name='status.message'\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
                                                <outcome value='500'>\r
                                                        <block>\r
                                                                <set>\r
-                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                value='`$upgrade-pre-check-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='upgrade-pre-check' />\r
-                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                               value='upgrade-pre-check' />\r
+                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                value='`$upgrade-pre-check-input.common-header.timestamp`' />\r
                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -233,44 +279,53 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                        method='sendRequest'>\r
                                                                        <parameter name='templateFileName'\r
                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                       <parameter name='restapiUrl'\r
+                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                       <parameter name='restapiUser'\r
+                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                       <parameter name='restapiPassword'\r
+                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                        <parameter name='format' value='json' />\r
                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                       <parameter name='contentType'\r
+                                                                               value='application/json' />\r
                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                        <outcome value='failure'>\r
-                                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                               <record\r
+                                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                       <parameter name="field1"\r
+                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                </record>\r
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='error-code' value='200' />\r
-                                                                       <parameter name='error-message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       <parameter name='status.code' value='401' />\r
+                                                                       <parameter name='status.message'\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
                                                <outcome value='100'>\r
-                                                       <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
+                                                       <execute\r
+                                                               plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
                                                                method='reqExecResult'>\r
-                                                               <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
+                                                               <parameter name='AgentUrl'\r
+                                                                       value='`$prop.ansible.agenturl`' />\r
                                                                <parameter name='User' value='`$prop.ansible.user`' />\r
-                                                               <parameter name='Password' value='`$prop.ansible.password`' />\r
+                                                               <parameter name='Password'\r
+                                                                       value='`$prop.ansible.password`' />\r
                                                                <parameter name='Id'\r
-                                                                       value='`$upgrade-pre-check-input.common-header.request-id`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.Id`' />\r
                                                                <parameter name='PlaybookName'\r
                                                                        value='`$prop.lcm.upgrade-pre-check.playbookname`' />\r
 \r
@@ -281,12 +336,16 @@
                                                                <outcome value='failure'>\r
                                                                        <block>\r
                                                                                <set>\r
-                                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                                value='`$upgrade-pre-check-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='upgrade-pre-check' />\r
-                                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                                               value='upgrade-pre-check' />\r
+                                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                                value='`$upgrade-pre-check-input.common-header.timestamp`' />\r
                                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -306,46 +365,55 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                                        method='sendRequest'>\r
                                                                                        <parameter name='templateFileName'\r
                                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                                       <parameter name='restapiUrl'\r
+                                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                                       <parameter name='restapiUser'\r
+                                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                                       <parameter name='restapiPassword'\r
+                                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                                        <parameter name='format' value='json' />\r
                                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                                       <parameter name='contentType'\r
+                                                                                               value='application/json' />\r
                                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                                        <outcome value='failure'>\r
                                                                                                <record\r
                                                                                                        plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                                       <parameter name="field1"\r
+                                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                                </record>\r
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='failure'>\r
-                                                                                       <parameter name='error-code' value='200' />\r
-                                                                                       <parameter name='error-message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                       <parameter name='status.code' value='401' />\r
+                                                                                       <parameter name='status.message'\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r
                                                                <outcome value='success'>\r
                                                                        <block>\r
                                                                                <set>\r
-                                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                                value='`$upgrade-pre-check-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='upgrade-pre-check' />\r
-                                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                                               value='upgrade-pre-check' />\r
+                                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                                value='`$upgrade-pre-check-input.common-header.timestamp`' />\r
                                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -365,35 +433,40 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                                        method='sendRequest'>\r
                                                                                        <parameter name='templateFileName'\r
                                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                                       <parameter name='restapiUrl'\r
+                                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                                       <parameter name='restapiUser'\r
+                                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                                       <parameter name='restapiPassword'\r
+                                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                                        <parameter name='format' value='json' />\r
                                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                                       <parameter name='contentType'\r
+                                                                                               value='application/json' />\r
                                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                                        <outcome value='failure'>\r
                                                                                                <record\r
                                                                                                        plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                                       <parameter name="field1"\r
+                                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                                </record>\r
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='success'>\r
                                                                                        <parameter name='status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index 07fcc82..71ed77f 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -4,19 +4,31 @@
        module='LCM' version='${project.version}'>\r
        <method rpc='upgrade-software' mode='sync'>\r
                <block>\r
-                       <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'\r
+                       <execute\r
+                               plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode'\r
                                method='readProperties'>\r
-                               <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\r
+                               <parameter name='fileName'\r
+                                       value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\r
                                <parameter name='contextPrefix' value='prop' />\r
                        </execute>\r
-                       <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
+                       <set>\r
+                               <parameter name='status.code' value='200' />\r
+                               <parameter name='status.message'\r
+                                       value='unexpected return from DG' />\r
+                       </set>\r
+                       <execute\r
+                               plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
                                method='reqExec'>\r
-                               <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
+                               <parameter name='AgentUrl'\r
+                                       value='`$prop.ansible.agenturl`' />\r
                                <parameter name='User' value='`$prop.ansible.user`' />\r
                                <parameter name='Password' value='`prop.ansible.password`' />\r
-                               <parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`' />\r
-                               <parameter name='EnvParameters' value='`$upgrade-software-input.payload`' />\r
-                               <parameter name='NodeList' value='`$prop.ansible.nodelist`' />\r
+                               <parameter name='LocalParameters'\r
+                                       value='`$prop.ansible.lcm.localparameters`' />\r
+                               <parameter name='EnvParameters'\r
+                                       value='`$upgrade-software-input.payload`' />\r
+                               <parameter name='NodeList'\r
+                                       value='`$prop.ansible.nodelist`' />\r
                                <parameter name='Timeout' value='`$prop.ansible.timeout`' />\r
                                <parameter name='Version' value='`$prop.ansible.version`' />\r
                                <parameter name='Id'\r
@@ -26,19 +38,23 @@
                                <outcome value='not-found'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'\r
-                                                               value='200' />\r
-                                                       <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'\r
+                                                       <parameter\r
+                                                               name='$org.onap.appc.adapter.ansible.result.code' value='401' />\r
+                                                       <parameter name='org.onap.appc.adapter.ansible.message'\r
                                                                value='Ansible Adapter was not found' />\r
                                                </set>\r
                                                <block>\r
                                                        <set>\r
-                                                               <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                               <parameter name='lcm-dmaap.version'\r
+                                                                       value='`$prop.lcm.dmaap.version`' />\r
                                                                <parameter name='lcm-dmaap.correlation-id'\r
                                                                        value='`$upgrade-software-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='upgrade-software' />\r
-                                                               <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                               <parameter name='lcm-dmaap.partition'\r
+                                                                       value='`$prop.lcm.dmaap.partition`' />\r
+                                                               <parameter name='lcm-dmaap.rpc-name'\r
+                                                                       value='upgrade-software' />\r
+                                                               <parameter name='lcm-dmaap.type'\r
+                                                                       value='`$prop.lcm.dmaap.type`' />\r
                                                                <parameter name='lcm-dmaap.timestamp'\r
                                                                        value='`$upgrade-software-input.common-header.timestamp`' />\r
                                                                <parameter name='lcm-dmaap.api-ver'\r
@@ -58,32 +74,38 @@
                                                                <parameter name='lcm-dmaap.payload'\r
                                                                        value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                <parameter name='lcm-dmaap.status.code'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                <parameter name='lcm-dmaap.status.message'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                        </set>\r
-                                                       <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
+                                                       <execute\r
+                                                               plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                method='sendRequest'>\r
                                                                <parameter name='templateFileName'\r
                                                                        value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                               <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                               <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                               <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                               <parameter name='restapiUrl'\r
+                                                                       value='`$prop.lcm.dmaap.url`' />\r
+                                                               <parameter name='restapiUser'\r
+                                                                       value='`$prop.lcm.dmaap.user`' />\r
+                                                               <parameter name='restapiPassword'\r
+                                                                       value='`$prop.lcm.dmaap.password`' />\r
                                                                <parameter name='format' value='json' />\r
                                                                <parameter name='httpMethod' value='POST' />\r
                                                                <parameter name='contentType' value='application/json' />\r
                                                                <parameter name="responsePrefix" value="lcm" />\r
                                                                <outcome value='failure'>\r
-                                                                       <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                       <record\r
+                                                                               plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                <parameter name="logger" value="message-log" />\r
-                                                                               <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                               <parameter name="field1"\r
+                                                                                       value='Failed to Publish to DMaap' />\r
                                                                        </record>\r
                                                                </outcome>\r
                                                        </execute>\r
                                                        <return status='failure'>\r
-                                                               <parameter name='error-code' value='200' />\r
-                                                               <parameter name='error-message'\r
-                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                               <parameter name='status.code' value='401' />\r
+                                                               <parameter name='status.message'\r
+                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                        </return>\r
                                                </block>\r
                                        </block>\r
@@ -91,12 +113,16 @@
                                <outcome value='failure'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                       <parameter name='lcm-dmaap.version'\r
+                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                value='`$upgrade-software-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='upgrade-software' />\r
-                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                       <parameter name='lcm-dmaap.partition'\r
+                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                               value='upgrade-software' />\r
+                                                       <parameter name='lcm-dmaap.type'\r
+                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                value='`$upgrade-software-input.common-header.timestamp`' />\r
                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -116,46 +142,56 @@
                                                        <parameter name='lcm-dmaap.payload'\r
                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                </set>\r
-                                               <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
+                                               <execute\r
+                                                       plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                        method='sendRequest'>\r
                                                        <parameter name='templateFileName'\r
                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                       <parameter name='restapiUrl'\r
+                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                       <parameter name='restapiUser'\r
+                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                       <parameter name='restapiPassword'\r
+                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                        <parameter name='format' value='json' />\r
                                                        <parameter name='httpMethod' value='POST' />\r
                                                        <parameter name='contentType' value='application/json' />\r
                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                        <outcome value='failure'>\r
-                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                               <record\r
+                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                        <parameter name="logger" value="message-log" />\r
-                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                       <parameter name="field1"\r
+                                                                               value='Failed to Publish to DMaap' />\r
                                                                </record>\r
                                                        </outcome>\r
                                                </execute>\r
                                                <return status='failure'>\r
-                                                       <parameter name='error-code' value='200' />\r
-                                                       <parameter name='error-message'\r
-                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                       <parameter name='status.code' value='401' />\r
+                                                       <parameter name='status.message'\r
+                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                </return>\r
                                        </block>\r
                                </outcome>\r
                                <outcome value='Other'>\r
-                                       <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">\r
+                                       <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
                                                <outcome value='101'>\r
                                                        <block>\r
                                                                <set>\r
-                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                value='`$upgrade-software-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='upgrade-software' />\r
-                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                               value='upgrade-software' />\r
+                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                value='`$upgrade-software-input.common-header.timestamp`' />\r
                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -175,45 +211,55 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                        method='sendRequest'>\r
                                                                        <parameter name='templateFileName'\r
                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                       <parameter name='restapiUrl'\r
+                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                       <parameter name='restapiUser'\r
+                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                       <parameter name='restapiPassword'\r
+                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                        <parameter name='format' value='json' />\r
                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                       <parameter name='contentType'\r
+                                                                               value='application/json' />\r
                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                        <outcome value='failure'>\r
-                                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                               <record\r
+                                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                       <parameter name="field1"\r
+                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                </record>\r
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='error-code' value='200' />\r
-                                                                       <parameter name='error-message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       <parameter name='status.code' value='401' />\r
+                                                                       <parameter name='status.message'\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
                                                <outcome value='500'>\r
                                                        <block>\r
                                                                <set>\r
-                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                value='`$upgrade-software-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='upgrade-software' />\r
-                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                               value='upgrade-software' />\r
+                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                value='`$upgrade-software-input.common-header.timestamp`' />\r
                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -233,44 +279,53 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                        method='sendRequest'>\r
                                                                        <parameter name='templateFileName'\r
                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                       <parameter name='restapiUrl'\r
+                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                       <parameter name='restapiUser'\r
+                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                       <parameter name='restapiPassword'\r
+                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                        <parameter name='format' value='json' />\r
                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                       <parameter name='contentType'\r
+                                                                               value='application/json' />\r
                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                        <outcome value='failure'>\r
-                                                                               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                                               <record\r
+                                                                                       plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                       <parameter name="field1"\r
+                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                </record>\r
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='error-code' value='200' />\r
-                                                                       <parameter name='error-message'\r
-                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                       <parameter name='status.code' value='401' />\r
+                                                                       <parameter name='status.message'\r
+                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
                                                <outcome value='100'>\r
-                                                       <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
+                                                       <execute\r
+                                                               plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
                                                                method='reqExecResult'>\r
-                                                               <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
+                                                               <parameter name='AgentUrl'\r
+                                                                       value='`$prop.ansible.agenturl`' />\r
                                                                <parameter name='User' value='`$prop.ansible.user`' />\r
-                                                               <parameter name='Password' value='`$prop.ansible.password`' />\r
+                                                               <parameter name='Password'\r
+                                                                       value='`$prop.ansible.password`' />\r
                                                                <parameter name='Id'\r
-                                                                       value='`$upgrade-software-input.common-header.request-id`' />\r
+                                                                       value='`$org.onap.appc.adapter.ansible.Id`' />\r
                                                                <parameter name='PlaybookName'\r
                                                                        value='`$prop.lcm.upgrade-software.playbookname`' />\r
 \r
@@ -281,12 +336,16 @@
                                                                <outcome value='failure'>\r
                                                                        <block>\r
                                                                                <set>\r
-                                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                                value='`$upgrade-software-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='upgrade-software' />\r
-                                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                                               value='upgrade-software' />\r
+                                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                                value='`$upgrade-software-input.common-header.timestamp`' />\r
                                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -306,46 +365,55 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                                        method='sendRequest'>\r
                                                                                        <parameter name='templateFileName'\r
                                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                                       <parameter name='restapiUrl'\r
+                                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                                       <parameter name='restapiUser'\r
+                                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                                       <parameter name='restapiPassword'\r
+                                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                                        <parameter name='format' value='json' />\r
                                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                                       <parameter name='contentType'\r
+                                                                                               value='application/json' />\r
                                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                                        <outcome value='failure'>\r
                                                                                                <record\r
                                                                                                        plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                                       <parameter name="field1"\r
+                                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                                </record>\r
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='failure'>\r
-                                                                                       <parameter name='error-code' value='200' />\r
-                                                                                       <parameter name='error-message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                       <parameter name='status.code' value='401' />\r
+                                                                                       <parameter name='status.message'\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r
                                                                <outcome value='success'>\r
                                                                        <block>\r
                                                                                <set>\r
-                                                                                       <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`' />\r
+                                                                                       <parameter name='lcm-dmaap.version'\r
+                                                                                               value='`$prop.lcm.dmaap.version`' />\r
                                                                                        <parameter name='lcm-dmaap.correlation-id'\r
                                                                                                value='`$upgrade-software-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='upgrade-software' />\r
-                                                                                       <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`' />\r
+                                                                                       <parameter name='lcm-dmaap.partition'\r
+                                                                                               value='`$prop.lcm.dmaap.partition`' />\r
+                                                                                       <parameter name='lcm-dmaap.rpc-name'\r
+                                                                                               value='upgrade-software' />\r
+                                                                                       <parameter name='lcm-dmaap.type'\r
+                                                                                               value='`$prop.lcm.dmaap.type`' />\r
                                                                                        <parameter name='lcm-dmaap.timestamp'\r
                                                                                                value='`$upgrade-software-input.common-header.timestamp`' />\r
                                                                                        <parameter name='lcm-dmaap.api-ver'\r
@@ -365,35 +433,40 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                                        method='sendRequest'>\r
                                                                                        <parameter name='templateFileName'\r
                                                                                                value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
-                                                                                       <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
-                                                                                       <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\r
-                                                                                       <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\r
+                                                                                       <parameter name='restapiUrl'\r
+                                                                                               value='`$prop.lcm.dmaap.url`' />\r
+                                                                                       <parameter name='restapiUser'\r
+                                                                                               value='`$prop.lcm.dmaap.user`' />\r
+                                                                                       <parameter name='restapiPassword'\r
+                                                                                               value='`$prop.lcm.dmaap.password`' />\r
                                                                                        <parameter name='format' value='json' />\r
                                                                                        <parameter name='httpMethod' value='POST' />\r
-                                                                                       <parameter name='contentType' value='application/json' />\r
+                                                                                       <parameter name='contentType'\r
+                                                                                               value='application/json' />\r
                                                                                        <parameter name="responsePrefix" value="lcm" />\r
                                                                                        <outcome value='failure'>\r
                                                                                                <record\r
                                                                                                        plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                                                                                                        <parameter name="logger" value="message-log" />\r
-                                                                                                       <parameter name="field1" value='Failed to Publish to DMaap' />\r
+                                                                                                       <parameter name="field1"\r
+                                                                                                               value='Failed to Publish to DMaap' />\r
                                                                                                </record>\r
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='success'>\r
                                                                                        <parameter name='status.code'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
                                                                                        <parameter name='status.message'\r
-                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r