X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fclds%2Fcamel%2Frest%2Fclamp-api-v2.xml;h=505ea30d93e89831407be3650db648e950078958;hb=1761c819d08244adaf3bbb36f053884c89d1a0db;hp=da856e9477807a55449dfc8d9ba5ebda9a4ed6cd;hpb=657f27d2e2b2bfeeb9c91e58219e88938bc912e3;p=clamp.git

diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index da856e94..505ea30d 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -1,8 +1,6 @@
 <rests xmlns="http://camel.apache.org/schema/spring">
 	<rest>
-		<get
-			uri="/v2/loop/getAllNames"
-			outType="java.lang.String[]"
+		<get uri="/v2/loop/getAllNames" outType="java.lang.String[]"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" />
@@ -18,22 +16,27 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET All Loop names FAILED: ${exception.stacktrace}" />
+
+						<setHeader headerName="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.clamp.loop.Loop"
+		<get uri="/v2/loop/{loopName}" outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Loop')" />
@@ -46,53 +49,29 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
-						</handled>
-						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-					</doCatch>
-				</doTry>
-			</route>
-		</get>
-		<get
-			uri="/v2/loop/svgRepresentation/{loopName}"
-			outType="java.lang.String"
-			produces="application/xml">
-			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
-				<doTry>
-					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Get SVG Representation')" />
-					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
-					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=getSVGRepresentation(${header.loopName})" />
-					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
-					<doCatch>
-						<exception>java.lang.Exception</exception>
-						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET Loop request failed for loop: ${header.loopName}, ${exception.stacktrace}" />
+
+						<setHeader headerName="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.clamp.loop.Loop"
-			produces="application/json">
+		<post uri="/v2/loop/updateGlobalProperties/{loopName}"
+			type="com.google.gson.JsonObject" consumes="application/json"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')" />
@@ -111,24 +90,28 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="UPDATE Global properties FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
+
+						<setHeader headerName="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.clamp.loop.Loop"
-			produces="application/json">
+		<post uri="/v2/loop/updateOperationalPolicies/{loopName}"
+			type="com.google.gson.JsonArray" consumes="application/json"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')" />
@@ -141,30 +124,38 @@
 					<to
 						uri="bean:org.onap.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational and Guard policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
+
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>UPDATE Operational policies FAILED</simple>
+						</setBody>
 					</doCatch>
 				</doTry>
 			</route>
 		</post>
-		<post
-			uri="/v2/loop/updateMicroservicePolicy/{loopName}"
+		<post uri="/v2/loop/updateMicroservicePolicy/{loopName}"
 			type="org.onap.clamp.policy.microservice.MicroServicePolicy"
 			consumes="application/json"
 			outType="org.onap.clamp.policy.microservice.MicroServicePolicy"
 			produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')" />
@@ -184,26 +175,34 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>UPDATE MicroService policy FAILED</simple>
+						</setBody>
 					</doCatch>
 				</doTry>
 			</route>
 		</post>
-		<put
-			uri="/v2/loop/deployLoop/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/deploy/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="DCAE DEPLOY request for loop: ${header.loopName}" />
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">true</simple>
+					</setProperty>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')" />
 					<to
@@ -211,30 +210,10 @@
 					<to uri="direct:load-loop" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})" />
-					
-					<to uri="direct:get-status-from-policy" />
-					<to uri="direct:get-status-from-dcae" />
-					<log
-						loggingLevel="INFO"
-						message="Policy deployment status: ${exchangeProperty[policyStatus]}"></log>
-					<choice>
-						<when>
-							<simple> ${exchangeProperty[policyStatus]} == 'SUBMITTED' and
-								${exchangeProperty[dcaeStatus]} == 'NOT_DEPLOYED'
-							</simple>
-							<to uri="direct:deploy-loop" />
-						</when>
-						<otherwise>
-							<log
-								loggingLevel="INFO"
-								message="POLICY status ${exchangeProperty[policyStatus]}/DCAE status ${exchangeProperty[dcaeStatus]}, DCAE deployment will be started anyway" />
-							<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('POLICY status ${exchangeProperty[policyStatus]}/DCAE status ${exchangeProperty[dcaeStatus]}, DCAE deployment will be started anyway','ERROR',${exchangeProperty[loopObject]})" />
-							<to uri="direct:deploy-loop" />
-						</otherwise>
-					</choice>
-					<log
-						loggingLevel="INFO"
+
+					<to uri="direct:deploy-loop" />
+
+					<log loggingLevel="INFO"
 						message="DEPLOY request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -243,31 +222,120 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
-							message="DEPLOY request failed for loop: ${header.loopName}" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="DEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>DEPLOY request FAILED</simple>
+						</setBody>
 					</doCatch>
 				</doTry>
 			</route>
 		</put>
