From f83411a86e2277adae69e780e8511913d61a0f17 Mon Sep 17 00:00:00 2001
From: Sirisha_Manchikanti <sirisha.manchikanti@est.tech>
Date: Fri, 7 May 2021 15:17:52 +0100
Subject: Modular structure of clamp including controlloop

This commit is the first commit that puts in multi module structure while
changing the existing CLAMP code as little as possible.
It adds a structure where common, models, participant and runtime are direct children under clamp,
and current clamp code is moved under runtime. This runtime directory will host controlloop
runtime code in later commits.

Issue-ID: POLICY-3215
Signed-off-by: Sirisha_Manchikanti <sirisha.manchikanti@est.tech>
Change-Id: I15bc8be92ed020343bff4024c4718fec462c40d7
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 .../resources/clds/camel/rest/clamp-api-v2.xml     | 1472 --------------------
 .../resources/clds/camel/rest/clds-services.xml    |   24 -
 src/main/resources/clds/camel/routes/cds-flows.xml |   64 -
 .../resources/clds/camel/routes/dcae-flows.xml     |  501 -------
 .../resources/clds/camel/routes/loop-flows.xml     |  256 ----
 .../resources/clds/camel/routes/policy-flows.xml   |  654 ---------
 .../resources/clds/camel/routes/utils-flows.xml    |   28 -
 7 files changed, 2999 deletions(-)
 delete mode 100644 src/main/resources/clds/camel/rest/clamp-api-v2.xml
 delete mode 100644 src/main/resources/clds/camel/rest/clds-services.xml
 delete mode 100644 src/main/resources/clds/camel/routes/cds-flows.xml
 delete mode 100644 src/main/resources/clds/camel/routes/dcae-flows.xml
 delete mode 100644 src/main/resources/clds/camel/routes/loop-flows.xml
 delete mode 100644 src/main/resources/clds/camel/routes/policy-flows.xml
 delete mode 100644 src/main/resources/clds/camel/routes/utils-flows.xml

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

diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
deleted file mode 100644
index 4659a90bf..000000000
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ /dev/null
@@ -1,1472 +0,0 @@
-<rests xmlns="http://camel.apache.org/schema/spring">
-    <rest>
-        <get uri="/v2/loop/getAllNames" outType="java.lang.String[]"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=getLoopNames()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET All Loop names FAILED: ${exception.stacktrace}"/>
-
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET All Loop names FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <get uri="/v2/loop/{loopName}" outType="org.onap.policy.clamp.loop.Loop"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Loop')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=getLoop(${header.loopName})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Loop request failed for loop: ${header.loopName}, ${exception.stacktrace}"/>
-
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Loop FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-
-        <post uri="/v2/loop/updateGlobalProperties/{loopName}"
-              type="com.google.gson.JsonObject" consumes="application/json"
-              outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <setHeader name="GlobalPropertiesJson">
-                        <simple>${body}</simple>
-                    </setHeader>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${header.GlobalPropertiesJson})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Global Properties UPDATED','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="UPDATE Global properties FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>UPDATE Global properties FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </post>
-        <post uri="/v2/loop/updateOperationalPolicies/{loopName}"
-              type="com.google.gson.JsonArray" consumes="application/json"
-              outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <setHeader name="OperationalPoliciesArray">
-                        <simple>${body}</simple>
-                    </setHeader>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Operational policies UPDATED','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="UPDATE Operational policies FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
-
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>UPDATE Operational policies FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </post>
-        <post uri="/v2/loop/updateMicroservicePolicy/{loopName}"
-              type="org.onap.policy.clamp.policy.microservice.MicroServicePolicy"
-              consumes="application/json"
-              outType="org.onap.policy.clamp.policy.microservice.MicroServicePolicy"
-              produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <setProperty name="MicroServicePolicyObject">
-                        <simple>${body}</simple>
-                    </setProperty>
-
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateMicroservicePolicy(${header.loopName},${exchangeProperty[MicroServicePolicyObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Micro Service policies UPDATED','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="UPDATE MicroService policy FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>UPDATE MicroService policy FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </post>
-        <put uri="/v2/loop/deploy/{loopName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="DCAE DEPLOY request for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})"/>
-                    <to uri="direct:deploy-loop"/>
-
-                    <log loggingLevel="INFO"
-                         message="DEPLOY request successfully executed for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="DEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>DEPLOY request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <put uri="/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName|microServicePolicyName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="Refresh Micro Service Policy UI for loop: ${header.loopName} and ${header.microServicePolicyName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Micro Service Policy UI request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=refreshMicroServicePolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.microServicePolicyName})"/>
-                    <log loggingLevel="INFO"
-                         message="REFRESH Micro Service policy request successfully executed for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Micro Service policy request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>REFRESH json schema request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <put uri="/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName|operationalPolicyName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="Refresh Operational Policy UI for loop: ${header.loopName} and ${header.operationalPolicyName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Operational Policy UI request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=refreshOperationalPolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.operationalPolicyName})"/>
-                    <log loggingLevel="INFO"
-                         message="REFRESH operational policy request successfully executed for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH operational policy request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>REFRESH json schema request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <put uri="/v2/loop/undeploy/{loopName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="DCAE UNDEPLOY request for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})"/>
-                    <to uri="direct:undeploy-loop"/>
-
-                    <log loggingLevel="INFO"
-                         message="UNDEPLOY request successfully executed for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="UNDEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>UNDEPLOY request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <put uri="/v2/loop/stop/{loopName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="STOP request for loop: ${header.loopName}"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'STOP request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request','INFO',${exchangeProperty[loopObject]})"/>
-
-                    <to uri="direct:remove-all-policy-from-active-pdp-group"/>
-                    <log loggingLevel="INFO"
-                         message="STOP request successfully executed for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="STOP request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>STOP request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <put uri="/v2/loop/restart/{loopName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="RESTART request for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request','INFO',${exchangeProperty[loopObject]})"/>
-
-                    <to uri="direct:add-policies-from-loop-to-pdp-group"/>
-                    <log loggingLevel="INFO"
-                         message="RESTART request successfully executed for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="RESTART request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>RESTART request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <put uri="/v2/loop/submit/{loopName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="POLICY SUBMIT request for loop: ${header.loopName}"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'POLICY SUBMIT request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">false</simple>
-                    </setProperty>
-                    <to uri="direct:remove-all-policy-from-active-pdp-group"/>
-                    <log loggingLevel="INFO"
-                         message="Processing all MICRO-SERVICES policies defined in loop ${exchangeProperty[loopObject].getName()}"/>
-                    <split>
-                        <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-                        </simple>
-                        <setProperty name="policy">
-                            <simple>${body}</simple>
-                        </setProperty>
-                        <log loggingLevel="INFO"
-                             message="Processing Micro Service Policy: ${exchangeProperty[policy].getName()}"/>
-                        <setProperty name="raiseHttpExceptionFlag">
-                            <simple resultType="java.lang.Boolean">false</simple>
-                        </setProperty>
-                        <to uri="direct:delete-policy-from-loop-object"/>
-                        <to uri="direct:create-policy-from-loop-object"/>
-                    </split>
-                    <log loggingLevel="INFO"
-                         message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}"/>
-                    <split>
-                        <simple>${exchangeProperty[loopObject].getOperationalPolicies()}
-                        </simple>
-                        <setProperty name="policy">
-                            <simple>${body}</simple>
-                        </setProperty>
-                        <log loggingLevel="INFO"
-                             message="Processing Operational Policy: ${exchangeProperty[policy].getName()}"/>
-                        <setProperty name="raiseHttpExceptionFlag">
-                            <simple resultType="java.lang.Boolean">false</simple>
-                        </setProperty>
-
-                        <to uri="direct:delete-policy-from-loop-object"/>
-                        <to uri="direct:create-policy-from-loop-object"/>
-                    </split>
-
-                    <delay>
-                        <constant>3000</constant>
-                    </delay>
-
-                    <to uri="direct:add-policies-from-loop-to-pdp-group"/>
-
-                    <log loggingLevel="INFO"
-                         message="SUBMIT request successfully executed for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="SUBMIT request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>SUBMIT request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <put uri="/v2/loop/delete/{loopName}">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="DELETE request for loop: ${header.loopName}"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request','INFO',${exchangeProperty[loopObject]})"/>
-                    <to uri="direct:undeploy-loop"/>
-                    <to uri="direct:remove-all-policy-from-active-pdp-group"/>
-                    <log loggingLevel="INFO"
-                         message="Deleting all MICRO-SERVICES policies defined in loop ${exchangeProperty[loopObject].getName()}"/>
-                    <split>
-                        <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-                        </simple>
-                        <setProperty name="policy">
-                            <simple>${body}</simple>
-                        </setProperty>
-                        <log loggingLevel="INFO"
-                             message="Deleting Micro Service Policy: ${exchangeProperty[policy].getName()}"/>
-                        <setProperty name="raiseHttpExceptionFlag">
-                            <simple resultType="java.lang.Boolean">false</simple>
-                        </setProperty>
-                        <to uri="direct:delete-policy-from-loop-object"/>
-                    </split>
-                    <log loggingLevel="INFO"
-                         message="Deleting all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}"/>
-                    <split>
-                        <simple>${exchangeProperty[loopObject].getOperationalPolicies()}
-                        </simple>
-                        <setProperty name="policy">
-                            <simple>${body}</simple>
-                        </setProperty>
-                        <log loggingLevel="INFO"
-                             message="Deleting Operational Policy: ${exchangeProperty[policy].getName()}"/>
-                        <setProperty name="raiseHttpExceptionFlag">
-                            <simple resultType="java.lang.Boolean">false</simple>
-                        </setProperty>
-                        <to uri="direct:delete-policy-from-loop-object"/>
-                    </split>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=deleteLoop(${header.loopName})"/>
-                    <log loggingLevel="INFO"
-                         message="DELETE request successfully executed for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="DELETE request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>DELETE request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <get uri="/v2/loop/getstatus/{loopName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName"/>
-                <doTry>
-                    <log loggingLevel="INFO"
-                         message="GET STATUS request for loop: ${header.loopName}"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET STATUS request')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request','INFO',${exchangeProperty[loopObject]})"/>
-                    <to uri="direct:update-policy-status-for-loop"/>
-                    <to uri="direct:update-dcae-status-for-loop"/>
-                    <to uri="direct:update-loop-state"/>
-
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET STATUS request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
-                    </doCatch>
-                    <doFinally>
-                        <setBody>
-                            <simple>${exchangeProperty[loopObject]}</simple>
-                        </setBody>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>200</constant>
-                        </setHeader>
-                    </doFinally>
-                </doTry>
-            </route>
-        </get>
-
-        <put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add operational Policy')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=addOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="ADD operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>ADD Operational policy request FAILED for loop: ${header.loopName},
-                                ${exception.message}"
-                            </simple>
-                        </setBody>
-
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <put uri="/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}"
-             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion|policyName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REMOVE operational Policy')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to uri="direct:load-loop"/>
-                    <setProperty name="policyName">
-                        <simple>${header.policyName}</simple>
-                    </setProperty>
-                    <setProperty name="policy">
-                        <simple>${exchangeProperty[loopObject].getOperationalPolicy(header.policyName)}</simple>
-                    </setProperty>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">false</simple>
-                    </setProperty>
-                    <to uri="direct:remove-one-policy-from-active-pdp-group"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">false</simple>
-                    </setProperty>
-                    <to uri="direct:delete-policy-from-loop-object"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=removeOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="REMOVE operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>REMOVE Operational policy request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-        <post
-                uri="/v2/loop/create/{loopName}?templateName={templateName}"
-                outType="org.onap.policy.clamp.loop.Loop" consumes="application/json"
-                produces="application/json">
-            <route>
-                <removeHeaders
-                        pattern="*"
-                        excludePattern="loopName|templateName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Create Loop')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopController?method=createLoop(${header.loopName}, ${header.templateName})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="CREATE Loop from Template request failed for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>CREATE Loop from template FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </post>
-        <get uri="/v2/templates"
-             outType="org.onap.policy.clamp.loop.template.LoopTemplate"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET ALL templates request failed: ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET ALL templates FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <get uri="/v2/templates/{templateName}"
-             outType="org.onap.policy.clamp.loop.template.LoopTemplate"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*"
-                               excludePattern="templateName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Template request failed for template: ${header.templateName},  ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Template FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <get uri="/v2/templates/names" outType="java.lang.String[]"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET All Template names request failed for template:  ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET All Template names FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-
-        <!-- NON LOOP related endpoints -->
-        <get uri="/v2/dictionary"
-             outType="org.onap.policy.clamp.tosca.Dictionary" produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionaries')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getAllDictionaries()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Dictionary request failed: ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Dictionary FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-
-        <get uri="/v2/dictionary/secondary/names"
-             outType="java.lang.String[]" produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Secondary Dictionary Level Names')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getAllSecondaryLevelDictionaryNames()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Dictionary request failed: ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Dictionary FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <get uri="/v2/dictionary/{dictionaryName}"
-             outType="org.onap.policy.clamp.tosca.Dictionary" produces="application/json">
-            <route>
-                <removeHeaders pattern="*"
-                               excludePattern="dictionaryName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionary Elements for a Dictionary Name')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getDictionary(${header.dictionaryName})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Dictionary request failed for: ${header.dictionaryName}, ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Dictionary FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <put uri="/v2/dictionary" type="org.onap.policy.clamp.tosca.Dictionary"
-             outType="org.onap.policy.clamp.tosca.Dictionary" consumes="application/json"
-             produces="application/json">
-            <route>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
-                    <setProperty name="DictionaryObject">
-                        <simple>${body}</simple>
-                    </setProperty>
-                    <to
-                            uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=saveOrUpdateDictionary(${exchangeProperty[DictionaryObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="PUT Dictionary request failed for: ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>PUT Dictionary FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-
-        <put uri="/v2/dictionary/{name}"
-             type="org.onap.policy.clamp.tosca.Dictionary"
-             outType="org.onap.policy.clamp.tosca.Dictionary" consumes="application/json"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="name"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
-                    <setProperty name="DictionaryObject">
-                        <simple>${body}</simple>
-                    </setProperty>
-                    <to
-                            uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=saveOrUpdateDictionaryElement(${header.name}, ${exchangeProperty[DictionaryObject]})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="PUT Dictionary request failed for: ${header.name}, ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>PUT Dictionary FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-
-        <delete uri="/v2/dictionary/{name}" produces="application/json">
-            <route>
-                <removeHeaders pattern="*" excludePattern="name"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=deleteDictionary(${header.name})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="DELETE Dictionary request failed for: ${header.name}, ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>DELETE Dictionary FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </delete>
-
-        <delete uri="/v2/dictionary/{name}/elements/{shortName}"
-                produces="application/json">
-            <route>
-                <removeHeaders pattern="*"
-                               excludePattern="name|shortName"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary Element')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=deleteDictionaryElement(${header.name}, ${header.shortName})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="DELETE Dictionary element request failed for: ${header.name}, ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>DELETE Dictionary element FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </delete>
-
-        <get uri="/v2/policyToscaModels"
-             outType="org.onap.policy.clamp.loop.template.PolicyModel"
-             produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Tosca Policy Models')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getAllPolicyModels()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Policy Models request failed for: ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Policy models FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <get uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
-             outType="com.google.gson.JsonObject" produces="application/json">
-            <route>
-                <removeHeaders pattern="*"
-                               excludePattern="policyModelType|policyModelVersion"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name/Version')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getPolicyModelJson(${header.policyModelType},${header.policyModelVersion})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Policy Model request failed for type: ${header.policyModelType}, ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Policy model FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-        <get uri="/v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}"
-             outType="java.lang.String" produces="application/json">
-            <route>
-                <removeHeaders pattern="*"
-                               excludePattern="policyModelType|policyModelVersion"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name/Version')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType},${header.policyModelVersion})"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Policy Model YAML request failed for type: ${header.policyModelType}, ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Policy model YAML FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-
-        <!-- Policy Related endpoints, not related to LOOP  -->
-        <get uri="/v2/policies" outType="com.google.gson.JsonObject" produces="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Policies List ')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','read')"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
-                    <to uri="direct:get-all-policies"/>
-                    <setProperty name="policiesListResponse">
-                        <simple>${body}</simple>
-                    </setProperty>
-                    <to uri="direct:get-all-pdp-groups"/>
-                    <setProperty name="pdpGroupInfoResponse">
-                        <simple>${body}</simple>
-                    </setProperty>
-                    <setBody>
-                        <method ref="org.onap.policy.clamp.policy.pdpgroup.PoliciesPdpMerger"
-                                method="mergePoliciesAndPdpGroupStates(${exchangeProperty[policiesListResponse]},${exchangeProperty[pdpGroupInfoResponse]})"/>
-                    </setBody>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="GET Policies list JSON request failed: ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>GET Policies list JSON FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </get>
-
-        <!-- Create a new policy -->
-        <post uri="/v2/policies/{policyModelType}/{policyModelVersion}/{policyName}/{policyVersion}"
-              type="com.google.gson.JsonElement"
-              consumes="application/json"
-              outType="com.google.gson.JsonObject"
-              produces="application/json">
-            <route>
-                <removeHeaders pattern="*"
-                               excludePattern="policyModelType|policyModelVersion|policyName|policyVersion"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'CREATE a new Policy ')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
-                    <setProperty name="policyModelType">
-                        <simple>${header.policyModelType}</simple>
-                    </setProperty>
-                    <setProperty name="policyModelVersion">
-                        <simple>${header.policyModelVersion}</simple>
-                    </setProperty>
-                    <setProperty name="policyProperties">
-                        <simple>${body}</simple>
-                    </setProperty>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType},${header.policyModelVersion})"/>
-                    <setBody>
-                        <method ref="org.onap.policy.clamp.policy.PolicyPayload"
-                                method="createPolicyPayload(${header.policyModelType}, ${header.policyModelVersion},
-                                    ${header.policyName}, ${header.policyVersion}, ${exchangeProperty[policyProperties]}, ${body})"/>
-                    </setBody>
-                    <to uri="direct:create-policy"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="CREATE Policy request failed for type: ${header.policyModelType}/${header.policyModelVersion}, ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>CREATE Policy FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </post>
-
-        <delete uri="/v2/policies/{policyModelType}/{policyModelVersion}/{policyName}/{policyVersion}">
-            <route>
-                <removeHeaders pattern="*"
-                               excludePattern="policyModelType|policyModelVersion|policyName|policyVersion"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DELETE a Policy ')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
-                    <setProperty name="policyModelType">
-                        <simple>${header.policyModelType}</simple>
-                    </setProperty>
-                    <setProperty name="policyModelVersion">
-                        <simple>${header.policyModelVersion}</simple>
-                    </setProperty>
-                    <setProperty name="policyName">
-                        <simple>${header.policyName}</simple>
-                    </setProperty>
-                    <setProperty name="policyVersion">
-                        <simple>${header.policyVersion}</simple>
-                    </setProperty>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">false</simple>
-                    </setProperty>
-                    <to uri="direct:undeploy-one-policy-from-pap"/>
-                    <to uri="direct:delete-policy"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="DELETE Policy request failed for policy: ${header.policyName}/${header.policyVersion}, ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>DELETE Policy FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </delete>
-
-        <put uri="/v2/policies/pdpDeployment" type="com.google.gson.JsonElement" consumes="application/json">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Pdp group deployment update')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
-                    <setBody>
-                        <method ref="org.onap.policy.clamp.policy.pdpgroup.PdpGroupPayload"
-                                method="generatePdpGroupPayloadFromList(${body})"/>
-                    </setBody>
-                    <log loggingLevel="INFO"
-                         message="PDP Group DEPLOY request payload: ${body}"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
-                    <to uri="direct:add-multiple-policies-to-pdp-group"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="PDP Group deployment request failed: ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>PDP Group deployment request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </put>
-
-        <post uri="/v2/policies/policytype" type="java.lang.String" consumes="plain/text">
-            <route>
-                <removeHeaders pattern="*"/>
-                <doTry>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Create policy type')"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
-                    <setProperty name="raiseHttpExceptionFlag">
-                        <simple resultType="java.lang.Boolean">true</simple>
-                    </setProperty>
-                    <to uri="direct:create-policy-type"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.policy.downloader.PolicyEngineController?method=synchronizeAllPolicies()"/>
-                    <to
-                            uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
-                    <doCatch>
-                        <exception>java.lang.Exception</exception>
-                        <handled>
-                            <constant>true</constant>
-                        </handled>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
-                        <log loggingLevel="ERROR"
-                             message="Create policy type request failed: ${exception.stacktrace}"/>
-                        <setHeader name="CamelHttpResponseCode">
-                            <constant>500</constant>
-                        </setHeader>
-                        <setBody>
-                            <simple>Create policy type request FAILED</simple>
-                        </setBody>
-                    </doCatch>
-                </doTry>
-            </route>
-        </post>
-
-        <get uri="/v2/clampInformation" outType="org.onap.policy.clamp.clds.model.ClampInformation"
-             produces="application/json">
-            <route>
-                <to
-                        uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=getClampInformation()"/>
-            </route>
-        </get>
-    </rest>
-</rests>
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
deleted file mode 100644
index aa4c3cbee..000000000
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<rests xmlns="http://camel.apache.org/schema/spring">
-	<rest>
-		<get uri="/v1/healthcheck" produces="application/json"
-			outType="org.onap.policy.clamp.clds.model.CldsHealthCheck">
-			<route>
-				<setBody>
-					<method ref="org.onap.policy.clamp.clds.service.CldsHealthcheckService"
-						method="gethealthcheck()" />
-				</setBody>
-				<when>
-					<simple> ${body} == 'NOT-OK'</simple>
-					<setHeader name="CamelHttpResponseCode">
-						<constant>404</constant>
-					</setHeader>
-					<log loggingLevel="ERROR" message="HealthCheck failed" />
-				</when>
-			</route>
-		</get>
-
-		<get uri="/v1/user/getUser" produces="text/plain">
-			<to uri="bean:org.onap.policy.clamp.authorization.UserService?method=getUser()" />
-		</get>
-	</rest>
-</rests>
diff --git a/src/main/resources/clds/camel/routes/cds-flows.xml b/src/main/resources/clds/camel/routes/cds-flows.xml
deleted file mode 100644
index 10fcb091e..000000000
--- a/src/main/resources/clds/camel/routes/cds-flows.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <route id="get-blueprint-workflow-list">
-        <from uri="direct:get-blueprint-workflow-list"/>
-        <log loggingLevel="INFO"
-             message="Getting blueprint workflow list from CDS"/>
-        <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting workflow list from CDS')"/>
-        <doTry>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="Content-Type">
-                <constant>application/json</constant>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to query workflows from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}"></log>
-            <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <doCatch>
-                <exception>java.lang.Exception</exception>
-                <handled>
-                    <constant>true</constant>
-                </handled>
-
-                <log loggingLevel="ERROR"
-                     message="GET CDS request FAILED: ${exception.stacktrace}" />
-            </doCatch>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-    <route id="get-blueprint-workflow-input-properties">
-        <from uri="direct:get-blueprint-workflow-input-properties"/>
-        <log loggingLevel="INFO"
-             message="Getting blueprint input properties for workflow"/>
-        <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting input properties for workflow')"/>
-        <doTry>
-            <setHeader name="CamelHttpMethod">
-                <constant>POST</constant>
-            </setHeader>
-            <setHeader name="Content-Type">
-                <constant>application/json</constant>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to query input properties for workflow from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec"></log>
-            <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <doCatch>
-                <exception>java.lang.Exception</exception>
-                <handled>
-                    <constant>true</constant>
-                </handled>
-
-                <log loggingLevel="ERROR"
-                     message="GET CDS workflow input request FAILED: ${exception.stacktrace}" />
-            </doCatch>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-</routes>
\ No newline at end of file
diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/src/main/resources/clds/camel/routes/dcae-flows.xml
deleted file mode 100644
index d74bd91bf..000000000
--- a/src/main/resources/clds/camel/routes/dcae-flows.xml
+++ /dev/null
@@ -1,501 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <route id="deploy-loop">
-        <from uri="direct:deploy-loop"/>
-        <choice>
-            <when>
-                <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
-                </simple>
-                <setProperty name="raiseHttpExceptionFlag">
-                    <simple resultType="java.lang.Boolean">true</simple>
-                </setProperty>
-                <to uri="direct:deploy-loop-single-blueprint"/>
-            </when>
-            <when>
-                <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
-                </simple>
-                <setProperty name="raiseHttpExceptionFlag">
-                    <simple resultType="java.lang.Boolean">true</simple>
-                </setProperty>
-                <to uri="direct:deploy-loop-multi-blueprint"/>
-            </when>
-        </choice>
-    </route>
-    <route id="deploy-loop-multi-blueprint">
-        <from uri="direct:deploy-loop-multi-blueprint"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Deploying the blueprints for loop: ${exchangeProperty[loopObject].getName()}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop with multiple blueprints')"/>
-            <split>
-                <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-                </simple>
-                <setProperty name="microServicePolicy">
-                    <simple>${body}</simple>
-                </setProperty>
-                <log
-                        loggingLevel="INFO"
-                        message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}"/>
-                <setProperty name="raiseHttpExceptionFlag">
-                    <simple resultType="java.lang.Boolean">false</simple>
-                </setProperty>
-                <setBody>
-                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                            method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy]})"/>
-                </setBody>
-                <setProperty name="dcaeDeploymentId">
-                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                            method="generateDeploymentId()"/>
-                </setProperty>
-                <setHeader name="CamelHttpMethod">
-                    <constant>PUT</constant>
-                </setHeader>
-                <setHeader name="Content-Type">
-                    <constant>application/json</constant>
-                </setHeader>
-                <setHeader name="X-ONAP-RequestID">
-                    <simple>${exchangeProperty[X-ONAP-RequestID]}
-                    </simple>
-                </setHeader>
-                <setHeader name="X-ONAP-InvocationID">
-                    <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                    </simple>
-                </setHeader>
-                <setHeader name="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;authenticationPreemptive=true&amp;connectionClose=true"/>
-                <convertBodyTo type="java.lang.String"/>
-                <setProperty name="dcaeResponse">
-                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                            method="convertDcaeResponse(${body})"/>
-                </setProperty>
-                <setProperty name="dcaeStatusUrl">
-                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                            method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
-                </setProperty>
-                <to
-                        uri="bean:org.onap.policy.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Deploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/>
-            </split>
-            <doCatch>
-                <exception>java.lang.Exception</exception>
-                <handled>
-                    <constant>false</constant>
-                </handled>
-                <setProperty name="logMessage">
-                    <simple>DEPLOY micro service failed
-                        (MicroService name:${exchangeProperty[microServicePolicy].getName()}),
-                        Dep-id:${exchangeProperty[dcaeDeploymentId]},
-                        StatusUrl:${exchangeProperty[dcaeStatusUrl]})
-                    </simple>
-                </setProperty>
-                <setProperty name="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.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-    <route id="deploy-loop-single-blueprint">
-        <from uri="direct:deploy-loop-single-blueprint"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Deploying the loop: ${exchangeProperty[loopObject].getName()}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop')"/>
-            <setBody>
-                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                        method="getDeployPayload(${exchangeProperty[loopObject]})"/>
-            </setBody>
-            <setProperty name="dcaeDeploymentId">
-                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                        method="generateDeploymentId()"/>
-            </setProperty>
-            <setHeader name="CamelHttpMethod">
-                <constant>PUT</constant>
-            </setHeader>
-            <setHeader name="Content-Type">
-                <constant>application/json</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="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;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <setProperty name="dcaeResponse">
-                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                        method="convertDcaeResponse(${body})"/>
-            </setProperty>
-
-
-            <setProperty name="dcaeStatusUrl">
-                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                        method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
-            </setProperty>
-            <to
-                    uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty name="logMessage">
-                    <simple>DEPLOY loop status
-                        (Dep-id:${exchangeProperty[dcaeDeploymentId]},
-                        StatusUrl:${exchangeProperty[dcaeStatusUrl]})
-                    </simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>DCAE</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-    <route id="undeploy-loop">
-        <from uri="direct:undeploy-loop"/>
-        <choice>
-            <when>
-                <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
-                </simple>
-                <setProperty name="raiseHttpExceptionFlag">
-                    <simple resultType="java.lang.Boolean">true</simple>
-                </setProperty>
-                <to uri="direct:undeploy-loop-single-blueprint"/>
-            </when>
-            <when>
-                <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
-                </simple>
-                <setProperty name="raiseHttpExceptionFlag">
-                    <simple resultType="java.lang.Boolean">true</simple>
-                </setProperty>
-                <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.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop with multiple blueprints')"/>
-            <split>
-                <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-                </simple>
-                <setProperty name="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.policy.clamp.loop.components.external.DcaeComponent"
-                                    method="getUndeployPayload(${exchangeProperty[microServicePolicy]})"/>
-                        </setBody>
-                        <setHeader name="CamelHttpMethod">
-                            <constant>DELETE</constant>
-                        </setHeader>
-                        <setHeader name="Content-Type">
-                            <constant>application/json</constant>
-                        </setHeader>
-                        <setHeader name="X-ONAP-RequestID">
-                            <simple>${exchangeProperty[X-ONAP-RequestID]}
-                            </simple>
-                        </setHeader>
-                        <setHeader name="X-ONAP-InvocationID">
-                            <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                            </simple>
-                        </setHeader>
-                        <setHeader name="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;authenticationPreemptive=true&amp;connectionClose=true"/>
-                        <convertBodyTo type="java.lang.String"/>
-                        <setProperty name="dcaeResponse">
-                            <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                                    method="convertDcaeResponse(${body})"/>
-                        </setProperty>
-                        <setProperty name="dcaeStatusUrl">
-                            <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                                    method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
-                        </setProperty>
-                        <to
-                                uri="bean:org.onap.policy.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},null,${exchangeProperty[dcaeStatusUrl]})"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/>
-                    </when>
-                    <otherwise>
-                        <log loggingLevel="WARN"
-                             message="Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !','WARNING','DCAE',${exchangeProperty[loopObject]})"/>
-                    </otherwise>
-                </choice>
-            </split>
-            <doCatch>
-                <exception>java.lang.Exception</exception>
-                <handled>
-                    <constant>false</constant>
-                </handled>
-                <setProperty name="logMessage">
-                    <simple>UNDEPLOY micro service failed
-                        (MicroService name:${exchangeProperty[microServicePolicy].getName()})
-                    </simple>
-                </setProperty>
-                <setProperty name="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.policy.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
-                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop')"/>
-        <choice>
-            <when>
-                <simple>${exchangeProperty[loopObject].getDcaeDeploymentId()} != null</simple>
-                <doTry>
-                    <setBody>
-                        <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                                method="getUndeployPayload(${exchangeProperty[loopObject]})"/>
-                    </setBody>
-                    <setHeader name="CamelHttpMethod">
-                        <constant>DELETE</constant>
-                    </setHeader>
-                    <setHeader name="Content-Type">
-                        <constant>application/json</constant>
-                    </setHeader>
-
-                    <setHeader name="X-ONAP-RequestID">
-                        <simple>${exchangeProperty[X-ONAP-RequestID]}
-                        </simple>
-                    </setHeader>
-                    <setHeader name="X-ONAP-InvocationID">
-                        <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                        </simple>
-                    </setHeader>
-                    <setHeader name="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[loopObject].getDcaeDeploymentId()}"></log>
-                    <toD
-                            uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].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;authenticationPreemptive=true&amp;connectionClose=true"/>
-                    <convertBodyTo type="java.lang.String"/>
-                    <setProperty name="dcaeResponse">
-                        <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                                method="convertDcaeResponse(${body})"/>
-                    </setProperty>
-                    <setProperty name="dcaeStatusUrl">
-                        <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                                method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
-                    </setProperty>
-                    <to
-                            uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},null,${exchangeProperty[dcaeStatusUrl]})"/>
-                    <doFinally>
-                        <to uri="direct:reset-raise-http-exception-flag"/>
-                        <to
-                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                        <setProperty name="logMessage">
-                            <simple>UNDEPLOY loop status</simple>
-                        </setProperty>
-                        <setProperty name="logComponent">
-                            <simple>DCAE</simple>
-                        </setProperty>
-                        <to uri="direct:dump-loop-log-http-response"/>
-                    </doFinally>
-                </doTry>
-            </when>
-            <otherwise>
-                <log loggingLevel="WARN"
-                     message="Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !"/>
-                <to
-                        uri="bean:org.onap.policy.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>
-    <route id="get-dcae-deployment-status">
-        <from uri="direct:get-dcae-deployment-status"/>
-        <log loggingLevel="INFO"
-             message="Getting DCAE deployment status for loop: ${exchangeProperty[loopObject].getName()} - ${exchangeProperty[dcaeComponent].getComponentName()}"/>
-        <to
-                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting Deployment status')"/>
-        <doTry>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to query microservice deployment status: ${exchangeProperty[getStatusUrlModified]}"></log>
-            <choice>
-                <when>
-                    <simple>${exchangeProperty[getStatusUrl].contains("?")} == true
-                    </simple>
-                    <setProperty name="uriSeparator">
-                        <simple>&amp;</simple>
-                    </setProperty>
-                </when>
-                <otherwise>
-                    <setProperty name="uriSeparator">
-                        <simple>?</simple>
-                    </setProperty>
-                </otherwise>
-            </choice>
-            <toD
-                    uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <doCatch>
-                <exception>java.lang.Exception</exception>
-                <handled>
-                    <constant>true</constant>
-                </handled>
-
-                <log loggingLevel="ERROR"
-                     message="GET DCAE deployment request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET DCAE deployment request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
-            </doCatch>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty name="logMessage">
-                    <simple>DCAE deployment status</simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>DCAE</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-    <route id="get-dcae-blueprint-inventory">
-        <from uri="direct:get-dcae-blueprint-inventory"/>
-        <log loggingLevel="INFO"
-             message="Getting DCAE blueprint id in inventory"/>
-        <to
-                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting blueprint id in inventory')"/>
-        <doTry>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to query Dcae inventory Loop status: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
-            <toD
-                    uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&amp;asdcServiceId=${exchangeProperty[blueprintServiceId]}&amp;typeName=${exchangeProperty[blueprintName]}&amp;bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-
-    </route>
-    <route id="get-all-dcae-blueprint-inventory">
-        <from uri="direct:get-all-dcae-blueprint-inventory"/>
-        <log loggingLevel="INFO"
-             message="Getting all DCAE blueprint from inventory"/>
-        <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting all blueprint from inventory')"/>
-        <doTry>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to query Blueprints from DCAE inventory: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
-            <toD uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types;bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <setProperty name="dcaeResponseList">
-                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-                        method="convertToDcaeInventoryResponse(${body})"/>
-            </setProperty>
-            <split>
-                <simple>${exchangeProperty[dcaeResponseList]}</simple>
-                <convertBodyTo type="org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse"/>
-                <setProperty name="dcaeResponse">
-                    <simple>${body}</simple>
-                </setProperty>
-                <to uri="bean:org.onap.policy.clamp.clds.model.dcae.DcaeInventoryCache?method=addDcaeInventoryResponse(${exchangeProperty[dcaeResponse]})"/>
-            </split>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-</routes>
\ No newline at end of file
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml
deleted file mode 100644
index 4a3cc84b2..000000000
--- a/src/main/resources/clds/camel/routes/loop-flows.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-	<route id="load-loop">
-		<from uri="direct:load-loop" />
-		<setBody>
-			<simple>${header.loopName}</simple>
-		</setBody>
-		<setProperty name="loopObject">
-			<method ref="org.onap.policy.clamp.loop.LoopService" method="getLoop" />
-		</setProperty>
-
-		<when>
-			<simple>${exchangeProperty[loopObject]} == null</simple>
-			<setHeader name="CamelHttpResponseCode">
-				<constant>404</constant>
-			</setHeader>
-			<log loggingLevel="WARN" message="Loop not found in database: ${body}" />
-			<stop />
-		</when>
-	</route>
-	<route id="update-policy-status-for-loop">
-		<from uri="direct:update-policy-status-for-loop" />
-		<setProperty name="policyComponent">
-			<simple>${exchangeProperty[loopObject].getComponent('POLICY')}
-			</simple>
-		</setProperty>
-		<setProperty name="policyFound">
-			<simple resultType="java.lang.Boolean">true</simple>
-		</setProperty>
-		<setProperty name="policyDeployed">
-			<simple resultType="java.lang.Boolean">true</simple>
-		</setProperty>
-		<log loggingLevel="INFO"
-			message="Processing all MICRO-SERVICES policies defined in loop ${exchangeProperty[loopObject].getName()}" />
-		<split>
-			<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-			</simple>
-			<setProperty name="policyName">
-				<simple>${body.getName()}</simple>
-			</setProperty>
-			<setProperty name="policyType">
-				<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
-			</setProperty>
-			<setProperty name="policyTypeVersion">
-				<simple>${body.getPolicyModel().getVersion()}</simple>
-			</setProperty>
-			<setProperty name="policyPdpGroup">
-				<simple>${body.getPdpGroup()}</simple>
-			</setProperty>
-			<setProperty name="policyVersion">
-				<simple>1.0.0</simple>
-			</setProperty>
-			<setBody>
-				<constant>null</constant>
-			</setBody>
-			<log loggingLevel="INFO"
-				message="Processing Micro Service Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
-			<to uri="direct:verify-one-policy" />
-		</split>
-		<log loggingLevel="INFO"
-			message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
-		<split>
-			<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
-			</simple>
-			<setProperty name="policyName">
-				<simple>${body.getName()}</simple>
-			</setProperty>
-			<setProperty name="policyType">
-				<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
-			</setProperty>
-			<setProperty name="policyTypeVersion">
-				<simple>${body.getPolicyModel().getVersion()}</simple>
-			</setProperty>
-		 	<setProperty name="policyVersion">
-				<simple>1.0.0</simple>
-			</setProperty>
-			<setProperty name="policyPdpGroup">
-				<simple>${body.getPdpGroup()}</simple>
-			</setProperty>
-			<setBody>
-				<constant>null</constant>
-			</setBody>
-			<log loggingLevel="INFO"
-				message="Processing Operational Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
-			<to uri="direct:verify-one-policy" />
-		</split>
-		<setProperty name="policyState">
-			<simple> ${exchangeProperty[policyComponent].getState()}
-			</simple>
-		</setProperty>
-		<log loggingLevel="INFO"
-			message="Policy state set to: ${exchangeProperty[policyState].getStateName()}" />
-		<to
-			uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Policy state set to: ${exchangeProperty[policyState].getStateName()}','INFO','POLICY',${exchangeProperty[loopObject]})" />
-	</route>
-	<route id="update-dcae-status-for-loop">
-		<from uri="direct:update-dcae-status-for-loop" />
-		<log loggingLevel="INFO"
-			message="Updating DCAE status for loop: ${exchangeProperty[loopObject].getName()}" />
-		<choice>
-			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
-				</simple>
-					<setProperty name="dcaeComponent">
-						<simple>${exchangeProperty[loopObject].getComponent('DCAE')}</simple>
-					</setProperty>
-				<when>
-					<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()} != null
-					</simple>
-					<setProperty name="getStatusUrl">
-						<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}</simple>
-					</setProperty>
-					<setProperty name="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 name="dcaeResponse">
-							<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-								method="convertDcaeResponse(${body})" />
-						</setProperty>
-					</when>
-				</when>
-				<setProperty name="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.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - message: ${exchangeProperty[dcaeResponse].getError()}','INFO','DCAE',${exchangeProperty[loopObject]})" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
-				</simple>
-				<split>
-					<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-					</simple>
-					<setProperty name="microServicePolicy">
-						<simple>${body}</simple>
-					</setProperty>
-					<setProperty name="dcaeComponent">
-						<simple>${exchangeProperty[loopObject].getComponent('DCAE_' + ${exchangeProperty[microServicePolicy].getName()})}</simple>
-					</setProperty>
-					<when>
-						<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()} != null
-						</simple>
-						<setProperty name="getStatusUrl">
-							<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()}</simple>
-						</setProperty>
-						<setProperty name="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 name="dcaeResponse">
-								<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
-									method="convertDcaeResponse(${body})" />
-							</setProperty>
-						</when>
-					</when>
-					<setProperty name="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.policy.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"
-			message="Updating status for loop: ${exchangeProperty[loopObject].getName()}" />
-		<choice>
-			<when>
-				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
-					'BLUEPRINT_DEPLOYED' &amp;&amp; ${exchangeProperty['policyState'].getStateName()}
-					== 'NOT_SENT'
-				</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'DESIGN')" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['dcaeState'].getStateName()} == 'IN_ERROR' ||
-					${exchangeProperty['dcaeState'].getStateName()} ==
-					'MICROSERVICE_INSTALLATION_FAILED'
-				</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'IN_ERROR')" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
-					'MICROSERVICE_UNINSTALLATION_FAILED' ||
-					${exchangeProperty['policyState'].getStateName()} == 'IN_ERROR'
-				</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'IN_ERROR')" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
-					'MICROSERVICE_INSTALLED_SUCCESSFULLY' &amp;&amp;
-					${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
-				</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'RUNNING')" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
-					'MICROSERVICE_INSTALLED_SUCCESSFULLY' &amp;&amp;
-					${exchangeProperty['policyState'].getStateName()} == 'SENT'
-				</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'STOPPED')" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
-					'BLUEPRINT_DEPLOYED' || ${exchangeProperty['dcaeState'].getStateName()} ==
-					'MICROSERVICE_UNINSTALLED_SUCCESSFULLY' &amp;&amp;
-					${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
-				</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'SUBMITTED')" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
-					'PROCESSING_MICROSERVICE_INSTALLATION' ||
-					${exchangeProperty['dcaeState'].getStateName()} ==
-					'PROCESSING_MICROSERVICE_UNINSTALLATION' &amp;&amp;
-					${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
-				</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'WAITING')" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
-					'MICROSERVICE_INSTALLED_SUCCESSFULLY' &amp;&amp;
-					${exchangeProperty['policyState'].getStateName()} != 'NOT_SENT'
-				</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'DEPLOYED')" />
-			</when>
-		</choice>
-		<log loggingLevel="INFO"
-			message="New loop state is: ${exchangeProperty[loopObject].getLastComputedState().toString()}" />
-		<to
-			uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('New loop state is: ${exchangeProperty[loopObject].getLastComputedState().toString()}','INFO',${exchangeProperty[loopObject]})" />
-
-	</route>
-</routes>
\ No newline at end of file
diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml
deleted file mode 100644
index 01862692c..000000000
--- a/src/main/resources/clds/camel/routes/policy-flows.xml
+++ /dev/null
@@ -1,654 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <route id="verify-one-policy">
-        <from uri="direct:verify-one-policy"/>
-        <setProperty name="raiseHttpExceptionFlag">
-            <simple resultType="java.lang.Boolean">false</simple>
-        </setProperty>
-        <to uri="direct:get-policy"/>
-        <when>
-            <simple>${header.CamelHttpResponseCode} != 200</simple>
-            <setProperty name="policyFound">
-                <simple resultType="java.lang.Boolean">false</simple>
-            </setProperty>
-            <log loggingLevel="WARN"
-                 message="At least one policy has not been found on policy engine: ${exchangeProperty[policyName]}"/>
-        </when>
-        <setProperty name="raiseHttpExceptionFlag">
-            <simple resultType="java.lang.Boolean">false</simple>
-        </setProperty>
-        <to uri="direct:get-deployment-policy"/>
-        <when>
-            <simple>${header.CamelHttpResponseCode} != 200</simple>
-            <setProperty name="policyDeployed">
-                <simple resultType="java.lang.Boolean">false</simple>
-            </setProperty>
-            <log loggingLevel="WARN"
-                 message="At least one policy has not been deployed on policy engine: ${exchangeProperty[policyName]}"/>
-        </when>
-        <setProperty name="newPolicyState">
-            <simple>${exchangeProperty[policyComponent].computeState(*)}</simple>
-        </setProperty>
-    </route>
-
-    <route id="get-policy">
-        <from uri="direct:get-policy"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Getting Policy: ${exchangeProperty[policyName]}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Get Policy')"/>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to get policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <doCatch>
-                <exception>java.lang.Exception</exception>
-                <handled>
-                    <constant>true</constant>
-                </handled>
-
-                <log loggingLevel="ERROR"
-                     message="GET policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET policy request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
-            </doCatch>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty name="logMessage">
-                    <simple>${exchangeProperty[policyName]} GET
-                        Policy status
-                    </simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="get-deployment-policy">
-        <from uri="direct:get-deployment-policy"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Getting the policy deployment in PDP: ${exchangeProperty[policyName]}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy deployment in PDP')"/>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to get policy deployment status: {{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0"></log>
-            <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <doCatch>
-                <exception>java.lang.Exception</exception>
-                <handled>
-                    <constant>true</constant>
-                </handled>
-
-                <log loggingLevel="ERROR"
-                     message="GET policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET policy request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
-            </doCatch>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty name="logMessage">
-                    <simple>${exchangeProperty[policyName]} GET Policy deployment
-                        status
-                    </simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="create-policy-from-loop-object">
-        <from uri="direct:create-policy-from-loop-object"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Creating Policy from loop object: ${exchangeProperty[policy].getName()}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Creating Policy from loop object')"/>
-            <setBody>
-                <simple>${exchangeProperty[policy].createPolicyPayload()}
-                </simple>
-            </setBody>
-            <setProperty name="policyModelType">
-                <simple>${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}</simple>
-            </setProperty>
-            <setProperty name="policyModelVersion">
-                <simple>${exchangeProperty[policy].getPolicyModel().getVersion()}</simple>
-            </setProperty>
-            <to uri="direct:create-policy"/>
-            <doFinally>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty name="logMessage">
-                    <simple>${exchangeProperty[policy].getName()} creation
-                        status
-                    </simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="delete-policy-from-loop-object">
-        <from uri="direct:delete-policy-from-loop-object"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Deleting Policy in a loop: ${exchangeProperty[policy].getName()}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy in a loop')"/>
-            <setProperty name="policyModelType">
-                <simple>${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}</simple>
-            </setProperty>
-            <setProperty name="policyModelVersion">
-                <simple>${exchangeProperty[policy].getPolicyModel().getVersion()}</simple>
-            </setProperty>
-            <setProperty name="policyName">
-                <simple>${exchangeProperty[policy].getName()}</simple>
-            </setProperty>
-            <setProperty name="policyVersion">
-                <simple>1.0.0</simple>
-            </setProperty>
-            <to uri="direct:delete-policy"/>
-            <doFinally>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty name="logMessage">
-                    <simple>${exchangeProperty[policy].getName()} removal
-                        status
-                    </simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="add-policies-from-loop-to-pdp-group">
-        <from uri="direct:add-policies-from-loop-to-pdp-group"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Adding loop policies to PDP Group: ${exchangeProperty[loopObject].getName()}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')"/>
-            <setBody>
-                <simple>
-                    ${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"POST")}
-                </simple>
-            </setBody>
-            <setProperty name="raiseHttpExceptionFlag">
-                <simple resultType="java.lang.Boolean">true</simple>
-            </setProperty>
-            <to uri="direct:add-multiple-policies-to-pdp-group"/>
-            <doFinally>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty name="logMessage">
-                    <simple>PDP Group push ALL status</simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="remove-all-policy-from-active-pdp-group">
-        <from uri="direct:remove-all-policy-from-active-pdp-group"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Removing loop policies from PDP Group: ${exchangeProperty[loopObject].getName()}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Remove policies from PDP group')"/>
-            <setBody>
-                <simple>
-                    ${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"DELETE")}
-                </simple>
-            </setBody>
-            <setHeader name="CamelHttpMethod">
-                <constant>POST</constant>
-            </setHeader>
-            <setHeader name="Content-Type">
-                <constant>application/json</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to remove policies from PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
-            <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty name="logMessage">
-                    <simple>PDP Group remove ALL status</simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="remove-one-policy-from-active-pdp-group">
-        <from uri="direct:remove-one-policy-from-active-pdp-group"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Removing policy from active PDP group for loop: ${exchangeProperty[loopObject].getName()}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Removing one policy PDP group')"/>
-            <setProperty name="policyVersion">
-                <simple>1.0.0</simple>
-            </setProperty>
-            <to uri="direct:undeploy-one-policy-from-pap"/>
-            <setProperty name="logMessage">
-                <simple>${exchangeProperty[policyName]} PDP Group removal status
-                </simple>
-            </setProperty>
-            <setProperty name="logComponent">
-                <simple>POLICY</simple>
-            </setProperty>
-            <to uri="direct:dump-loop-log-http-response"/>
-            <doCatch>
-                <exception>java.lang.Exception</exception>
-                <handled>
-                    <constant>false</constant>
-                </handled>
-                <setProperty name="logMessage">
-                    <simple>PDP Group removal, Error reported: ${exception}</simple>
-                </setProperty>
-                <setProperty name="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doCatch>
-            <doFinally>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <!-- Camel routes not related to Loop context -->
-    <route id="get-all-policy-models">
-        <from uri="direct:get-all-policy-models"/>
-        <doTry>
-            <log loggingLevel="INFO" message="Getting all the policy models"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting all the policy models')"/>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to get all policy models: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="get-policy-tosca-model">
-        <from uri="direct:get-policy-tosca-model"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Getting the policy tosca model: ${exchangeProperty[policyModelType]}/${exchangeProperty[policyModelVersion]}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy model')"/>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to get policy model: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="get-all-pdp-groups">
-        <from uri="direct:get-all-pdp-groups"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Getting the list of PDP Groups"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the PDP Group list')"/>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to get policy model: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps"></log>
-            <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="get-all-policies">
-        <from uri="direct:get-all-policies"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Getting the policies list"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policies list')"/>
-            <setHeader name="CamelHttpMethod">
-                <constant>GET</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to get policies list: {{clamp.config.policy.api.url}}/policy/api/v1/policies"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <convertBodyTo type="java.lang.String"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-    <route id="add-multiple-policies-to-pdp-group">
-        <from uri="direct:add-multiple-policies-to-pdp-group"/>
-        <!-- Body should come from outside, expect a json describing the policy -->
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Add policies to PDP group"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')"/>
-            <setHeader name="CamelHttpMethod">
-                <constant>POST</constant>
-            </setHeader>
-            <setHeader name="Content-Type">
-                <constant>application/json</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to add/remove policies in batch to PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
-            <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-    <route id="undeploy-one-policy-from-pap">
-        <from uri="direct:undeploy-one-policy-from-pap"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Undeploy POLICY from PAP: ${exchangeProperty[policyName]}/${exchangeProperty[policyVersion]}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Undeploy POLICY from PAP')"/>
-            <setBody>
-                <constant>null</constant>
-            </setBody>
-            <setHeader name="CamelHttpMethod">
-                <constant>DELETE</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to delete policy from PDP Group: {{clamp.config.policy.pap.url}}/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
-            <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="create-policy">
-        <!-- Body should come from outside, expect a json describing the policy -->
-        <from uri="direct:create-policy"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Create Policy from model ${exchangeProperty[policyModelType]}/${exchangeProperty[policyModelVersion]}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Policy')"/>
-            <setHeader name="CamelHttpMethod">
-                <constant>POST</constant>
-            </setHeader>
-            <setHeader name="Content-Type">
-                <constant>application/json</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to create policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-    <route id="delete-policy">
-        <from uri="direct:delete-policy"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Deleting Policy: ${exchangeProperty[policyName]}"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy')"/>
-            <setBody>
-                <constant>null</constant>
-            </setBody>
-            <setHeader name="CamelHttpMethod">
-                <constant>DELETE</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to delete policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-    <route id="create-policy-type">
-        <from uri="direct:create-policy-type"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Creating Policy type"/>
-            <to
-                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create policy typ')"/>
-             <setHeader name="CamelHttpMethod">
-                <constant>POST</constant>
-            </setHeader>
-            <setHeader name="Content-Type">
-                <constant>application/yaml</constant>
-            </setHeader>
-            <setHeader name="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader name="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to create policy type: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-            </doFinally>
-        </doTry>
-    </route>
-</routes>
\ No newline at end of file
diff --git a/src/main/resources/clds/camel/routes/utils-flows.xml b/src/main/resources/clds/camel/routes/utils-flows.xml
deleted file mode 100644
index 90900f842..000000000
--- a/src/main/resources/clds/camel/routes/utils-flows.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-	<route id="reset-raise-http-exception-flag">
-		<from uri="direct:reset-raise-http-exception-flag" />
-		<setProperty name="raiseHttpExceptionFlag">
-			<simple resultType="java.lang.Boolean">true</simple>
-		</setProperty>
-	</route>
-
-	<route id="dump-loop-log-http-response">
-		<from uri="direct:dump-loop-log-http-response" />
-		<log loggingLevel="INFO"
-			message="${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}" />
-		<choice>
-			<when>
-				<simple>${exchangeProperty[logComponent]} == null</simple>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO',${exchangeProperty[loopObject]})" />
-			</when>
-			<otherwise>
-				<to
-					uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','${exchangeProperty[logComponent]}',${exchangeProperty[loopObject]})" />
-				<setProperty name="logComponent">
-					<constant>null</constant>
-				</setProperty>
-			</otherwise>
-		</choice>
-	</route>
-</routes>
\ No newline at end of file
-- 
cgit 1.2.3-korg