summaryrefslogtreecommitdiffstats
path: root/src/main/resources/clds/camel
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2021-04-07 10:10:45 +0200
committersebdet <sebastien.determe@intl.att.com>2021-04-15 17:49:58 +0200
commit1f2d62dd48694fa78041572a200b3e5d04bd268e (patch)
tree58989ac6875277998b07d97be9883a039ee970b4 /src/main/resources/clds/camel
parent58e7987439bca70cdd2715863a020b76baa8ac1c (diff)
Update dependencies
Update dependencies to remove some issues reported by Nexus-IQ. Issue-ID: POLICY-3169 Issue-ID: POLICY-3120 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ia8939f0c85ac4087c3fc2c71b66914d6c7178347
Diffstat (limited to 'src/main/resources/clds/camel')
-rw-r--r--src/main/resources/clds/camel/rest/clamp-api-v2.xml161
-rw-r--r--src/main/resources/clds/camel/rest/clds-services.xml2
-rw-r--r--src/main/resources/clds/camel/routes/cds-flows.xml12
-rw-r--r--src/main/resources/clds/camel/routes/dcae-flows.xml152
-rw-r--r--src/main/resources/clds/camel/routes/loop-flows.xml74
-rw-r--r--src/main/resources/clds/camel/routes/policy-flows.xml175
-rw-r--r--src/main/resources/clds/camel/routes/utils-flows.xml4
7 files changed, 297 insertions, 283 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 7129c2828..fe94460c4 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -23,7 +23,7 @@
<log loggingLevel="ERROR"
message="GET All Loop names FAILED: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -56,7 +56,7 @@
<log loggingLevel="ERROR"
message="GET Loop request failed for loop: ${header.loopName}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -77,7 +77,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
- <setHeader headerName="GlobalPropertiesJson">
+ <setHeader name="GlobalPropertiesJson">
<simple>${body}</simple>
</setHeader>
<to uri="direct:load-loop"/>
@@ -97,7 +97,7 @@
<log loggingLevel="ERROR"
message="UPDATE Global properties FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -117,7 +117,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
- <setHeader headerName="OperationalPoliciesArray">
+ <setHeader name="OperationalPoliciesArray">
<simple>${body}</simple>
</setHeader>
<to uri="direct:load-loop"/>
@@ -139,7 +139,7 @@
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -161,7 +161,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
- <setProperty propertyName="MicroServicePolicyObject">
+ <setProperty name="MicroServicePolicyObject">
<simple>${body}</simple>
</setProperty>
@@ -183,7 +183,7 @@
message="UPDATE MicroService policy FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -200,9 +200,6 @@
<doTry>
<log loggingLevel="INFO"
message="DCAE DEPLOY request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
- <simple resultType="java.lang.Boolean">true</simple>
- </setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')"/>
<to
@@ -210,7 +207,6 @@
<to uri="direct:load-loop"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})"/>
-
<to uri="direct:deploy-loop"/>
<log loggingLevel="INFO"
@@ -230,7 +226,7 @@
message="DEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -273,7 +269,7 @@
message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -316,7 +312,7 @@
message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -333,9 +329,6 @@
<doTry>
<log loggingLevel="INFO"
message="DCAE UNDEPLOY request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
- <simple resultType="java.lang.Boolean">true</simple>
- </setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')"/>
<to
@@ -362,7 +355,7 @@
message="UNDEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -379,7 +372,7 @@
<doTry>
<log loggingLevel="INFO"
message="STOP request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
<to
@@ -408,7 +401,7 @@
message="STOP request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -425,9 +418,6 @@
<doTry>
<log loggingLevel="INFO"
message="RESTART request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
- <simple resultType="java.lang.Boolean">true</simple>
- </setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')"/>
<to
@@ -455,7 +445,7 @@
message="RESTART request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -472,7 +462,7 @@
<doTry>
<log loggingLevel="INFO"
message="POLICY SUBMIT request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
<to
@@ -482,7 +472,7 @@
<to uri="direct:load-loop"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:remove-all-policy-from-active-pdp-group"/>
@@ -491,12 +481,12 @@
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${body}</simple>
</setProperty>
<log loggingLevel="INFO"
message="Processing Micro Service Policy: ${exchangeProperty[policy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:delete-policy-from-loop-object"/>
@@ -507,12 +497,12 @@
<split>
<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
</simple>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${body}</simple>
</setProperty>
<log loggingLevel="INFO"
message="Processing Operational Policy: ${exchangeProperty[policy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
@@ -543,7 +533,7 @@
message="SUBMIT request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -559,7 +549,7 @@
<doTry>
<log loggingLevel="INFO"
message="DELETE request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
<to
@@ -576,12 +566,12 @@
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${body}</simple>
</setProperty>
<log loggingLevel="INFO"
message="Deleting Micro Service Policy: ${exchangeProperty[policy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:delete-policy-from-loop-object"/>
@@ -591,12 +581,12 @@
<split>
<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
</simple>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${body}</simple>
</setProperty>
<log loggingLevel="INFO"
message="Deleting Operational Policy: ${exchangeProperty[policy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:delete-policy-from-loop-object"/>
@@ -618,7 +608,7 @@
message="DELETE request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -666,7 +656,7 @@
<setBody>
<simple>${exchangeProperty[loopObject]}</simple>
</setBody>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>200</constant>
</setHeader>
</doFinally>
@@ -701,7 +691,7 @@
message="ADD operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -724,17 +714,17 @@
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
<to uri="direct:load-loop"/>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${header.policyName}</simple>
</setProperty>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${exchangeProperty[loopObject].getOperationalPolicy(header.policyName)}</simple>
</setProperty>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:remove-one-policy-from-active-pdp-group"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:delete-policy-from-loop-object"/>
@@ -755,7 +745,7 @@
message="REMOVE operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -793,7 +783,7 @@
message="CREATE Loop from Template request failed for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -826,7 +816,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET ALL templates request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -860,7 +850,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Template request failed for template: ${header.templateName}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -892,7 +882,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET All Template names request failed for template: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -926,7 +916,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Dictionary request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -959,7 +949,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Dictionary request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -992,7 +982,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Dictionary request failed for: ${header.dictionaryName}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1011,7 +1001,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
- <setProperty propertyName="DictionaryObject">
+ <setProperty name="DictionaryObject">
<simple>${body}</simple>
</setProperty>
<to
@@ -1027,7 +1017,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="PUT Dictionary request failed for: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1049,7 +1039,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
- <setProperty propertyName="DictionaryObject">
+ <setProperty name="DictionaryObject">
<simple>${body}</simple>
</setProperty>
<to
@@ -1065,7 +1055,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="PUT Dictionary request failed for: ${header.name}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1097,7 +1087,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="DELETE Dictionary request failed for: ${header.name}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1131,7 +1121,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="DELETE Dictionary element request failed for: ${header.name}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1165,7 +1155,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Policy Models request failed for: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1198,7 +1188,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Policy Model request failed for type: ${header.policyModelType}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1231,7 +1221,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Policy Model YAML request failed for type: ${header.policyModelType}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1253,7 +1243,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
- <setProperty propertyName="PolicyModelTosca">
+ <setProperty name="PolicyModelTosca">
<simple>${body}</simple>
</setProperty>
<to
@@ -1269,7 +1259,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="POST Policy Model YAML request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1291,7 +1281,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
- <setProperty propertyName="PolicyModelTosca">
+ <setProperty name="PolicyModelTosca">
<simple>${body}</simple>
</setProperty>
<to
@@ -1307,7 +1297,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="MODIFY Policy Model YAML request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1327,13 +1317,15 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Policies List ')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','read')"/>
-
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:get-all-policies"/>
- <setProperty propertyName="policiesListResponse">
+ <setProperty name="policiesListResponse">
<simple>${body}</simple>
</setProperty>
<to uri="direct:get-all-pdp-groups"/>
- <setProperty propertyName="pdpGroupInfoResponse">
+ <setProperty name="pdpGroupInfoResponse">
<simple>${body}</simple>
</setProperty>
<setBody>
@@ -1351,7 +1343,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Policies list JSON request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1376,13 +1368,16 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'CREATE a new Policy ')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
- <setProperty propertyName="policyModelType">
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
+ <setProperty name="policyModelType">
<simple>${header.policyModelType}</simple>
</setProperty>
- <setProperty propertyName="policyModelVersion">
+ <setProperty name="policyModelVersion">
<simple>${header.policyModelVersion}</simple>
</setProperty>
- <setProperty propertyName="policyProperties">
+ <setProperty name="policyProperties">
<simple>${body}</simple>
</setProperty>
<to
@@ -1404,7 +1399,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="CREATE Policy request failed for type: ${header.policyModelType}/${header.policyModelVersion}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1424,19 +1419,22 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DELETE a Policy ')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
- <setProperty propertyName="policyModelType">
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
+ <setProperty name="policyModelType">
<simple>${header.policyModelType}</simple>
</setProperty>
- <setProperty propertyName="policyModelVersion">
+ <setProperty name="policyModelVersion">
<simple>${header.policyModelVersion}</simple>
</setProperty>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${header.policyName}</simple>
</setProperty>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>${header.policyVersion}</simple>
</setProperty>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:undeploy-one-policy-from-pap"/>
@@ -1452,7 +1450,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="DELETE Policy request failed for policy: ${header.policyName}/${header.policyVersion}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
@@ -1478,6 +1476,9 @@
</setBody>
<log loggingLevel="INFO"
message="PDP Group DEPLOY request payload: ${body}"/>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">false</simple>
+ </setProperty>
<to uri="direct:add-multiple-policies-to-pdp-group"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
@@ -1490,7 +1491,7 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="PDP Group deployment request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index 61e1efbdc..aa4c3cbee 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -9,7 +9,7 @@
</setBody>
<when>
<simple> ${body} == 'NOT-OK'</simple>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>404</constant>
</setHeader>
<log loggingLevel="ERROR" message="HealthCheck failed" />
diff --git a/src/main/resources/clds/camel/routes/cds-flows.xml b/src/main/resources/clds/camel/routes/cds-flows.xml
index 73f8cb849..10fcb091e 100644
--- a/src/main/resources/clds/camel/routes/cds-flows.xml
+++ b/src/main/resources/clds/camel/routes/cds-flows.xml
@@ -5,15 +5,15 @@
message="Getting blueprint workflow list from CDS"/>
<to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting workflow list from CDS')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to query workflows from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}"></log>
- <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doCatch>
<exception>java.lang.Exception</exception>
@@ -36,15 +36,15 @@
message="Getting blueprint input properties for workflow"/>
<to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting input properties for workflow')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to query input properties for workflow from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec"></log>
- <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doCatch>
<exception>java.lang.Exception</exception>
diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/src/main/resources/clds/camel/routes/dcae-flows.xml
index 1a0eb7b9a..d74bd91bf 100644
--- a/src/main/resources/clds/camel/routes/dcae-flows.xml
+++ b/src/main/resources/clds/camel/routes/dcae-flows.xml
@@ -5,11 +5,17 @@
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
</simple>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:deploy-loop-single-blueprint"/>
</when>
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
</simple>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:deploy-loop-multi-blueprint"/>
</when>
</choice>
@@ -24,51 +30,51 @@
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="microServicePolicy">
+ <setProperty name="microServicePolicy">
<simple>${body}</simple>
</setProperty>
<log
loggingLevel="INFO"
message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<setBody>
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy]})"/>
</setBody>
- <setProperty propertyName="dcaeDeploymentId">
+ <setProperty name="dcaeDeploymentId">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="generateDeploymentId()"/>
</setProperty>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>PUT</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
<toD
- uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})"/>
</setProperty>
- <setProperty propertyName="dcaeStatusUrl">
+ <setProperty name="dcaeStatusUrl">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
</setProperty>
@@ -82,14 +88,14 @@
<handled>
<constant>false</constant>
</handled>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>DEPLOY micro service failed
(MicroService name:${exchangeProperty[microServicePolicy].getName()}),
Dep-id:${exchangeProperty[dcaeDeploymentId]},
StatusUrl:${exchangeProperty[dcaeStatusUrl]})
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -112,40 +118,40 @@
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getDeployPayload(${exchangeProperty[loopObject]})"/>
</setBody>
- <setProperty propertyName="dcaeDeploymentId">
+ <setProperty name="dcaeDeploymentId">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="generateDeploymentId()"/>
</setProperty>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>PUT</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
<toD
- uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})"/>
</setProperty>
- <setProperty propertyName="dcaeStatusUrl">
+ <setProperty name="dcaeStatusUrl">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
</setProperty>
@@ -155,13 +161,13 @@
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>DEPLOY loop status
(Dep-id:${exchangeProperty[dcaeDeploymentId]},
StatusUrl:${exchangeProperty[dcaeStatusUrl]})
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -174,11 +180,17 @@
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
</simple>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:undeploy-loop-single-blueprint"/>
</when>
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
</simple>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:undeploy-loop-multi-blueprint"/>
</when>
</choice>
@@ -193,7 +205,7 @@
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="microServicePolicy">
+ <setProperty name="microServicePolicy">
<simple>${body}</simple>
</setProperty>
<log
@@ -207,34 +219,34 @@
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getUndeployPayload(${exchangeProperty[microServicePolicy]})"/>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>DELETE</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}"></log>
<toD
- uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})"/>
</setProperty>
- <setProperty propertyName="dcaeStatusUrl">
+ <setProperty name="dcaeStatusUrl">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
</setProperty>
@@ -244,7 +256,7 @@
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/>
</when>
<otherwise>
- <log loggingLevel="WARNING"
+ <log loggingLevel="WARN"
message="Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !','WARNING','DCAE',${exchangeProperty[loopObject]})"/>
@@ -256,12 +268,12 @@
<handled>
<constant>false</constant>
</handled>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>UNDEPLOY micro service failed
(MicroService name:${exchangeProperty[microServicePolicy].getName()})
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -281,43 +293,41 @@
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop')"/>
<choice>
<when>
- <simple>${exchangeProperty[loopObject].getDcaeDeploymentId()}
- != null
- </simple>
+ <simple>${exchangeProperty[loopObject].getDcaeDeploymentId()} != null</simple>
<doTry>
<setBody>
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getUndeployPayload(${exchangeProperty[loopObject]})"/>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>DELETE</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}"></log>
<toD
- uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})"/>
</setProperty>
- <setProperty propertyName="dcaeStatusUrl">
+ <setProperty name="dcaeStatusUrl">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
</setProperty>
@@ -327,10 +337,10 @@
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>UNDEPLOY loop status</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -338,7 +348,7 @@
</doTry>
</when>
<otherwise>
- <log loggingLevel="WARNING"
+ <log loggingLevel="WARN"
message="Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !','WARNING',${exchangeProperty[loopObject]})"/>
@@ -352,18 +362,18 @@
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting Deployment status')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
@@ -373,18 +383,18 @@
<when>
<simple>${exchangeProperty[getStatusUrl].contains("?")} == true
</simple>
- <setProperty propertyName="uriSeparator">
+ <setProperty name="uriSeparator">
<simple>&amp;</simple>
</setProperty>
</when>
<otherwise>
- <setProperty propertyName="uriSeparator">
+ <setProperty name="uriSeparator">
<simple>?</simple>
</setProperty>
</otherwise>
</choice>
<toD
- uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}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;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}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;authenticationPreemptive=true&amp;connectionClose=true"/>
<doCatch>
<exception>java.lang.Exception</exception>
<handled>
@@ -400,10 +410,10 @@
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>DCAE deployment status</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -417,25 +427,25 @@
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting blueprint id in inventory')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to query Dcae inventory Loop status: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
<toD
- uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&amp;asdcServiceId=${exchangeProperty[blueprintServiceId]}&amp;typeName=${exchangeProperty[blueprintName]}&amp;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;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&amp;asdcServiceId=${exchangeProperty[blueprintServiceId]}&amp;typeName=${exchangeProperty[blueprintName]}&amp;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;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
@@ -451,33 +461,33 @@
message="Getting all DCAE blueprint from inventory"/>
<to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting all blueprint from inventory')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to query Blueprints from DCAE inventory: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
- <toD uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types;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;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ <toD uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types;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;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponseList">
+ <setProperty name="dcaeResponseList">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertToDcaeInventoryResponse(${body})"/>
</setProperty>
<split>
<simple>${exchangeProperty[dcaeResponseList]}</simple>
<convertBodyTo type="org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<simple>${body}</simple>
</setProperty>
<to uri="bean:org.onap.policy.clamp.clds.model.dcae.DcaeInventoryCache?method=addDcaeInventoryResponse(${exchangeProperty[dcaeResponse]})"/>
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml
index f6a838ef0..4a3cc84b2 100644
--- a/src/main/resources/clds/camel/routes/loop-flows.xml
+++ b/src/main/resources/clds/camel/routes/loop-flows.xml
@@ -4,13 +4,13 @@
<setBody>
<simple>${header.loopName}</simple>
</setBody>
- <setProperty propertyName="loopObject">
+ <setProperty name="loopObject">
<method ref="org.onap.policy.clamp.loop.LoopService" method="getLoop" />
</setProperty>
<when>
<simple>${exchangeProperty[loopObject]} == null</simple>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>404</constant>
</setHeader>
<log loggingLevel="WARN" message="Loop not found in database: ${body}" />
@@ -19,14 +19,14 @@
</route>
<route id="update-policy-status-for-loop">
<from uri="direct:update-policy-status-for-loop" />
- <setProperty propertyName="policyComponent">
+ <setProperty name="policyComponent">
<simple>${exchangeProperty[loopObject].getComponent('POLICY')}
</simple>
</setProperty>
- <setProperty propertyName="policyFound">
+ <setProperty name="policyFound">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
- <setProperty propertyName="policyDeployed">
+ <setProperty name="policyDeployed">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
<log loggingLevel="INFO"
@@ -34,19 +34,19 @@
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${body.getName()}</simple>
</setProperty>
- <setProperty propertyName="policyType">
+ <setProperty name="policyType">
<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
</setProperty>
- <setProperty propertyName="policyTypeVersion">
+ <setProperty name="policyTypeVersion">
<simple>${body.getPolicyModel().getVersion()}</simple>
</setProperty>
- <setProperty propertyName="policyPdpGroup">
+ <setProperty name="policyPdpGroup">
<simple>${body.getPdpGroup()}</simple>
</setProperty>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>1.0.0</simple>
</setProperty>
<setBody>
@@ -61,19 +61,19 @@
<split>
<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
</simple>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${body.getName()}</simple>
</setProperty>
- <setProperty propertyName="policyType">
+ <setProperty name="policyType">
<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
</setProperty>
- <setProperty propertyName="policyTypeVersion">
+ <setProperty name="policyTypeVersion">
<simple>${body.getPolicyModel().getVersion()}</simple>
</setProperty>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>1.0.0</simple>
</setProperty>
- <setProperty propertyName="policyPdpGroup">
+ <setProperty name="policyPdpGroup">
<simple>${body.getPdpGroup()}</simple>
</setProperty>
<setBody>
@@ -83,7 +83,7 @@
message="Processing Operational Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
<to uri="direct:verify-one-policy" />
</split>
- <setProperty propertyName="policyState">
+ <setProperty name="policyState">
<simple> ${exchangeProperty[policyComponent].getState()}
</simple>
</setProperty>
@@ -100,29 +100,29 @@
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
</simple>
- <setProperty propertyName="dcaeComponent">
+ <setProperty name="dcaeComponent">
<simple>${exchangeProperty[loopObject].getComponent('DCAE')}</simple>
</setProperty>
<when>
<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()} != null
</simple>
- <setProperty propertyName="getStatusUrl">
+ <setProperty name="getStatusUrl">
<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}</simple>
</setProperty>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:get-dcae-deployment-status" />
<when>
<simple> ${header.CamelHttpResponseCode} == 200 </simple>
<convertBodyTo type="java.lang.String" />
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})" />
</setProperty>
</when>
</when>
- <setProperty propertyName="dcaeState">
+ <setProperty name="dcaeState">
<simple> ${exchangeProperty[dcaeComponent].computeState(*)}
</simple>
</setProperty>
@@ -137,32 +137,32 @@
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="microServicePolicy">
+ <setProperty name="microServicePolicy">
<simple>${body}</simple>
</setProperty>
- <setProperty propertyName="dcaeComponent">
+ <setProperty name="dcaeComponent">
<simple>${exchangeProperty[loopObject].getComponent('DCAE_' + ${exchangeProperty[microServicePolicy].getName()})}</simple>
</setProperty>
<when>
<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()} != null
</simple>
- <setProperty propertyName="getStatusUrl">
+ <setProperty name="getStatusUrl">
<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()}</simple>
</setProperty>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:get-dcae-deployment-status" />
<when>
<simple> ${header.CamelHttpResponseCode} == 200 </simple>
<convertBodyTo type="java.lang.String" />
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})" />
</setProperty>
</when>
</when>
- <setProperty propertyName="dcaeState">
+ <setProperty name="dcaeState">
<simple> ${exchangeProperty[dcaeComponent].computeState(*)}
</simple>
</setProperty>
@@ -181,14 +181,14 @@
<choice>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'BLUEPRINT_DEPLOYED' and ${exchangeProperty['policyState'].getStateName()}
+ 'BLUEPRINT_DEPLOYED' &amp;&amp; ${exchangeProperty['policyState'].getStateName()}
== 'NOT_SENT'
</simple>
<to
uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'DESIGN')" />
</when>
<when>
- <simple>${exchangeProperty['dcaeState'].getStateName()} == 'IN_ERROR' or
+ <simple>${exchangeProperty['dcaeState'].getStateName()} == 'IN_ERROR' ||
${exchangeProperty['dcaeState'].getStateName()} ==
'MICROSERVICE_INSTALLATION_FAILED'
</simple>
@@ -197,7 +197,7 @@
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_UNINSTALLATION_FAILED' or
+ 'MICROSERVICE_UNINSTALLATION_FAILED' ||
${exchangeProperty['policyState'].getStateName()} == 'IN_ERROR'
</simple>
<to
@@ -205,7 +205,7 @@
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and
+ 'MICROSERVICE_INSTALLED_SUCCESSFULLY' &amp;&amp;
${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
</simple>
<to
@@ -213,7 +213,7 @@
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and
+ 'MICROSERVICE_INSTALLED_SUCCESSFULLY' &amp;&amp;
${exchangeProperty['policyState'].getStateName()} == 'SENT'
</simple>
<to
@@ -221,8 +221,8 @@
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'BLUEPRINT_DEPLOYED' or ${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_UNINSTALLED_SUCCESSFULLY' and
+ 'BLUEPRINT_DEPLOYED' || ${exchangeProperty['dcaeState'].getStateName()} ==
+ 'MICROSERVICE_UNINSTALLED_SUCCESSFULLY' &amp;&amp;
${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
</simple>
<to
@@ -230,9 +230,9 @@
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'PROCESSING_MICROSERVICE_INSTALLATION' or
+ 'PROCESSING_MICROSERVICE_INSTALLATION' ||
${exchangeProperty['dcaeState'].getStateName()} ==
- 'PROCESSING_MICROSERVICE_UNINSTALLATION' and
+ 'PROCESSING_MICROSERVICE_UNINSTALLATION' &amp;&amp;
${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
</simple>
<to
@@ -240,7 +240,7 @@
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and
+ 'MICROSERVICE_INSTALLED_SUCCESSFULLY' &amp;&amp;
${exchangeProperty['policyState'].getStateName()} != 'NOT_SENT'
</simple>
<to
diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml
index cc51a086e..f86ade5ef 100644
--- a/src/main/resources/clds/camel/routes/policy-flows.xml
+++ b/src/main/resources/clds/camel/routes/policy-flows.xml
@@ -1,31 +1,31 @@
<routes xmlns="http://camel.apache.org/schema/spring">
<route id="verify-one-policy">
<from uri="direct:verify-one-policy"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:get-policy"/>
<when>
<simple>${header.CamelHttpResponseCode} != 200</simple>
- <setProperty propertyName="policyFound">
+ <setProperty name="policyFound">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<log loggingLevel="WARN"
message="At least one policy has not been found on policy engine: ${exchangeProperty[policyName]}"/>
</when>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:get-deployment-policy"/>
<when>
<simple>${header.CamelHttpResponseCode} != 200</simple>
- <setProperty propertyName="policyDeployed">
+ <setProperty name="policyDeployed">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<log loggingLevel="WARN"
message="At least one policy has not been deployed on policy engine: ${exchangeProperty[policyName]}"/>
</when>
- <setProperty propertyName="newPolicyState">
+ <setProperty name="newPolicyState">
<simple>${exchangeProperty[policyComponent].computeState(*)}</simple>
</setProperty>
</route>
@@ -37,25 +37,25 @@
message="Getting Policy: ${exchangeProperty[policyName]}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Get Policy')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<doCatch>
<exception>java.lang.Exception</exception>
<handled>
@@ -71,12 +71,12 @@
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policyName]} GET
Policy status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -91,25 +91,25 @@
message="Getting the policy deployment in PDP: ${exchangeProperty[policyName]}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy deployment in PDP')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policy deployment status: {{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<doCatch>
<exception>java.lang.Exception</exception>
<handled>
@@ -125,12 +125,12 @@
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policyName]} GET Policy deployment
status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -149,22 +149,22 @@
<simple>${exchangeProperty[policy].createPolicyPayload()}
</simple>
</setBody>
- <setProperty propertyName="policyModelType">
+ <setProperty name="policyModelType">
<simple>${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}</simple>
</setProperty>
- <setProperty propertyName="policyModelVersion">
+ <setProperty name="policyModelVersion">
<simple>${exchangeProperty[policy].getPolicyModel().getVersion()}</simple>
</setProperty>
<to uri="direct:create-policy"/>
<doFinally>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policy].getName()} creation
status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -179,28 +179,28 @@
message="Deleting Policy in a loop: ${exchangeProperty[policy].getName()}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy in a loop')"/>
- <setProperty propertyName="policyModelType">
+ <setProperty name="policyModelType">
<simple>${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}</simple>
</setProperty>
- <setProperty propertyName="policyModelVersion">
+ <setProperty name="policyModelVersion">
<simple>${exchangeProperty[policy].getPolicyModel().getVersion()}</simple>
</setProperty>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${exchangeProperty[policy].getName()}</simple>
</setProperty>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>1.0.0</simple>
</setProperty>
<to uri="direct:delete-policy"/>
<doFinally>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policy].getName()} removal
status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -220,14 +220,17 @@
${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"POST")}
</simple>
</setBody>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:add-multiple-policies-to-pdp-group"/>
<doFinally>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>PDP Group push ALL status</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -247,37 +250,37 @@
${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"DELETE")}
</simple>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to remove policies from PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>PDP Group remove ALL status</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -292,15 +295,15 @@
message="Removing policy from active PDP group for loop: ${exchangeProperty[loopObject].getName()}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Removing one policy PDP group')"/>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>1.0.0</simple>
</setProperty>
<to uri="direct:undeploy-one-policy-from-pap"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policyName]} PDP Group removal status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -309,10 +312,10 @@
<handled>
<constant>false</constant>
</handled>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>PDP Group removal, Error reported: ${exception}</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
@@ -331,25 +334,25 @@
<log loggingLevel="INFO" message="Getting all the policy models"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting all the policy models')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get all policy models: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
@@ -366,25 +369,25 @@
message="Getting the policy tosca model: ${exchangeProperty[policyModelType]}/${exchangeProperty[policyModelVersion]}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy model')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policy model: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
@@ -401,25 +404,25 @@
message="Getting the list of PDP Groups"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the PDP Group list')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policy model: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
@@ -436,25 +439,25 @@
message="Getting the policies list"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policies list')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policies list: {{clamp.config.policy.api.url}}/policy/api/v1/policies"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
@@ -471,28 +474,28 @@
message="Add policies to PDP group"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to add policies to PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
@@ -510,25 +513,25 @@
<setBody>
<constant>null</constant>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>DELETE</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to delete policy from PDP Group: {{clamp.config.policy.pap.url}}/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
@@ -545,28 +548,28 @@
message="Create Policy from model ${exchangeProperty[policyModelType]}/${exchangeProperty[policyModelVersion]}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Policy')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to create policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
@@ -584,25 +587,25 @@
<setBody>
<constant>null</constant>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>DELETE</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to delete policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
diff --git a/src/main/resources/clds/camel/routes/utils-flows.xml b/src/main/resources/clds/camel/routes/utils-flows.xml
index d5da4faee..90900f842 100644
--- a/src/main/resources/clds/camel/routes/utils-flows.xml
+++ b/src/main/resources/clds/camel/routes/utils-flows.xml
@@ -1,7 +1,7 @@
<routes xmlns="http://camel.apache.org/schema/spring">
<route id="reset-raise-http-exception-flag">
<from uri="direct:reset-raise-http-exception-flag" />
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
</route>
@@ -19,7 +19,7 @@
<otherwise>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','${exchangeProperty[logComponent]}',${exchangeProperty[loopObject]})" />
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<constant>null</constant>
</setProperty>
</otherwise>