Merge "Fix logging issues"

3 files changed, 606 insertions, 184 deletions

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 a823c09da..6bd1132cc 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -5,10 +5,23 @@
 			outType="java.lang.String[]"
 			produces="application/json">
 			<route>
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
-				<to
-					uri="bean:org.onap.clamp.loop.LoopController?method=getLoopNames()" />
+			 	<doTry>
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Get All ClosedLoop')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getLoopNames()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</get>
 		<get
@@ -16,10 +29,23 @@
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
-				<to
-					uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+				<doTry>
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Get Closed Loop')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</get>
 		<get
@@ -27,10 +53,23 @@
 			outType="java.lang.String"
 			produces="application/xml">
 			<route>
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
-				<to
-					uri="bean:org.onap.clamp.loop.LoopController?method=getSVGRepresentation(${header.loopName})" />
+				<doTry>
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Get SVG Representation')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getSVGRepresentation(${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</get>
 
@@ -41,16 +80,29 @@
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-				<setHeader headerName="GlobalPropertiesJson">
-					<simple>${body}</simple>
-				</setHeader>
-				<to uri="direct:load-loop" />
-				<to
-					uri="bean:org.onap.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${header.GlobalPropertiesJson})" />
-				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Global Properties UPDATED','INFO',${header.LoopObject})" />
+				<doTry>
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<setHeader headerName="GlobalPropertiesJson">
+						<simple>${body}</simple>
+					</setHeader>
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${header.GlobalPropertiesJson})" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Global Properties UPDATED','INFO',${header.LoopObject})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</post>
 		<post
@@ -60,16 +112,29 @@
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-				<setHeader headerName="OperationalPoliciesArray">
-					<simple>${body}</simple>
-				</setHeader>
-				<to uri="direct:load-loop" />
-				<to
-					uri="bean:org.onap.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
-				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational and Guard policies UPDATED','INFO',${header.LoopObject})" />
+				<doTry>
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<setHeader headerName="OperationalPoliciesArray">
+						<simple>${body}</simple>
+					</setHeader>
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational and Guard policies UPDATED','INFO',${header.LoopObject})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</post>
 		<post
@@ -79,17 +144,30 @@
 			outType="org.onap.clamp.policy.microservice.MicroServicePolicy"
 			produces="application/json">
 			<route>
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-				<setHeader headerName="MicroServicePolicyObject">
-					<simple>${body}</simple>
-				</setHeader>
+				<doTry>
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<setHeader headerName="MicroServicePolicyObject">
+						<simple>${body}</simple>
+					</setHeader>
 
-				<to uri="direct:load-loop" />
-				<to
-					uri="bean:org.onap.clamp.loop.LoopController?method=updateMicroservicePolicy(${header.loopName},${header.MicroServicePolicyObject})" />
-				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Micro Service policies UPDATED','INFO',${header.LoopObject})" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=updateMicroservicePolicy(${header.loopName},${header.MicroServicePolicyObject})" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Micro Service policies UPDATED','INFO',${header.LoopObject})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</post>
 		<put
@@ -97,10 +175,23 @@
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-				<to
-					uri="bean:org.onap.clamp.operation.LoopOperation?method=deployLoop(*,${header.loopName})" />
+				<doTry>
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Deploy the closed loop')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to
+						uri="bean:org.onap.clamp.operation.LoopOperation?method=deployLoop(*,${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</put>
 		<put
@@ -108,10 +199,23 @@
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-				<to
-					uri="bean:org.onap.clamp.operation.LoopOperation?method=unDeployLoop(${header.loopName})" />
+				<doTry>
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Undeploy the closed loop')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to
+						uri="bean:org.onap.clamp.operation.LoopOperation?method=unDeployLoop(${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</put>
 		<put
