From e0a8ab9bd315aecde32e0163c9d233ec29df9d51 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 27 Jan 2020 15:21:59 +0100
Subject: Update undeploy-loop flow

Update the undploy-loop flow to support the multiple blueprint
deployment

Issue-ID: CLAMP-627
Change-Id: Ic4187179e2ef2f574f8cc836eebc3608b8aee899
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../resources/clds/camel/routes/dcae-flows.xml     | 191 ++++++++++++---------
 1 file changed, 106 insertions(+), 85 deletions(-)

(limited to 'src/test/resources')

diff --git a/src/test/resources/clds/camel/routes/dcae-flows.xml b/src/test/resources/clds/camel/routes/dcae-flows.xml
index 552f0212..48cda7a0 100644
--- a/src/test/resources/clds/camel/routes/dcae-flows.xml
+++ b/src/test/resources/clds/camel/routes/dcae-flows.xml
@@ -81,8 +81,9 @@
 					<constant>false</constant>
 				</handled>
 				<setProperty propertyName="logMessage">
-					<simple>DEPLOY loop status
-						(Dep-id:${exchangeProperty[dcaeDeploymentId]},
+					<simple>DEPLOY micro service failed 
+						(MicroService name:${exchangeProperty[microServicePolicy].getName()}),
+						Dep-id:${exchangeProperty[dcaeDeploymentId]},
 						StatusUrl:${exchangeProperty[dcaeStatusUrl]})
 					</simple>
 				</setProperty>
@@ -98,88 +99,6 @@
 			</doFinally>
 		</doTry>
 	</route>
-	<!--<route id="deploy-loop-multi-blueprint">
-		<from uri="direct:deploy-loop-multi-blueprint" />
-
-		
-		 <doTry>
-			<split>
-				<doTry>
-					<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-					</simple>
-					<setProperty propertyName="microServicePolicy">
-						<simple>${body}</simple>
-					</setProperty>
-					<log
-						loggingLevel="INFO"
-						message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
-					<setProperty propertyName="raiseHttpExceptionFlag">
-						<simple resultType="java.lang.Boolean">false</simple>
-					</setProperty>
-					<setBody>
-						<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-							method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy].getName())" />
-					</setBody>
-					<setProperty propertyName="dcaeDeploymentId">
-						<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-							method="generateDeploymentId()" />
-					</setProperty>
-					<setHeader headerName="CamelHttpMethod">
-						<constant>PUT</constant>
-					</setHeader>
-					<setHeader headerName="Content-Type">
-						<constant>application/json</constant>
-					</setHeader>
-					<setHeader headerName="X-ONAP-RequestID">
-						<simple>${exchangeProperty[X-ONAP-RequestID]}
-						</simple>
-					</setHeader>
-					<setHeader headerName="X-ONAP-InvocationID">
-						<simple>${exchangeProperty[X-ONAP-InvocationID]}
-						</simple>
-					</setHeader>
-					<setHeader headerName="X-ONAP-PartnerName">
-						<simple>${exchangeProperty[X-ONAP-PartnerName]}
-						</simple>
-					</setHeader>
-					<log loggingLevel="INFO"
-						message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
-					<toD
-						uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true" />
-					<convertBodyTo type="java.lang.String" />
-					<setProperty propertyName="dcaeResponse">
-						<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-							method="convertDcaeResponse(${body})" />
-					</setProperty>
-					<setProperty propertyName="dcaeStatusUrl">
-						<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-							method="getStatusUrl(${exchangeProperty[dcaeResponse]})" />
-					</setProperty>
-					<to
-						uri="bean:org.onap.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy].getName(),${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})" />
-				<doFinally>
-					<to uri="direct:reset-raise-http-exception-flag" />
-					<setProperty propertyName="logMessage">
-						<simple>DEPLOY loop status
-							(Dep-id:${exchangeProperty[dcaeDeploymentId]},
-							StatusUrl:${exchangeProperty[dcaeStatusUrl]})
-						</simple>
-					</setProperty>
-					<setProperty propertyName="logComponent">
-						<simple>DCAE</simple>
-					</setProperty>
-					<to uri="direct:dump-loop-log-http-response" />
-				</doFinally>
-			</doTry>
-
-		</split>
-		<doFinally>
-				<to uri="direct:reset-raise-http-exception-flag" />
-				<to
-					uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
-		</doFinally>
-		</doTry> 
-	</route>-->
 	<route id="deploy-loop-single-blueprint">
 		<from uri="direct:deploy-loop-single-blueprint" />
 		<doTry>
