Fix the bugs in loop state logic

[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 2640d6b..45cad03 100644 (file)
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -207,24 +207,14 @@
                                                uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
                                        <to
                                                uri="direct:load-loop" />
-                                       <split>
-                                               <simple>${exchangeProperty[loopObject].getOperationalPolicies()}
-                                               </simple>
-                                               <setProperty propertyName="operationalPolicy">
-                                                       <simple>${body}</simple>
-                                               </setProperty>
-                                               <to 
-                                                       uri="direct:get-status-from-policy" />
-                                       </split>
-                                       <to 
+                                       <to
+                                               uri="direct:get-status-from-policy" />
+                                       <to
                                                uri="direct:get-status-from-dcae" />
-                                       <choice>
                                        <log
                                                loggingLevel="INFO"
-                                               message="policy status0: ${exchangeProperty[policyStatus]}"></log>
-                                       <log
-                                               loggingLevel="INFO"
-                                               message="dcae status0: ${exchangeProperty[dcaeStatus]}"></log>
+                                               message="policy status0000: ${exchangeProperty[policyStatus]}"></log>
+                                       <choice>
                                                <when>
                                                        <simple> ${exchangeProperty[policyStatus]} == 'SUBMITTED' and
                                                                ${exchangeProperty[dcaeStatus]} == 'NOT_DEPLOYED'
@@ -609,11 +599,10 @@
                                        <to uri="direct:get-status-from-policy" />
                                        <to uri="direct:get-status-from-dcae" />
                                        <to
-                                               uri="bean:org.onap.clamp.loop.LoopOperation?method=updateLoopStatus(${exchangeProperty[policyStatus], ${exchangeProperty[dcaeStatus])" />
-
+                                               uri="bean:org.onap.clamp.loop.LoopOperation?method=updateLoopStatus(${exchangeProperty[loopObject]},${exchangeProperty[policyStatus]}, ${exchangeProperty[dcaeStatus]})" />
                                        <log
                                                loggingLevel="INFO"
-                                               message="Get Status request successfully executed for loop: ${body}" />
+                                               message="Get Status request successfully executed. The new state is: ${body}" />
                                        <to
                                                uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Get Status request successfully executed','INFO',${exchangeProperty[loopObject]})" />
                                        <to