@@ -119,193 +223,393 @@
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<log
-					loggingLevel="INFO"
-					message="Receive STOP request for loop: ${header.loopName}" />
+				<doTry>
+					<log
+						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')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+
+					<doTry>	
+						<to uri="direct:remove-all-policy-from-active-pdp-group" />
+						<doCatch>
+            				<exception>java.lang.Exception</exception>
+            				<handled>
+                				<constant>false</constant>
+            				</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        				</doCatch>
+					</doTry>
+
+
+					<log
+						loggingLevel="INFO"
+						message="STOP request successfully executed for loop: ${body}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${header.LoopObject})" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
-			<to
-				uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-			<to uri="direct:load-loop" />
-			<to uri="direct:remove-all-policy-from-active-pdp-group" />
-			<log
-				loggingLevel="INFO"
-				message="STOP request successfully executed for loop: ${body}" />
-			<to
-				uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${header.LoopObject})" />
-			<to
-				uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
 		</put>
 		<put
 			uri="/v2/loop/start/{loopName}"
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<log
-					loggingLevel="INFO"
-					message="Receive START request for loop: ${header.loopName}" />
+				<doTry>
+					<log
+						loggingLevel="INFO"
+						message="Receive START request for loop: ${header.loopName}" />
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog('Start the closed loop')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					
+					<doTry>	
+						<to uri="direct:add-all-to-active-pdp-group" />
+						<doCatch>
+            				<exception>java.lang.Exception</exception>
+            				<handled>
+                				<constant>false</constant>
+            				</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        				</doCatch>
+					</doTry>
+
+					<log
+						loggingLevel="INFO"
+						message="START request successfully executed for loop: ${body}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('START request successfully executed','INFO',${header.LoopObject})" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
-			<to
-				uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-			<to uri="direct:load-loop" />
-			<to uri="direct:add-all-to-active-pdp-group" />
-			<log
-				loggingLevel="INFO"
-				message="START request successfully executed for loop: ${body}" />
-			<to
-				uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('START request successfully executed','INFO',${header.LoopObject})" />
-			<to
-				uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
 		</put>
 		<put
 			uri="/v2/loop/submit/{loopName}"
 			outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<log
-					loggingLevel="INFO"
-					message="Receive SUBMIT request for loop: ${header.loopName}" />
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-				<to uri="direct:load-loop" />
-				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Receive SUBMIT request','INFO',${header.LoopObject})" />
-				<setHeader headerName="RaiseHttpExceptionFlag">
-					<simple resultType="java.lang.Boolean">false</simple>
-				</setHeader>
-				<to uri="direct:remove-all-policy-from-active-pdp-group" />
-				<log
-					loggingLevel="INFO"
-					message="Processing all MICRO-SERVICES policies defined in loop ${header.LoopObject.getName()}" />
-				<split>
-					<simple>${header.LoopObject.getMicroServicePolicies()}
-					</simple>
-					<setHeader headerName="microServicePolicy">
-						<simple>${body}</simple>
-					</setHeader>
+				<doTry>
 					<log
 						loggingLevel="INFO"
-						message="Processing Micro Service Policy: ${header.microServicePolicy.getName()}" />
+						message="Receive SUBMIT request for loop: ${header.loopName}" />
+        			<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Submit the closed loop')" />	
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Receive SUBMIT request','INFO',${header.LoopObject})" />
 					<setHeader headerName="RaiseHttpExceptionFlag">
 						<simple resultType="java.lang.Boolean">false</simple>
 					</setHeader>
-					<to uri="direct:delete-micro-service-policy" />
-
-					<to uri="direct:create-micro-service-policy" />
-				</split>
+					
+					<doTry>	
+						<to uri="direct:remove-all-policy-from-active-pdp-group" />
+						<doCatch>
+            				<exception>java.lang.Exception</exception>
+            				<handled>
+                				<constant>false</constant>
+            				</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        				</doCatch>
+					</doTry>
 
-				<log
-					loggingLevel="INFO"
-					message="Processing all OPERATIONAL policies defined in loop ${header.LoopObject.getName()}" />
-				<split>
-					<simple>${header.LoopObject.getOperationalPolicies()}
-					</simple>
-					<setHeader headerName="operationalPolicy">
-						<simple>${body}</simple>
-					</setHeader>
 					<log
 						loggingLevel="INFO"
-						message="Processing Operational Policy: ${header.operationalPolicy.getName()}" />
-					<setHeader headerName="RaiseHttpExceptionFlag">
-						<simple resultType="java.lang.Boolean">false</simple>
-					</setHeader>
-					<to uri="direct:delete-operational-policy" />
+						message="Processing all MICRO-SERVICES policies defined in loop ${header.LoopObject.getName()}" />
+					<split>
+						<simple>${header.LoopObject.getMicroServicePolicies()}
+						</simple>
+						<setHeader headerName="microServicePolicy">
+							<simple>${body}</simple>
+						</setHeader>
+						<log
+							loggingLevel="INFO"
+							message="Processing Micro Service Policy: ${header.microServicePolicy.getName()}" />
+						<setHeader headerName="RaiseHttpExceptionFlag">
+							<simple resultType="java.lang.Boolean">false</simple>
+						</setHeader>
+
+						<doTry>	
+							<to uri="direct:delete-micro-service-policy" />
+							<doCatch>
+            					<exception>java.lang.Exception</exception>
+            					<handled>
+                					<constant>false</constant>
+            					</handled>
+            				<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        					</doCatch>
+						</doTry>
 
