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>
---
 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 -
 5 files changed, 1503 deletions(-)
 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/routes')

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