diff options
| author |   brunomilitzer <bruno.militzer@est.tech> | 2021-11-22 17:42:40 +0000 |
|---|---|---|
| committer | brunomilitzer <bruno.militzer@est.tech> | 2021-11-22 17:45:22 +0000 |
| commit | bb4a2a1b856bce7ea3d9ede8f8fe8e279f3f0d75 (patch) | |
| tree | 86da4ee82e747266775a732735ce06bec48c39ec /runtime/src/main/resources/clds | |
| parent | 226d4c344baa504d90ba7a3a4f3e17733ebc1df8 (diff) | |
Added Camel Unit Tests
Added two camel unit tests related to deleting
tosca instance properties and the other to change
the order state.
Removed name and version paramaters in create instance properties
camel rest endpoint.
Issue-ID: POLICY-3568
Change-Id: I6cec03545263055eb7c6be2798dd5c8fe5a646b6
Signed-off-by: brunomilitzer <bruno.militzer@est.tech>
Diffstat (limited to 'runtime/src/main/resources/clds')
| -rw-r--r-- | runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml | 3 | ||||
| -rw-r--r-- | runtime/src/main/resources/clds/camel/routes/controlloop-flows.xml | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml index e7ba1283f..8c9824ef7 100644 --- a/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml +++ b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml @@ -1648,8 +1648,7 @@ <get uri="/v2/toscaControlLoop/getToscaInstantiation" outType="java.lang.String" bindingMode="off" produces="application/json"> <route> - <removeHeaders pattern="*" - excludePattern="name|version|requestId"/> + <removeHeaders pattern="*"/> <doTry> <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Instantiation ')"/> <to uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')"/> diff --git a/runtime/src/main/resources/clds/camel/routes/controlloop-flows.xml b/runtime/src/main/resources/clds/camel/routes/controlloop-flows.xml index 200eac780..146ab14d5 100644 --- a/runtime/src/main/resources/clds/camel/routes/controlloop-flows.xml +++ b/runtime/src/main/resources/clds/camel/routes/controlloop-flows.xml @@ -98,16 +98,10 @@ <setHeader name="Content-Type"> <constant>application/json</constant> </setHeader> - <setProperty name="name"> - <simple>${header.name}</simple> - </setProperty> - <setProperty name="version"> - <simple>${header.version}</simple> - </setProperty> <log loggingLevel="INFO" message="Endpoint to get Tosca Instantiation: {{clamp.config.controlloop.runtime.url}}/onap/controlloop/v2/instantiation"></log> <toD - uri="{{clamp.config.controlloop.runtime.url}}/onap/controlloop/v2/instantiation?name=${exchangeProperty[name]}&version=${exchangeProperty[version]}&bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.controlloop.runtime.userName}}&authPassword={{clamp.config.controlloop.runtime.password}}&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.controlloop.runtime.url}}/onap/controlloop/v2/instantiation?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.controlloop.runtime.userName}}&authPassword={{clamp.config.controlloop.runtime.password}}&authenticationPreemptive=true&connectionClose=true"/> <convertBodyTo type="java.lang.String"/> <doFinally> <to uri="direct:reset-raise-http-exception-flag"/> @@ -163,7 +157,7 @@ <log loggingLevel="INFO" message="Endpoint to send Tosca Instance Properties: {{clamp.config.controlloop.runtime.url}}/onap/controlloop/v2/instanceProperties"></log> <toD - uri="{{clamp.config.controlloop.runtime.url}}/onap/controlloop/v2/instanceProperties? bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.controlloop.runtime.userName}}&authPassword={{clamp.config.controlloop.runtime.password}}&authenticationPreemptive=true&connectionClose=true"/> + uri="{{clamp.config.controlloop.runtime.url}}/onap/controlloop/v2/instanceProperties?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.controlloop.runtime.userName}}&authPassword={{clamp.config.controlloop.runtime.password}}&authenticationPreemptive=true&connectionClose=true"/> <convertBodyTo type="java.lang.String"/> <doFinally> <to uri="direct:reset-raise-http-exception-flag"/> |