-					<to uri="direct:create-operational-policy" />
+						<doTry>	
+							<to uri="direct:create-micro-service-policy" />
+							<doCatch>
+            					<exception>java.lang.Exception</exception>
+            					<handled>
+                					<constant>false</constant>
+            					</handled>
+            				<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        					</doCatch>
+						</doTry>
+						
+					</split>
 					<log
 						loggingLevel="INFO"
-						message="Processing all GUARD policies defined in loop ${header.LoopObject.getName()}" />
+						message="Processing all OPERATIONAL policies defined in loop ${header.LoopObject.getName()}" />
 					<split>
-						<simple>${header.operationalPolicy.createGuardPolicyPayloads().entrySet()}
+						<simple>${header.LoopObject.getOperationalPolicies()}
 						</simple>
-						<setHeader headerName="guardPolicy">
+						<setHeader headerName="operationalPolicy">
 							<simple>${body}</simple>
 						</setHeader>
 						<log
 							loggingLevel="INFO"
-							message="Processing Guard Policy: ${header.guardPolicy.getKey()}" />
-
+							message="Processing Operational Policy: ${header.operationalPolicy.getName()}" />
 						<setHeader headerName="RaiseHttpExceptionFlag">
 							<simple resultType="java.lang.Boolean">false</simple>
-						</setHeader>
-						<to uri="direct:delete-guard-policy" />
+						</setHeader>	
+
+						<doTry>	
+							<to uri="direct:delete-operational-policy" />
+							<doCatch>
+            					<exception>java.lang.Exception</exception>
+            					<handled>
+                					<constant>false</constant>
+            					</handled>
+            				<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        					</doCatch>
+						</doTry>
+
+						<doTry>	
+							<to uri="direct:create-operational-policy" />
+							<doCatch>
+            					<exception>java.lang.Exception</exception>
+            					<handled>
+                					<constant>false</constant>
+            					</handled>
+            				<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        					</doCatch>
+						</doTry>
+
+						
+						<log
+							loggingLevel="INFO"
+							message="Processing all GUARD policies defined in loop ${header.LoopObject.getName()}" />
+						<split>
+							<simple>${header.operationalPolicy.createGuardPolicyPayloads().entrySet()}
+							</simple>
+							<setHeader headerName="guardPolicy">
+								<simple>${body}</simple>
+							</setHeader>
+							<log
+								loggingLevel="INFO"
+								message="Processing Guard Policy: ${header.guardPolicy.getKey()}" />
+
+							<setHeader headerName="RaiseHttpExceptionFlag">
+								<simple resultType="java.lang.Boolean">false</simple>
+							</setHeader>
+							
+							<doTry>	
+								<to uri="direct:delete-guard-policy" />
+								<doCatch>
+            						<exception>java.lang.Exception</exception>
+            						<handled>
+                						<constant>false</constant>
+            						</handled>
+            					<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        						</doCatch>
+							</doTry>
 
-						<to uri="direct:create-guard-policy" />
+							<doTry>	
+								<to uri="direct:create-guard-policy" />
+								<doCatch>
+            						<exception>java.lang.Exception</exception>
+            						<handled>
+                						<constant>false</constant>
+            						</handled>
+            					<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        						</doCatch>
+							</doTry>
+
+						</split>
 					</split>
-				</split>
-				<to uri="direct:add-all-to-active-pdp-group" />
+					
+					
+					<doTry>	
+						<to uri="direct:add-all-to-active-pdp-group" />
+						<doCatch>
+            				<exception>java.lang.Exception</exception>
+            				<handled>
+                				<constant>false</constant>
+            				</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        				</doCatch>
+					</doTry>
+					
+
 
