From 81c1344c018e995e4f6f906435d0faab3480e13b Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 4 Feb 2020 15:22:00 +0100
Subject: Update get Dcae Status flow

Update the flow to get Dcae Status, supporting multiple blue print.

Issue-ID: CLAMP-590
Change-Id: I6a05a40d4879082413d3ed83159467ea616c5d37
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../resources/clds/camel/routes/dcae-flows.xml     | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/test/resources/clds/camel/routes/dcae-flows.xml')

diff --git a/src/test/resources/clds/camel/routes/dcae-flows.xml b/src/test/resources/clds/camel/routes/dcae-flows.xml
index 48cda7a05..8088c2a40 100644
--- a/src/test/resources/clds/camel/routes/dcae-flows.xml
+++ b/src/test/resources/clds/camel/routes/dcae-flows.xml
@@ -3,12 +3,12 @@
 		<from uri="direct:deploy-loop" />
 		<choice>
 			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getBlueprint()} != null
+				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
 				</simple>
 				<to uri="direct:deploy-loop-single-blueprint" />
 			</when>
 			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getBlueprint()} == null
+				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
 				</simple>
 				<to uri="direct:deploy-loop-multi-blueprint" />
 			</when>
@@ -74,6 +74,8 @@
 					</setProperty>
 					<to
 						uri="bean:org.onap.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('Deploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})" />
 			</split>
 			<doCatch>
 				<exception>java.lang.Exception</exception>
@@ -170,12 +172,12 @@
 		<from uri="direct:undeploy-loop" />
 		<choice>
 			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getBlueprint()} != null
+				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
 				</simple>
 				<to uri="direct:undeploy-loop-single-blueprint" />
 			</when>
 			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getBlueprint()} == null
+				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
 				</simple>
 				<to uri="direct:undeploy-loop-multi-blueprint" />
 			</when>
@@ -238,12 +240,14 @@
 						</setProperty>
 						<to
 							uri="bean:org.onap.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},${exchangeProperty[microServicePolicy].getDcaeDeploymentId()},${exchangeProperty[dcaeStatusUrl]})" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})" />
 					</when>
 					<otherwise>
 						<log loggingLevel="WARNING"
 							message="Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !','WARNING',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !','WARNING','DCAE',${exchangeProperty[loopObject]})" />
 					</otherwise>
 				</choice>
 			</split>
@@ -344,7 +348,7 @@
 	<route id="get-dcae-deployment-status">
 		<from uri="direct:get-dcae-deployment-status" />
 		<log loggingLevel="INFO"
-			message="Getting DCAE deployment status for loop: ${exchangeProperty[loopObject].getName()}" />
+			message="Getting DCAE deployment status for loop: ${exchangeProperty[loopObject].getName()} - ${exchangeProperty[dcaeComponent].getComponentName()}" />
 		<to
 			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting Deployment status')" />
 		<doTry>
@@ -364,9 +368,9 @@
 				</simple>
 			</setHeader>
 			<log loggingLevel="INFO"
-				message="Endpoint to query Closed Loop status: ${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}"></log>
+				message="Endpoint to query Closed Loop status: ${exchangeProperty[getStatusUrl]}"></log>
 			<toD
-				uri="${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true" />
+				uri="${exchangeProperty[getStatusUrl]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true" />
 			<doFinally>
 				<to uri="direct:reset-raise-http-exception-flag" />
 				<to
@@ -448,9 +452,9 @@
 			<split>
 				<simple>${exchangeProperty[dcaeResponseList]}</simple>
 				<convertBodyTo type="org.onap.clamp.clds.model.dcae.DcaeInventoryResponse" />
-					<setProperty propertyName="dcaeResponse">
-						<simple>${body}</simple>
-					</setProperty>
+				<setProperty propertyName="dcaeResponse">
+					<simple>${body}</simple>
+				</setProperty>
 				<to uri="bean:org.onap.clamp.clds.model.dcae.DcaeInventoryCache?method=addDcaeInventoryResponse(${exchangeProperty[dcaeResponse]})" />
 			</split>
 			<doFinally>
-- 
cgit 1.2.3-korg