Fix delete flow bug

[clamp.git] / src / main / resources / clds / camel / rest / clamp-api-v2.xml

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 86a64f6..505ea30 100644 (file)
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -66,39 +66,6 @@
                                </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>true</constant>
-                                               </handled>
-                                               <to
-                                                               uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-                                               <log loggingLevel="ERROR"
-                                                        message="GET SVG request failed for loop: ${header.loopName}, ${exception.stacktrace}" />
-
-                                               <setHeader headerName="CamelHttpResponseCode">
-                                                       <constant>500</constant>
-                                               </setHeader>
-                                               <setBody>
-                                                       <simple>GET SVG For loop FAILED</simple>
-                                               </setBody>
-                                       </doCatch>
-                               </doTry>
-                       </route>
-               </get>
 
                <post uri="/v2/loop/updateGlobalProperties/{loopName}"
                        type="com.google.gson.JsonObject" consumes="application/json"
@@ -233,6 +200,9 @@
                                <doTry>
                                        <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
@@ -363,6 +333,9 @@
                                <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
@@ -406,6 +379,9 @@
                                <doTry>
                                        <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
@@ -449,6 +425,9 @@
                                <doTry>
                                        <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
@@ -493,6 +472,9 @@
                                <doTry>
                                        <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
@@ -577,6 +559,9 @@
                                <doTry>
                                        <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
@@ -1328,38 +1313,6 @@
                                </doTry>
                        </route>
                </get>
-               <get uri="/v2/templates/{templateName}/svgRepresentation"
-                        outType="java.lang.String" produces="application/xml">
-                       <route>
-                               <removeHeaders pattern="*" excludePattern="templateName" />
-                               <doTry>
-                                       <to
-                                                       uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Get SVG Representation for Loop template')" />
-                                       <to
-                                                       uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
-                                       <to
-                                                       uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getSvgRepresentation(${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 SVG for template failed for template: ${header.templateName},  ${exception.stacktrace}" />
-                                               <setHeader headerName="CamelHttpResponseCode">
-                                                       <constant>500</constant>
-                                               </setHeader>
-                                               <setBody>
-                                                       <simple>GET SVG for Template FAILED</simple>
-                                               </setBody>
-                                       </doCatch>
-                               </doTry>
-                       </route>
-               </get>
                <get uri="/v2/clampInformation" outType="org.onap.clamp.clds.model.ClampInformation"
                         produces="application/json">
                        <to