-				<log
-					loggingLevel="INFO"
-					message="SUBMIT request successfully executed for loop: ${body}" />
-				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${header.LoopObject})" />
-				<to
-					uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+					<log
+						loggingLevel="INFO"
+						message="SUBMIT request successfully executed for loop: ${body}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${header.LoopObject})" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</put>
 		<put uri="/v2/loop/delete/{loopName}">
 			<route>
-				<log
-					loggingLevel="INFO"
-					message="Receive DELETE request for loop: ${header.loopName}" />
-				<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
-				<to uri="direct:load-loop" />
-				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Receive DELETE request','INFO',${header.LoopObject})" />
-				<to uri="direct:remove-all-policy-from-active-pdp-group" />
-				<split>
-					<simple>${header.LoopObject.getMicroServicePolicies()}
-					</simple>
-					<setHeader headerName="microServicePolicy">
-						<simple>${body}</simple>
-					</setHeader>
+				<doTry>
 					<log
 						loggingLevel="INFO"
-						message="Processing Micro Service Policy: ${header.microServicePolicy.getName()}" />
+						message="Receive DELETE request for loop: ${header.loopName}" />
+        			<to
+						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" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Receive DELETE request','INFO',${header.LoopObject})" />
 
-					<to uri="direct:delete-micro-service-policy" />
-				</split>
+					<doTry>	
+						<to uri="direct:remove-all-policy-from-active-pdp-group" />
+						<doCatch>
+            				<exception>java.lang.Exception</exception>
+            				<handled>
+                				<constant>false</constant>
+            				</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        				</doCatch>
+					</doTry>
 
-				<log
-					loggingLevel="INFO"
-					message="Processing all OPERATIONAL policies defined in loop ${header.LoopObject.getName()}" />
-				<split>
-					<simple>${header.LoopObject.getOperationalPolicies()}
-					</simple>
-					<setHeader headerName="operationalPolicy">
-						<simple>${body}</simple>
-					</setHeader>
-					<log
-						loggingLevel="INFO"
-						message="Processing Operational Policy: ${header.operationalPolicy.getName()}" />
+					
+					<split>
+						<simple>${header.LoopObject.getMicroServicePolicies()}
+						</simple>
+						<setHeader headerName="microServicePolicy">
+							<simple>${body}</simple>
+						</setHeader>
+						<log
+							loggingLevel="INFO"
+							message="Processing Micro Service Policy: ${header.microServicePolicy.getName()}" />
+
+						<doTry>	
+							<to uri="direct:delete-micro-service-policy" />
+							<doCatch>
+            					<exception>java.lang.Exception</exception>
+            					<handled>
+                					<constant>false</constant>
+            					</handled>
+            				<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        					</doCatch>
+						</doTry>
+
+					</split>
 
-					<to uri="direct:delete-operational-policy" />
 					<log
 						loggingLevel="INFO"
-						message="Processing all GUARD policies defined in loop ${header.LoopObject.getName()}" />
+						message="Processing all OPERATIONAL policies defined in loop ${header.LoopObject.getName()}" />
 					<split>
-						<simple>${header.operationalPolicy.createGuardPolicyPayloads().entrySet()}
+						<simple>${header.LoopObject.getOperationalPolicies()}
 						</simple>
-						<setHeader headerName="guardPolicy">
+						<setHeader headerName="operationalPolicy">
 							<simple>${body}</simple>
 						</setHeader>
 						<log
 							loggingLevel="INFO"
-							message="Processing Guard Policy: ${header.guardPolicy.getKey()}" />
+							message="Processing Operational Policy: ${header.operationalPolicy.getName()}" />
+						
+						<doTry>	
+							<to uri="direct:delete-operational-policy" />
+							<doCatch>
+            					<exception>java.lang.Exception</exception>
+            					<handled>
+                					<constant>false</constant>
+            					</handled>
+            				<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        					</doCatch>
+						</doTry>
+
+						<log
+							loggingLevel="INFO"
+							message="Processing all GUARD policies defined in loop ${header.LoopObject.getName()}" />
+						<split>
+							<simple>${header.operationalPolicy.createGuardPolicyPayloads().entrySet()}
+							</simple>
+							<setHeader headerName="guardPolicy">
+								<simple>${body}</simple>
+							</setHeader>
+							<log
+								loggingLevel="INFO"
+								message="Processing Guard Policy: ${header.guardPolicy.getKey()}" />
 
