diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2021-02-19 16:32:47 +0100 |
|---|---|---|
| committer | sebdet <sebastien.determe@intl.att.com> | 2021-02-19 16:32:47 +0100 |
| commit | dadac06a2eef145528d548aa78b89227a86f3520 (patch) | |
| tree | 4b6d736b6f3695844389a78b72e2dc220f01e0c8 | |
| parent | c427e6459d066859e6da068bf50c78a0d120080a (diff) | |
Change PAP Urls called
Due to the changes done on the PAP Url (+return code), the camel flows must be adapted. There is no change required for the return code PAP change as Camel already catches all non 2XX code.
Issue-ID: POLICY-3068
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I77549f944d28acd5e39e4d9e7e47688146db3681
| -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> |