@@ -249,6 +168,109 @@
 	</route>
 	<route id="undeploy-loop">
 		<from uri="direct:undeploy-loop" />
+		<choice>
+			<when>
+				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getBlueprint()} != null
+				</simple>
+				<to uri="direct:undeploy-loop-single-blueprint" />
+			</when>
+			<when>
+				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getBlueprint()} == null
+				</simple>
+				<to uri="direct:undeploy-loop-multi-blueprint" />
+			</when>
+		</choice>
+	</route>
+	<route id="undeploy-loop-multi-blueprint">
+		<from uri="direct:undeploy-loop-multi-blueprint" />
+		<doTry>
+			<log loggingLevel="INFO"
+				message="Undeploying the blueprints for loop: ${exchangeProperty[loopObject].getName()}" />
+			<to
+				uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop with multiple blueprints')" />
+			<split>
+				<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
+				</simple>
+				<setProperty propertyName="microServicePolicy">
+					<simple>${body}</simple>
+				</setProperty>
+				<log
+					loggingLevel="INFO"
+					message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
+				<choice>
+					<when>
+						<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentId()} != null
+						</simple>
+						<setBody>
+							<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+								method="getUndeployPayload(${exchangeProperty[microServicePolicy]})" />
+						</setBody>
+						<setHeader headerName="CamelHttpMethod">
+							<constant>DELETE</constant>
+						</setHeader>
+						<setHeader headerName="Content-Type">
+							<constant>application/json</constant>
+						</setHeader>
+						<setHeader headerName="X-ONAP-RequestID">
+							<simple>${exchangeProperty[X-ONAP-RequestID]}
+							</simple>
+						</setHeader>
+						<setHeader headerName="X-ONAP-InvocationID">
+							<simple>${exchangeProperty[X-ONAP-InvocationID]}
+							</simple>
+						</setHeader>
+						<setHeader headerName="X-ONAP-PartnerName">
+							<simple>${exchangeProperty[X-ONAP-PartnerName]}
+							</simple>
+						</setHeader>
+						<log loggingLevel="INFO"
+							message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}"></log>
+						<toD
+							uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true" />
+						<convertBodyTo type="java.lang.String" />
+						<setProperty propertyName="dcaeResponse">
+							<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+								method="convertDcaeResponse(${body})" />
+						</setProperty>
+						<setProperty propertyName="dcaeStatusUrl">
+							<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+								method="getStatusUrl(${exchangeProperty[dcaeResponse]})" />
+						</setProperty>
+						<to
+							uri="bean:org.onap.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},${exchangeProperty[microServicePolicy].getDcaeDeploymentId()},${exchangeProperty[dcaeStatusUrl]})" />
+					</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]})" />
+					</otherwise>
+				</choice>
+			</split>
+			<doCatch>
+				<exception>java.lang.Exception</exception>
+				<handled>
+					<constant>false</constant>
+				</handled>
+				<setProperty propertyName="logMessage">
+					<simple>UNDEPLOY micro service failed
+						(MicroService name:${exchangeProperty[microServicePolicy].getName()})
+					</simple>
+				</setProperty>
+				<setProperty propertyName="logComponent">
+					<simple>DCAE</simple>
+				</setProperty>
+				<to uri="direct:dump-loop-log-http-response" />
+			</doCatch>
+			<doFinally>
+				<to uri="direct:reset-raise-http-exception-flag" />
+				<to
+					uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+			</doFinally>
+		</doTry>
+	</route>
+	<route id="undeploy-loop-single-blueprint">
+		<from uri="direct:undeploy-loop-single-blueprint" />
 		<log loggingLevel="INFO"
 			message="Undeploying the loop: ${exchangeProperty[loopObject].getName()} : ${exchangeProperty[loopObject].getDcaeDeploymentId()}" />
 		<to
@@ -316,7 +338,6 @@
 					message="Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !" />
 				<to
 					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !','WARNING',${exchangeProperty[loopObject]})" />
-
 			</otherwise>
 		</choice>
 	</route>
-- 
cgit 1.2.3-korg