Fix delete flow bug

[clamp.git] / src / main / resources / clds / camel / routes / dcae-flows.xml

diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/src/main/resources/clds/camel/routes/dcae-flows.xml
index 8088c2a..d71db17 100644 (file)
--- a/src/main/resources/clds/camel/routes/dcae-flows.xml
+++ b/src/main/resources/clds/camel/routes/dcae-flows.xml
@@ -35,7 +35,7 @@
                                        </setProperty>
                                        <setBody>
                                                <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-                                                       method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy].getName()})" />
+                                                       method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy]})" />
                                        </setBody>
                                        <setProperty propertyName="dcaeDeploymentId">
                                                <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
@@ -239,7 +239,7 @@
                                                                method="getStatusUrl(${exchangeProperty[dcaeResponse]})" />
                                                </setProperty>
                                                <to
-                                                       uri="bean:org.onap.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},${exchangeProperty[microServicePolicy].getDcaeDeploymentId()},${exchangeProperty[dcaeStatusUrl]})" />
+                                                       uri="bean:org.onap.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},null,${exchangeProperty[dcaeStatusUrl]})" />
                                                <to
                                                        uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})" />
                                        </when>
@@ -322,7 +322,7 @@
                                                        method="getStatusUrl(${exchangeProperty[dcaeResponse]})" />
                                        </setProperty>
                                        <to
-                                               uri="bean:org.onap.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},${exchangeProperty[loopObject].getDcaeDeploymentId()},${exchangeProperty[dcaeStatusUrl]})" />
+                                               uri="bean:org.onap.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},null,${exchangeProperty[dcaeStatusUrl]})" />
                                        <doFinally>
                                                <to uri="direct:reset-raise-http-exception-flag" />
                                                <to
@@ -371,6 +371,17 @@
                                message="Endpoint to query Closed Loop status: ${exchangeProperty[getStatusUrl]}"></log>
                        <toD
                                uri="${exchangeProperty[getStatusUrl]}?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;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&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.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