diff options
author | 2021-02-25 10:46:38 +0000 | |
---|---|---|
committer | 2021-02-25 10:46:38 +0000 | |
commit | 28fec8195c16e1bfa8b68098b9c5fbb3af07dd5f (patch) | |
tree | e1ab787ababc82c4c58a49493ab3318b4c1775da /src/main/resources | |
parent | 461dc5ccc9bfa200caece0d824ce9918a14e2f0c (diff) | |
parent | 831d28354c67a6974d3a3f8c2b13365ca0380ef5 (diff) |
Merge "Change PAP Urls called" into tosca-poc
Diffstat (limited to 'src/main/resources')
-rw-r--r-- | src/main/resources/clds/camel/routes/loop-flows.xml | 7 | ||||
-rw-r--r-- | src/main/resources/clds/camel/routes/policy-flows.xml | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml index d5ab050cf..f6a838ef0 100644 --- a/src/main/resources/clds/camel/routes/loop-flows.xml +++ b/src/main/resources/clds/camel/routes/loop-flows.xml @@ -43,6 +43,9 @@ <setProperty propertyName="policyTypeVersion"> <simple>${body.getPolicyModel().getVersion()}</simple> </setProperty> + <setProperty propertyName="policyPdpGroup"> + <simple>${body.getPdpGroup()}</simple> + </setProperty> <setProperty propertyName="policyVersion"> <simple>1.0.0</simple> </setProperty> @@ -70,8 +73,8 @@ <setProperty propertyName="policyVersion"> <simple>1.0.0</simple> </setProperty> - <setProperty propertyName="operationalPolicy"> - <simple>${body}</simple> + <setProperty propertyName="policyPdpGroup"> + <simple>${body.getPdpGroup()}</simple> </setProperty> <setBody> <constant>null</constant> diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml index dda5f2cf2..0a9c1f511 100644 --- a/src/main/resources/clds/camel/routes/policy-flows.xml +++ b/src/main/resources/clds/camel/routes/policy-flows.xml @@ -107,9 +107,9 @@ </simple> </setHeader> <log loggingLevel="INFO" - message="Endpoint to get policy deployment status: {{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0"></log> + 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/deployed/${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}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/> <doCatch> <exception>java.lang.Exception</exception> <handled> |