diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2021-04-07 10:10:45 +0200 |
|---|---|---|
| committer | sebdet <sebastien.determe@intl.att.com> | 2021-04-15 17:49:58 +0200 |
| commit | 1f2d62dd48694fa78041572a200b3e5d04bd268e (patch) | |
| tree | 58989ac6875277998b07d97be9883a039ee970b4 /src/main/resources/clds/camel/routes | |
| parent | 58e7987439bca70cdd2715863a020b76baa8ac1c (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/routes')
| -rw-r--r-- | src/main/resources/clds/camel/routes/cds-flows.xml | 12 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/routes/dcae-flows.xml | 152 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/routes/loop-flows.xml | 74 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/routes/policy-flows.xml | 175 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/routes/utils-flows.xml | 4 |
5 files changed, 215 insertions, 202 deletions
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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.cds.userName}}&authPassword={{clamp.config.cds.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/> + <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.cds.userName}}&authPassword={{clamp.config.cds.password}}&authenticationPreemptive=true&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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.cds.userName}}&authPassword={{clamp.config.cds.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/> + <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.cds.userName}}&authPassword={{clamp.config.cds.password}}&authenticationPreemptive=true&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&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&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&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&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&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&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&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&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>&</simple> </setProperty> </when> <otherwise> - <setProperty propertyName="uriSeparator"> + <setProperty name="uriSeparator"> <simple>?</simple> </setProperty> </otherwise> </choice> <toD - uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/> + uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&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]}&asdcServiceId=${exchangeProperty[blueprintServiceId]}&typeName=${exchangeProperty[blueprintName]}&bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&asdcServiceId=${exchangeProperty[blueprintServiceId]}&typeName=${exchangeProperty[blueprintName]}&bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/> + <toD uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types;bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&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' && ${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' && ${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' && ${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' && ${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' && ${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' && ${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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&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&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&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&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policies?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&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&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&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&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&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&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&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&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&deleteWithBody=false&mapHttpMessageBody=false&mapHttpMessageFormUrlEncodedBody=false&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&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&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&deleteWithBody=false&mapHttpMessageBody=false&mapHttpMessageFormUrlEncodedBody=false&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&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> |