-						<to uri="direct:delete-guard-policy" />
+							<doTry>	
+								<to uri="direct:delete-guard-policy" />
+								<doCatch>
+		            				<exception>java.lang.Exception</exception>
+            						<handled>
+                						<constant>false</constant>
+            						</handled>
+            					<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+        						</doCatch>
+							</doTry>
+
+						</split>
 					</split>
-				</split>
-				<to
-					uri="bean:org.onap.clamp.loop.log.LoopService?method=deleteLoop(${header.loopName})" />
-				<log
-					loggingLevel="INFO"
-					message="DELETE request successfully executed for loop: ${body}" />
-				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request successfully executed','INFO',${header.LoopObject})" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopService?method=deleteLoop(${header.loopName})" />
+					<log
+						loggingLevel="INFO"
+						message="DELETE request successfully executed for loop: ${body}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request successfully executed','INFO',${header.LoopObject})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+        			<doCatch>
+            			<exception>java.lang.Exception</exception>
+            			<handled>
+                			<constant>false</constant>
+            			</handled>
+            			<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+        			</doCatch>
+    			</doTry>
 			</route>
 		</put>
 	</rest>
 </rests>
-
diff --git a/src/main/resources/clds/camel/routes/flexible-flow.xml b/src/main/resources/clds/camel/routes/flexible-flow.xml
index 683737af3..808e1d8a1 100644
--- a/src/main/resources/clds/camel/routes/flexible-flow.xml
+++ b/src/main/resources/clds/camel/routes/flexible-flow.xml
@@ -98,13 +98,14 @@
 			<stop />
 		</when>
 	</route>
-
 	<route id="create-micro-service-policy">
 		<from uri="direct:create-micro-service-policy" />
 		
 		<log
 			loggingLevel="INFO"
 			message="Creating Micro Service Policy: ${header.microServicePolicy.getName()}" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Micro Service Policy')" />
 		<setBody>
 			<simple>${header.microServicePolicy.createPolicyPayload()}
 			</simple>
@@ -119,6 +120,18 @@
 			<simple>{{clamp.config.policy.url}}/policy/api/v1/policyTypes/${header.microServicePolicy.getModelType()}/versions/1.0.0/policies
 			</simple>
 		</setHeader>