-		<put
-			uri="/v2/loop/undeployLoop/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}"
+			 outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName|microServicePolicyName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
+						 message="Refresh Micro Service Policy UI for loop: ${header.loopName} and ${header.microServicePolicyName}" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Micro Service Policy UI request')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+							uri="bean:org.onap.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
+					<to
+							uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('REFRESH Micro Service policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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.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.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Operational Policy UI request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+							uri="bean:org.onap.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
+					<to
+						uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('REFRESH operational policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
 						message="DCAE UNDEPLOY request for loop: ${header.loopName}" />
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">true</simple>
+					</setProperty>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')" />
 					<to
@@ -275,23 +343,9 @@
 					<to uri="direct:load-loop" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})" />
-					<to uri="direct:get-status-from-dcae" />
-					<choice>
-						<when>
-							<simple> ${exchangeProperty[dcaeStatus]} == 'DEPLOYED' or ${exchangeProperty[dcaeStatus]} == 'IN_ERROR' or ${exchangeProperty[dcaeStatus]} == 'PROCESSING'
-							</simple>
-							<to uri="direct:undeploy-loop" />
-						</when>
-						<otherwise>
-							<log
-								loggingLevel="INFO"
-								message="Loop is in state ${exchangeProperty[dcaeStatus]}, it can only be undeployed when in state DEPLOYED/IN_ERROR/PROCESSING" />
-							<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Loop is in state ${exchangeProperty[dcaeStatus]}, it can only be deployed when in state DEPLOYED','ERROR',${exchangeProperty[loopObject]})" />
-						</otherwise>
-					</choice>
-					<log
-						loggingLevel="INFO"
+					<to uri="direct:undeploy-loop" />
+
+					<log loggingLevel="INFO"
 						message="UNDEPLOY request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -300,31 +354,34 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
-							message="UNDEPLOY request failed for loop: ${header.loopName}" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="UNDEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/stop/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="STOP request for loop: ${header.loopName}" />
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">true</simple>
+					</setProperty>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'STOP request')" />
 					<to
@@ -332,10 +389,9 @@
 					<to uri="direct:load-loop" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request','INFO',${exchangeProperty[loopObject]})" />
-					
+
 					<to uri="direct:remove-all-policy-from-active-pdp-group" />
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="STOP request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -344,31 +400,34 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
-							message="STOP request failed for loop: $${header.loopName}" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="STOP request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/restart/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="RESTART request for loop: ${header.loopName}" />
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">true</simple>
+					</setProperty>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')" />
 					<to
@@ -379,8 +438,7 @@
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:add-all-to-active-pdp-group" />
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="RESTART request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -389,31 +447,34 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
-							message="RESTART request failed for loop: ${header.loopName}" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="RESTART request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception}','INFO',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/submit/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="POLICY SUBMIT request for loop: ${header.loopName}" />
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">true</simple>
+					</setProperty>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'POLICY SUBMIT request')" />
 					<to
@@ -425,68 +486,47 @@
 						<simple resultType="java.lang.Boolean">false</simple>
 					</setProperty>
 					<to uri="direct:remove-all-policy-from-active-pdp-group" />
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="Processing all MICRO-SERVICES policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 					<split>
 						<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
 						</simple>
-						<setProperty propertyName="microServicePolicy">
+						<setProperty propertyName="policy">
 							<simple>${body}</simple>
 						</setProperty>
-						<log
-							loggingLevel="INFO"
-							message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
+						<log loggingLevel="INFO"
+							message="Processing Micro Service Policy: ${exchangeProperty[policy].getName()}" />
 						<setProperty propertyName="raiseHttpExceptionFlag">
 							<simple resultType="java.lang.Boolean">false</simple>
 						</setProperty>
-						<to uri="direct:delete-micro-service-policy" />
-						<to uri="direct:create-micro-service-policy" />
+						<to uri="direct:delete-policy" />
+						<to uri="direct:create-policy" />
 					</split>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 					<split>
 						<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
 						</simple>
-						<setProperty propertyName="operationalPolicy">
+						<setProperty propertyName="policy">
 							<simple>${body}</simple>
 						</setProperty>
-						<log
-							loggingLevel="INFO"
-							message="Processing Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" />
+						<log loggingLevel="INFO"
+							message="Processing Operational Policy: ${exchangeProperty[policy].getName()}" />
 						<setProperty propertyName="raiseHttpExceptionFlag">
 							<simple resultType="java.lang.Boolean">false</simple>
 						</setProperty>
 
-						<to uri="direct:delete-operational-policy" />
-						<to uri="direct:create-operational-policy" />
-
-						<log
-							loggingLevel="INFO"
-							message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
-						<split>
-							<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
-							</simple>
-							<setProperty propertyName="guardPolicy">
-								<simple>${body}</simple>
-							</setProperty>
-							<log
-								loggingLevel="INFO"
-								message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
-
-							<setProperty propertyName="raiseHttpExceptionFlag">
-								<simple resultType="java.lang.Boolean">false</simple>
-							</setProperty>
-							<to uri="direct:delete-guard-policy" />
-							<to uri="direct:create-guard-policy" />
-						</split>
+						<to uri="direct:delete-policy" />
+						<to uri="direct:create-policy" />
 					</split>
 
