X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fclds%2Fcamel%2Froutes%2Floop-flows.xml;h=d0d55256818490fb67443395b804f74e80be1830;hb=cd3dec378e3ad194d8708b45e653471b4a73d326;hp=922d5f164591547d39a55ddaf6768b3bc1bb5d07;hpb=3142c70fb7530c444c891674fe55c6a9b236dfb3;p=clamp.git

diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml
index 922d5f16..d0d55256 100644
--- a/src/main/resources/clds/camel/routes/loop-flows.xml
+++ b/src/main/resources/clds/camel/routes/loop-flows.xml
@@ -17,7 +17,6 @@
 			<stop />
 		</when>
 	</route>
-
 	<route id="update-policy-status-for-loop">
 		<from uri="direct:update-policy-status-for-loop" />
 		<setProperty propertyName="policyComponent">
@@ -39,7 +38,13 @@
 				<simple>${body.getName()}</simple>
 			</setProperty>
 			<setProperty propertyName="policyType">
-				<simple>${body.getModelType()}</simple>
+				<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
+			</setProperty>
+			<setProperty propertyName="policyTypeVersion">
+				<simple>${body.getPolicyModel().getVersion()}</simple>
+			</setProperty>
+			<setProperty propertyName="policyVersion">
+				<simple>1.0.0</simple>
 			</setProperty>
 			<setBody>
 				<constant>null</constant>
@@ -57,7 +62,13 @@
 				<simple>${body.getName()}</simple>
 			</setProperty>
 			<setProperty propertyName="policyType">
-				<simple>onap.policies.controlloop.Operational</simple>
+				<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
+			</setProperty>
+			<setProperty propertyName="policyTypeVersion">
+				<simple>${body.getPolicyModel().getVersion()}</simple>
+			</setProperty>
+		 	<setProperty propertyName="policyVersion">
+				<simple>1.0.0</simple>
 			</setProperty>
 			<setProperty propertyName="operationalPolicy">
 				<simple>${body}</simple>
@@ -66,26 +77,8 @@
 				<constant>null</constant>
 			</setBody>
 			<log loggingLevel="INFO"
-				message="Processing Micro Service Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
+				message="Processing Operational Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
 			<to uri="direct:verify-one-policy" />
-			<log loggingLevel="INFO"
-				message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
-			<split>
-				<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
-				</simple>
-				<setProperty propertyName="policyName">
-					<simple>${body.getKey()}</simple>
-				</setProperty>
-				<setProperty propertyName="policyType">
-					<simple>onap.policies.controlloop.Guard</simple>
-				</setProperty>
-				<setBody>
-					<constant>null</constant>
-				</setBody>
-				<log loggingLevel="INFO"
-					message="Processing Guard Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
-				<to uri="direct:verify-one-policy" />
-			</split>
 		</split>
 		<setProperty propertyName="policyState">
 			<simple> ${exchangeProperty[policyComponent].getState()}
@@ -100,37 +93,84 @@
 		<from uri="direct:update-dcae-status-for-loop" />
 		<log loggingLevel="INFO"
 			message="Updating DCAE status for loop: ${exchangeProperty[loopObject].getName()}" />
-		<setProperty propertyName="dcaeComponent">
-			<simple>${exchangeProperty[loopObject].getComponent('DCAE')}</simple>
-		</setProperty>
-		<when>
-			<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}
-				!= null
-			</simple>
-			<setProperty propertyName="raiseHttpExceptionFlag">
-				<simple resultType="java.lang.Boolean">false</simple>
-			</setProperty>
-			<to uri="direct:get-dcae-deployment-status" />
+		<choice>
 			<when>
-				<simple> ${header.CamelHttpResponseCode} == 200 </simple>
-				<convertBodyTo type="java.lang.String" />
-				<setProperty propertyName="dcaeResponse">
-					<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-						method="convertDcaeResponse(${body})" />
+				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
+				</simple>
+					<setProperty propertyName="dcaeComponent">
+						<simple>${exchangeProperty[loopObject].getComponent('DCAE')}</simple>
+					</setProperty>
+				<when>
+					<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()} != null
+					</simple>
+					<setProperty propertyName="getStatusUrl">
+						<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}</simple>
+					</setProperty>
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">false</simple>
+					</setProperty>
+					<to uri="direct:get-dcae-deployment-status" />
+					<when>
+						<simple> ${header.CamelHttpResponseCode} == 200 </simple>
+						<convertBodyTo type="java.lang.String" />
+						<setProperty propertyName="dcaeResponse">
+							<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+								method="convertDcaeResponse(${body})" />
+						</setProperty>
+					</when>
+				</when>
+				<setProperty propertyName="dcaeState">
+					<simple> ${exchangeProperty[dcaeComponent].computeState(*)}
+					</simple>
 				</setProperty>
+				<log loggingLevel="INFO"
+					message="DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - DCAE message: ${exchangeProperty[dcaeResponse].getError()}" />
+				<to
+					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - message: ${exchangeProperty[dcaeResponse].getError()}','INFO','DCAE',${exchangeProperty[loopObject]})" />
 			</when>
-		</when>
-
-		<setProperty propertyName="dcaeState">
-			<simple> ${exchangeProperty[dcaeComponent].computeState(*)}
-			</simple>
-		</setProperty>
-		<log loggingLevel="INFO"
-			message="DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - DCAE message: ${exchangeProperty[dcaeResponse].getError()}" />
-		<to
-			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - message: ${exchangeProperty[dcaeResponse].getError()}','INFO','DCAE',${exchangeProperty[loopObject]})" />
-
-	</route>
+			<when>
+				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
+				</simple>
+				<split>
+					<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
+					</simple>
+					<setProperty propertyName="microServicePolicy">
+						<simple>${body}</simple>
+					</setProperty>
+					<setProperty propertyName="dcaeComponent">
+						<simple>${exchangeProperty[loopObject].getComponent('DCAE_' + ${exchangeProperty[microServicePolicy].getName()})}</simple>
+					</setProperty>
+					<when>
+						<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()} != null
+						</simple>
+						<setProperty propertyName="getStatusUrl">
+							<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()}</simple>
+						</setProperty>
+						<setProperty propertyName="raiseHttpExceptionFlag">
+							<simple resultType="java.lang.Boolean">false</simple>
+						</setProperty>
+						<to uri="direct:get-dcae-deployment-status" />
+						<when>
+							<simple> ${header.CamelHttpResponseCode} == 200 </simple>
+							<convertBodyTo type="java.lang.String" />
+							<setProperty propertyName="dcaeResponse">
+								<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+									method="convertDcaeResponse(${body})" />
+							</setProperty>
+						</when>
+					</when>
+					<setProperty propertyName="dcaeState">
+						<simple> ${exchangeProperty[dcaeComponent].computeState(*)}
+						</simple>
+					</setProperty>
+					<log loggingLevel="INFO"
+						message="DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - DCAE message: ${exchangeProperty[dcaeResponse].getError()}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - message: ${exchangeProperty[dcaeResponse].getError()}','INFO','DCAE',${exchangeProperty[microServicePolicy]})" />
+				</split>>
+			</when>
+		</choice>
+		</route>
 	<route id="direct:update-loop-state">
 		<from uri="direct:update-loop-state" />
 		<log loggingLevel="INFO"