diff options
| -rw-r--r-- | src/main/resources/clds/camel/routes/loop-flows.xml | 16 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/routes/policy-flows.xml | 16 |
2 files changed, 6 insertions, 26 deletions
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml index 691656d81..d0d552568 100644 --- a/src/main/resources/clds/camel/routes/loop-flows.xml +++ b/src/main/resources/clds/camel/routes/loop-flows.xml @@ -67,19 +67,9 @@ <setProperty propertyName="policyTypeVersion"> <simple>${body.getPolicyModel().getVersion()}</simple> </setProperty> - <choice> - <when> - <simple>${body.isLegacy()} == true</simple> - <setProperty propertyName="policyVersion"> - <simple>1</simple> - </setProperty> - </when> - <otherwise> - <setProperty propertyName="policyVersion"> - <simple>1.0.0</simple> - </setProperty> - </otherwise> - </choice> + <setProperty propertyName="policyVersion"> + <simple>1.0.0</simple> + </setProperty> <setProperty propertyName="operationalPolicy"> <simple>${body}</simple> </setProperty> diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml index f597bdc08..355aba788 100644 --- a/src/main/resources/clds/camel/routes/policy-flows.xml +++ b/src/main/resources/clds/camel/routes/policy-flows.xml @@ -279,19 +279,9 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <choice> - <when> - <simple>${exchangeProperty[policy].isLegacy()} == true</simple> - <setProperty propertyName="policyVersion"> - <simple>1</simple> - </setProperty> - </when> - <otherwise> - <setProperty propertyName="policyVersion"> - <simple>1.0.0</simple> - </setProperty> - </otherwise> - </choice> + <setProperty propertyName="policyVersion"> + <simple>1.0.0</simple> + </setProperty> <log loggingLevel="INFO" message="Endpoint to delete policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}"></log> <toD |