aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/resources/clds/camel/rest
diff options
context:
space:
mode:
authorxg353y <xg353y@intl.att.com>2019-05-03 13:23:40 +0200
committerxg353y <xg353y@intl.att.com>2019-05-03 13:32:07 +0200
commit7e8938e2bf7eae76bd527a28fd453650cf744e1a (patch)
tree0281172f78cc019d75b3fb062ce6dea8244ad8d7 /src/main/resources/clds/camel/rest
parent0169b6200be3bb4a670ebe17eca15a8870c9f3b6 (diff)
Fix the bugs in loop state logic
Fix the bugs in the logic to get the loop state Issue-ID: CLAMP-362 Change-Id: I9d931f1a1ceed3d9e173b3ee742f8e349b7e653f Signed-off-by: xg353y <xg353y@intl.att.com>
Diffstat (limited to 'src/main/resources/clds/camel/rest')
-rw-r--r--src/main/resources/clds/camel/rest/clamp-api-v2.xml25
1 files changed, 7 insertions, 18 deletions
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 2640d6bd6..45cad032e 100644
--- 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