From 7e8938e2bf7eae76bd527a28fd453650cf744e1a Mon Sep 17 00:00:00 2001
From: xg353y <xg353y@intl.att.com>
Date: Fri, 3 May 2019 13:23:40 +0200
Subject: Fix the bugs in loop state logic

Fix the bugs in the logic to get the loop state

Issue-ID: CLAMP-362
Change-Id: I9d931f1a1ceed3d9e173b3ee742f8e349b7e653f
Signed-off-by: xg353y <xg353y@intl.att.com>
---
 src/main/resources/clds/camel/routes/flexible-flow.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/main/resources/clds/camel/routes')

diff --git a/src/main/resources/clds/camel/routes/flexible-flow.xml b/src/main/resources/clds/camel/routes/flexible-flow.xml
index 681380085..a116c5685 100644
--- a/src/main/resources/clds/camel/routes/flexible-flow.xml
+++ b/src/main/resources/clds/camel/routes/flexible-flow.xml
@@ -605,9 +605,10 @@
 				message="Query Closed Loop status from policy DPD: ${exchangeProperty[loopObject].getName()}" />
 			<to
 				uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Query operational policies to PDP group')" />
-			<setBody>
-				<constant>null</constant>
-			</setBody>
+			<setProperty propertyName="operationalPolicyName">
+				<method ref="org.onap.clamp.loop.LoopOperation"
+					method="getOperationalPolicyName(${exchangeProperty[loopObject]})" />
+			</setProperty>
 			<setHeader headerName="CamelHttpMethod">
 				<constant>GET</constant>
 			</setHeader>
@@ -625,9 +626,9 @@
 			</setHeader>
 			<log
 				loggingLevel="INFO"
-				message="Endpoint to query from Policy DPD: {{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicy].getName()}/versions/deployed"></log>
+				message="Endpoint to query from Policy DPD: {{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicyName]}/versions/deployed"></log>
 			<toD
-				uri="{{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicy].getName()}/versions/deployed?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;httpClient.connectTimeout=10000&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}" />
+				uri="{{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicyName]}/versions/deployed?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;httpClient.connectTimeout=10000&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}" />
 			<doFinally>
 				<to uri="direct:reset-raise-http-exception-flag" />
 				<to
@@ -639,9 +640,6 @@
 					<method ref="org.onap.clamp.loop.LoopOperation"
 					method="analysePolicyResponse(${header.CamelHttpResponseCode})" />
 				</setProperty>
-				<log
-						loggingLevel="INFO"
-						message="policy status: ${exchangeProperty[policyStatus]}"></log>
 				<to uri="direct:dump-loop-log-http-response" />
 			</doFinally>
 		</doTry>
-- 
cgit 1.2.3-korg