+		<setHeader headerName="X-ONAP-RequestID">
+			<simple>${header.X-ONAP-REAUESTID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-InvocationID">
+			<simple>${header.X-ONAP-InvocationID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-PartnerName">
+			<simple>${header.X-ONAP-PartnerName}
+			</simple>
+		</setHeader>
 		<log
 			loggingLevel="INFO"
 			message="Endpoint to create microservice policy: ${header.CamelHttpMethod} ${header.CamelHttpUri}"></log>
@@ -127,6 +140,7 @@
 		<to
 			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('MicroService policy created successfully','INFO',${header.LoopObject})" />
 		<to uri="direct:reset-raise-http-exception-flag" />
+	<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
 	</route>
 	<route id="delete-micro-service-policy">
 		<from uri="direct:delete-micro-service-policy" />
@@ -134,6 +148,8 @@
 		<log
 			loggingLevel="INFO"
 			message="Deleting Micro Service Policy: ${header.microServicePolicy.getName()}" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Micro Service Policy')" />
 		<setBody>
 			<constant>null</constant>
 		</setBody>
@@ -144,6 +160,18 @@
 			<simple>{{clamp.config.policy.url}}/policy/api/v1/policyTypes/${header.microServicePolicy.getModelType()}/versions/1.0.0/policies/${header.microServicePolicy.getName()}
 			</simple>
 		</setHeader>
+		<setHeader headerName="X-ONAP-RequestID">
+			<simple>${header.X-ONAP-REAUESTID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-InvocationID">
+			<simple>${header.X-ONAP-InvocationID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-PartnerName">
+			<simple>${header.X-ONAP-PartnerName}
+			</simple>
+		</setHeader>
 		<log
 			loggingLevel="INFO"
 			message="Endpoint to delete microservice policy: ${header.CamelHttpMethod} ${header.CamelHttpUri}"></log>
@@ -152,6 +180,7 @@
 		<to
 			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('MicroService policy deleted successfully','INFO',${header.LoopObject})" />
 		<to uri="direct:reset-raise-http-exception-flag" />
+		<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
 	</route>
 
 	<route id="create-operational-policy">
@@ -160,6 +189,8 @@
 		<log
 			loggingLevel="INFO"
 			message="Creating Operational Policy: ${header.operationalPolicy.getName()}" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Operational Policy')" />
 		<setBody>
 			<simple>${header.operationalPolicy.createPolicyPayload()}
 			</simple>
@@ -174,6 +205,18 @@
 			<simple>{{clamp.config.policy.url}}/policy/api/v1/policyTypes/onap.policies.controloop.operational/versions/1.0.0/policies
 			</simple>
 		</setHeader>
+		<setHeader headerName="X-ONAP-RequestID">
+			<simple>${header.X-ONAP-REAUESTID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-InvocationID">
+			<simple>${header.X-ONAP-InvocationID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-PartnerName">
+			<simple>${header.X-ONAP-PartnerName}
+			</simple>
+		</setHeader>
 		<log
 			loggingLevel="INFO"
 			message="Endpoint to create operational policy: ${header.CamelHttpMethod} ${header.CamelHttpUri}"></log>
@@ -182,6 +225,7 @@
 		<to
 			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational policy created successfully','INFO',${header.LoopObject})" />
 		<to uri="direct:reset-raise-http-exception-flag" />
+		<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
 	</route>
 	<route id="delete-operational-policy">
 		<from uri="direct:delete-operational-policy" />
@@ -189,6 +233,8 @@
 		<log
 			loggingLevel="INFO"
 			message="Deleting Operational Policy: ${header.operationalPolicy.getName()}" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Operational Policy')" />
 		<setBody>
 			<constant>null</constant>
 		</setBody>
@@ -199,6 +245,18 @@
 			<simple>{{clamp.config.policy.url}}/policy/api/v1/policyTypes/onap.policies.controloop.operational/versions/1.0.0/policies/${header.operationalPolicy.getName()}
 			</simple>
 		</setHeader>
+		<setHeader headerName="X-ONAP-RequestID">
+			<simple>${header.X-ONAP-REAUESTID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-InvocationID">
+			<simple>${header.X-ONAP-InvocationID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-PartnerName">
+			<simple>${header.X-ONAP-PartnerName}
+			</simple>
+		</setHeader>
 		<log
 			loggingLevel="INFO"
 			message="Endpoint to delete operational policy: ${header.CamelHttpMethod} ${header.CamelHttpUri}"></log>
@@ -207,6 +265,7 @@
 		<to
 			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational policy deleted successfully','INFO',${header.LoopObject})" />
 		<to uri="direct:reset-raise-http-exception-flag" />
+		<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
 	</route>
 
 	<route id="create-guard-policy">
@@ -215,6 +274,8 @@
 		<log
 			loggingLevel="INFO"
 			message="Creating Guard Policy: ${header.guardPolicy.getKey()}" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Guard Policy')" />
 		<setBody>
 			<simple>${header.guardPolicy.getValue()}
 			</simple>
@@ -229,6 +290,18 @@
 			<simple>{{clamp.config.policy.url}}/policy/api/v1/policyTypes/onap.policies.controlloop.Guard/versions/1.0.0/policies
 			</simple>
 		</setHeader>
+		<setHeader headerName="X-ONAP-RequestID">
+			<simple>${header.X-ONAP-REAUESTID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-InvocationID">
+			<simple>${header.X-ONAP-InvocationID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-PartnerName">
+			<simple>${header.X-ONAP-PartnerName}
+			</simple>
+		</setHeader>
 		<log
 			loggingLevel="INFO"
 			message="Endpoint to create guard policy: ${header.CamelHttpMethod} ${header.CamelHttpUri}"></log>
@@ -237,6 +310,7 @@
 		<to
 			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Guard policy created successfully','INFO',${header.LoopObject})" />
 		<to uri="direct:reset-raise-http-exception-flag" />
+		<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
 	</route>
 	<route id="delete-guard-policy">
 		<from uri="direct:delete-guard-policy" />
@@ -244,6 +318,8 @@
 		<log
 			loggingLevel="INFO"
 			message="Deleting Guard Policy: ${header.guardPolicy.getKey()}" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Guard Policy')" />
 		<setBody>
 			<constant>null</constant>
 		</setBody>
@@ -254,6 +330,18 @@
 			<simple>{{clamp.config.policy.url}}/policy/api/v1/policyTypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${header.guardPolicy.getKey()}
 			</simple>
 		</setHeader>
+		<setHeader headerName="X-ONAP-RequestID">
+			<simple>${header.X-ONAP-REAUESTID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-InvocationID">
+			<simple>${header.X-ONAP-InvocationID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-PartnerName">
+			<simple>${header.X-ONAP-PartnerName}
+			</simple>
+		</setHeader>
 		<log
 			loggingLevel="INFO"
 			message="Endpoint to delete guard policy: ${header.CamelHttpMethod} ${header.CamelHttpUri}"></log>
@@ -262,6 +350,7 @@
 		<to
 			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Guard policy deleted successfully','INFO',${header.LoopObject})" />
 		<to uri="direct:reset-raise-http-exception-flag" />
+		<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
 	</route>
 	<route id="add-all-to-active-pdp-group">
 		<from uri="direct:add-all-to-active-pdp-group" />
@@ -269,6 +358,8 @@
 		<log
 			loggingLevel="INFO"
 			message="Adding loop policies to PDP Group: ${header.LoopObject.getName()}" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')" />
 		<setBody>
 			<simple>${header.LoopObject.createPoliciesPayloadPdpGroup()}
 			</simple>
@@ -283,6 +374,18 @@
 			<simple>{{clamp.config.policy.url}}/policy/pap/v1/pdps
 			</simple>
 		</setHeader>
+		<setHeader headerName="X-ONAP-RequestID">
+			<simple>${header.X-ONAP-REAUESTID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-InvocationID">
+			<simple>${header.X-ONAP-InvocationID}
+			</simple>
+		</setHeader>
+		<setHeader headerName="X-ONAP-PartnerName">
+			<simple>${header.X-ONAP-PartnerName}
+			</simple>
+		</setHeader>
 		<log
 			loggingLevel="INFO"
 			message="Endpoint to add policies to PDP Group: ${header.CamelHttpMethod} ${header.CamelHttpUri}"></log>
@@ -291,6 +394,7 @@
 		<to
 			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Policies pushed to PDP Group successfully','INFO',${header.LoopObject})" />
 		<to uri="direct:reset-raise-http-exception-flag" />
+		<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
 	</route>
 
 	<route id="remove-all-policy-from-active-pdp-group">
@@ -298,6 +402,8 @@
 		<log
 			loggingLevel="INFO"
 			message="Removing policies from active PDP group for loop: ${header.LoopObject.getName()}" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Removing policies PDP group')" />
 		<split>
 			<simple>${header.LoopObject.listPolicyNamesPdpGroup()}</simple>
 			<setHeader headerName="PolicyName">
@@ -313,6 +419,18 @@
 				<simple>{{clamp.config.policy.url}}/pdps/policies/${header.PolicyName}/versions/1.0.0
 				</simple>
 			</setHeader>
+			<setHeader headerName="X-ONAP-RequestID">
+				<simple>${header.X-ONAP-REAUESTID}
+				</simple>
+			</setHeader>
+			<setHeader headerName="X-ONAP-InvocationID">
+				<simple>${header.X-ONAP-InvocationID}
+				</simple>
+			</setHeader>
+			<setHeader headerName="X-ONAP-PartnerName">
+				<simple>${header.X-ONAP-PartnerName}
+				</simple>
+			</setHeader>
 			<log
 				loggingLevel="INFO"
 				message="Endpoint to delete policy from PDP Group: ${header.CamelHttpMethod} ${header.CamelHttpUri}"></log>
@@ -322,8 +440,8 @@
 				uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog(${header.PolicyName}' Policy removed from PDP Group successfully','INFO',${header.LoopObject})" />
 		</split>
 		<to uri="direct:reset-raise-http-exception-flag" />
+		<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
 	</route>
-
 	<route id="reset-raise-http-exception-flag">
 		<from uri="direct:reset-raise-http-exception-flag" />
 		<setHeader headerName="RaiseHttpExceptionFlag">
diff --git a/src/main/resources/logback-default.xml b/src/main/resources/logback-default.xml
index c2524bec2..2eba127e9 100644
--- a/src/main/resources/logback-default.xml
+++ b/src/main/resources/logback-default.xml
@@ -144,7 +144,7 @@
 		<appender-ref ref="DEBUG" />
 	</logger>
 	<!-- CLDS related loggers -->
-	<logger name="org.onap.clamp.clds" level="INFO"
+	<logger name="org.onap.clamp" level="INFO"
 		additivity="true">
 		<appender-ref ref="ERROR" />
 	</logger>