+					<delay>
+						<constant>3000</constant>
+					</delay>
+
 					<to uri="direct:add-all-to-active-pdp-group" />
 
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="SUBMIT request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -495,28 +535,33 @@
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
-							message="SUBMIT request failed for loop: ${header.loopName}" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="SUBMIT request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="DELETE request for loop: ${header.loopName}" />
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">true</simple>
+					</setProperty>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')" />
 					<to
@@ -524,83 +569,71 @@
 					<to uri="direct:load-loop" />
 					<to
 						uri="bean:org.onap.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 propertyName="microServicePolicy">
+						<setProperty propertyName="policy">
 							<simple>${body}</simple>
 						</setProperty>
-						<log
-							loggingLevel="INFO"
-							message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
-						<to uri="direct:delete-micro-service-policy" />
+						<log loggingLevel="INFO"
+							message="Deleting Micro Service Policy: ${exchangeProperty[policy].getName()}" />
+						<setProperty propertyName="raiseHttpExceptionFlag">
+							<simple resultType="java.lang.Boolean">false</simple>
+						</setProperty>
+						<to uri="direct:delete-policy" />
 					</split>
-
-					<log
-						loggingLevel="INFO"
-						message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
+					<log loggingLevel="INFO"
+						message="Deleting all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 					<split>
 						<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
 						</simple>
-						<setProperty propertyName="operationalPolicy">
+						<setProperty propertyName="policy">
 							<simple>${body}</simple>
 						</setProperty>
-						<log
-							loggingLevel="INFO"
-							message="Processing Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" />
-						<to uri="direct:delete-operational-policy" />
-						<log
-							loggingLevel="INFO"
-							message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
-						<split>
-							<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
-							</simple>
-							<setProperty propertyName="guardPolicy">
-								<simple>${body}</simple>
-							</setProperty>
-							<log
-								loggingLevel="INFO"
-								message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
-							<to uri="direct:delete-guard-policy" />
-						</split>
+						<log loggingLevel="INFO"
+							message="Deleting Operational Policy: ${exchangeProperty[policy].getName()}" />
+						<setProperty propertyName="raiseHttpExceptionFlag">
+							<simple resultType="java.lang.Boolean">false</simple>
+						</setProperty>
+						<to uri="direct:delete-policy" />
 					</split>
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopService?method=deleteLoop(${header.loopName})" />
-					<log
-						loggingLevel="INFO"
+						uri="bean:org.onap.clamp.loop.LoopController?method=deleteLoop(${header.loopName})" />
+					<log loggingLevel="INFO"
 						message="DELETE request successfully executed for loop: ${header.loopName}" />
-					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
-							message="DELETE request failed for loop: ${header.loopName}" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="DELETE request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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.clamp.loop.Loop"
-			produces="application/json">
+		<get uri="/v2/loop/getstatus/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="GET STATUS request for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET STATUS request')" />
@@ -609,39 +642,681 @@
 					<to uri="direct:load-loop" />
 					<to
 						uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.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.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 headerName="CamelHttpResponseCode">
+							<constant>200</constant>
+						</setHeader>
+					</doFinally>
+				</doTry>
+			</route>
+		</get>
+
+		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion" />
+				<doTry>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add operational Policy')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+							uri="bean:org.onap.clamp.loop.LoopController?method=addOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
+					<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion|policyName" />
+				<doTry>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REMOVE operational Policy')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<setProperty propertyName="policyName">
+						<simple>${header.policyName}</simple>
+					</setProperty>
+					<setProperty propertyName="policy">
+						<simple>${exchangeProperty[loopObject].getOperationalPolicy(header.policyName)}</simple>
+					</setProperty>
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">false</simple>
+					</setProperty>
+					<to uri="direct:remove-one-policy-from-active-pdp-group" />
 					<setProperty propertyName="raiseHttpExceptionFlag">
 						<simple resultType="java.lang.Boolean">false</simple>
 					</setProperty>
