From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 13 May 2019 08:24:06 +0000 (+0200)
Subject: Fix the camel flow
X-Git-Tag: 4.0.2~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F87529%2F1;p=clamp.git

Fix the camel flow

Fix the bad log calls done during start/stop actions that led to crash

Issue-ID: CLAMP-379
Change-Id: Ia68c6e96ac8c8771d289d22dcfee6730425ba992
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---

diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 98440d72..cf758720 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -314,7 +314,7 @@
 						loggingLevel="INFO"
 						message="Receive STOP request for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog('Stop the closed loop')" />
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'Stop the closed loop')" />
 					<to
 						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
@@ -343,7 +343,7 @@
 			</route>
 		</put>
 		<put
-			uri="/v2/loop/start/{loopName}"
+			uri="/v2/loop/restart/{loopName}"
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
@@ -353,9 +353,9 @@
 				<doTry>
 					<log
 						loggingLevel="INFO"
-						message="Receive START request for loop: ${header.loopName}" />
+						message="Receive RESTART request for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog('Start the closed loop')" />
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'Restart the closed loop')" />
 					<to
 						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
@@ -364,9 +364,9 @@
 					<to uri="direct:add-all-to-active-pdp-group" />
 					<log
 						loggingLevel="INFO"
-						message="START request successfully executed for loop: ${header.loopName}" />
+						message="RESTART request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('START request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
@@ -378,9 +378,9 @@
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log
 							loggingLevel="ERROR"
-							message="START request failed for loop: ${header.loopName}" />
+							message="RESTART request failed for loop: ${header.loopName}" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('START request failed, Error reported: ${exception}','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception}','INFO',${exchangeProperty[loopObject]})" />
 					</doCatch>
 				</doTry>
 			</route>
@@ -501,7 +501,7 @@
 						loggingLevel="INFO"
 						message="Receive DELETE request for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog('Delete the closed loop')" />
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'Delete the closed loop')" />
 					<to
 						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />