aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/resources
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-10-08 15:11:07 +0200
committerS�bastien Determe <sebastien.determe@intl.att.com>2020-10-08 13:34:30 +0000
commitcd3dec378e3ad194d8708b45e653471b4a73d326 (patch)
treecba1d8fa6217dfb27473e162d9e3f363ff079b68 /src/main/resources
parentaf0e07856b2a86acd44e65342bd8f19e10dc51a3 (diff)
Fix issue with isLegacy()
Method has been removed, this must be removed from the policy camel code Issue-ID: CLAMP-948 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ic37db72c2499c2d56c08bd71ed900c0d939aa64b
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/clds/camel/routes/loop-flows.xml16
-rw-r--r--src/main/resources/clds/camel/routes/policy-flows.xml16
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