From: Timoney, Dan (dt5972) <dt5972@att.com>
Date: Mon, 14 May 2018 21:30:48 +0000 (-0400)
Subject: Fix XML version of LCM DGs
X-Git-Tag: v1.3.4~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dce4f370c7373c313d10d58054c58b4b3dd0a9b8;hp=34a6429d9c0af51d2e29eb7a0d1d37c0babe1129;p=sdnc%2Foam.git

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