Add more DCAE state for undeploy

Add IN_ERROR/PROCESSING in accepted state for dcae undeploy

Issue-ID: CLAMP-376
Change-Id: I3aed42bcc437399a2be7298f5fae0f7380ccae30
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

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 692e342..98440d7 100644 (file)
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -266,14 +266,14 @@
                                        <to uri="direct:get-status-from-dcae" />
                                        <choice>
                                                <when>
-                                                       <simple> ${exchangeProperty[dcaeStatus]} == 'DEPLOYED'
+                                                       <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="Closed Loop is in state ${exchangeProperty[dcaeStatus]}, it can only be undeployed when in state DEPLOYED" />
+                                                               message="Closed 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('Closed Loop is in state ${exchangeProperty[dcaeStatus]}, it can only be deployed when in state DEPLOYED','ERROR',${exchangeProperty[loopObject]})" />
                                                </otherwise>