-					<to uri="direct:get-status-from-policy" />
-					<to uri="direct:get-status-from-dcae" />
+					<to uri="direct:delete-policy" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopOperation?method=updateLoopStatus(${exchangeProperty[loopObject]},${exchangeProperty[policyStatus]}, ${exchangeProperty[dcaeStatus]})" />
-					<log
-						loggingLevel="INFO"
-						message="Get Status request successfully executed. The new state is: ${body}" />
+							uri="bean:org.onap.clamp.loop.LoopController?method=removeOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Get Status request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="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.clamp.loop.Loop" consumes="application/json"
+				produces="application/json">
+			<route>
+				<removeHeaders
+						pattern="*"
+						excludePattern="loopName|templateName" />
+				<doTry>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Create Loop')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to
+							uri="bean:org.onap.clamp.loop.LoopController?method=createLoop(${header.loopName}, ${header.templateName})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.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.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>CREATE Loop from template FAILED</simple>
+						</setBody>
+					</doCatch>
+				</doTry>
+			</route>
+		</post>
+		<get uri="/v2/dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionaries')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllDictionaries()" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
-							<constant>false</constant>
+							<constant>true</constant>
 						</handled>
 						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
-							message="Get Status request failed for loop: ${header.loopName}" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET Dictionary request failed: ${exception.stacktrace}" />
+						<setHeader headerName="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.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Secondary Dictionary Level Names')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllSecondaryLevelDictionaryNames()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Get Status request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET Dictionary request failed: ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>GET Dictionary FAILED</simple>
+						</setBody>
 					</doCatch>
-					<doFinally>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/dictionary/{dictionaryName}"
+			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="dictionaryName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionary Elements for a Dictionary Name')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getDictionary(${header.dictionaryName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
 						<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
-					</doFinally>
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET Dictionary request failed for: ${header.dictionaryName}, ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>GET Dictionary FAILED</simple>
+						</setBody>
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<put uri="/v2/dictionary" type="org.onap.clamp.tosca.Dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
+			produces="application/json">
+			<route>
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="DictionaryObject">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionary(${exchangeProperty[DictionaryObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="PUT Dictionary request failed for: ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>PUT Dictionary FAILED</simple>
+						</setBody>
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+
+		<put uri="/v2/dictionary/{name}"
+			type="org.onap.clamp.tosca.Dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="name" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="DictionaryObject">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionaryElement(${header.name}, ${exchangeProperty[DictionaryObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="PUT Dictionary request failed for: ${header.name}, ${exception.stacktrace}" />
+						<setHeader headerName="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.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionary(${header.name})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="DELETE Dictionary request failed for: ${header.name}, ${exception.stacktrace}" />
+						<setHeader headerName="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.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary Element')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionaryElement(${header.name}, ${header.shortName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="DELETE Dictionary element request failed for: ${header.name}, ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>DELETE Dictionary element FAILED</simple>
+						</setBody>
+					</doCatch>
+				</doTry>
+			</route>
+		</delete>
+
+		<get uri="/v2/policyToscaModels"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Tosca Policy Models')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getAllPolicyModels()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET Policy Models request failed for: ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>GET Policy models FAILED</simple>
+						</setBody>
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="policyModelType|policyModelVersion" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name/Version')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType},${header.policyModelVersion})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET Policy Model request failed for type: ${header.policyModelType}, ${exception.stacktrace}" />
+						<setHeader headerName="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.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name/Version')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType},${header.policyModelVersion})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET Policy Model YAML request failed for type: ${header.policyModelType}, ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>GET Policy model YAML FAILED</simple>
+						</setBody>
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+
+		<post uri="/v2/policyToscaModels"
+			type="java.lang.String"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			consumes="plain/text" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"/>
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="PolicyModelTosca">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${exchangeProperty[PolicyModelTosca]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="POST Policy Model YAML request failed: ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>POST Policy model YAML FAILED</simple>
+						</setBody>
+					</doCatch>
+				</doTry>
+			</route>
+		</post>
+		<put uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
+			  type="java.lang.String"
+			  outType="org.onap.clamp.loop.template.PolicyModel"
+			  consumes="plain/text" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+							   excludePattern="policyModelType|policyModelVersion" />
+				<doTry>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="PolicyModelTosca">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+							uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=updatePolicyModelTosca(${header.policyModelType},${policyModelVersion},${exchangeProperty[PolicyModelTosca]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="MODIFY Policy Model YAML request failed: ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>MODIFY Policy model YAML FAILED</simple>
+						</setBody>
+					</doCatch>
 				</doTry>
 			</route>
+		</put>
+
+		<get uri="/v2/templates"
+			outType="org.onap.clamp.loop.template.LoopTemplate"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET ALL templates request failed: ${exception.stacktrace}" />
+						<setHeader headerName="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.clamp.loop.template.LoopTemplate"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="templateName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET Template request failed for template: ${header.templateName},  ${exception.stacktrace}" />
+						<setHeader headerName="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.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="GET All Template names request failed for template:  ${exception.stacktrace}" />
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<setBody>
+							<simple>GET All Template names FAILED</simple>
+						</setBody>
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/clampInformation" outType="org.onap.clamp.clds.model.ClampInformation"
+			 produces="application/json">
+			<to
+					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=getClampInformation()" />
 		</get>
 	</rest>
 </rests>