diff options
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/clds/camel/rest/clamp-api-v2.xml | 25 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/routes/flexible-flow.xml | 14 |
2 files changed, 13 insertions, 26 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 diff --git a/src/main/resources/clds/camel/routes/flexible-flow.xml b/src/main/resources/clds/camel/routes/flexible-flow.xml index 681380085..a116c5685 100644 --- a/src/main/resources/clds/camel/routes/flexible-flow.xml +++ b/src/main/resources/clds/camel/routes/flexible-flow.xml @@ -605,9 +605,10 @@ message="Query Closed Loop status from policy DPD: ${exchangeProperty[loopObject].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Query operational policies to PDP group')" /> - <setBody> - <constant>null</constant> - </setBody> + <setProperty propertyName="operationalPolicyName"> + <method ref="org.onap.clamp.loop.LoopOperation" + method="getOperationalPolicyName(${exchangeProperty[loopObject]})" /> + </setProperty> <setHeader headerName="CamelHttpMethod"> <constant>GET</constant> </setHeader> @@ -625,9 +626,9 @@ </setHeader> <log loggingLevel="INFO" - message="Endpoint to query from Policy DPD: {{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicy].getName()}/versions/deployed"></log> + message="Endpoint to query from Policy DPD: {{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicyName]}/versions/deployed"></log> <toD - uri="{{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicy].getName()}/versions/deployed?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&httpClient.connectTimeout=10000&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}" /> + uri="{{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicyName]}/versions/deployed?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&httpClient.connectTimeout=10000&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}" /> <doFinally> <to uri="direct:reset-raise-http-exception-flag" /> <to @@ -639,9 +640,6 @@ <method ref="org.onap.clamp.loop.LoopOperation" method="analysePolicyResponse(${header.CamelHttpResponseCode})" /> </setProperty> - <log - loggingLevel="INFO" - message="policy status: ${exchangeProperty[policyStatus]}"></log> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> |