Fix issue with isLegacy()

[clamp.git] / src / main / resources / clds / camel / routes / loop-flows.xml

diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml
index 8c22743..d0d5525 100644 (file)
--- a/src/main/resources/clds/camel/routes/loop-flows.xml
+++ b/src/main/resources/clds/camel/routes/loop-flows.xml
@@ -40,6 +40,9 @@
                        <setProperty propertyName="policyType">
                                <simple>${body.getPolicyModel().getPolicyModelType()}</simple>
                        </setProperty>
+                       <setProperty propertyName="policyTypeVersion">
+                               <simple>${body.getPolicyModel().getVersion()}</simple>
+                       </setProperty>
                        <setProperty propertyName="policyVersion">
                                <simple>1.0.0</simple>
                        </setProperty>
@@ -61,7 +64,10 @@
                        <setProperty propertyName="policyType">
                                <simple>${body.getPolicyModel().getPolicyModelType()}</simple>
                        </setProperty>
-                       <setProperty propertyName="policyVersion">
+                       <setProperty propertyName="policyTypeVersion">
+                               <simple>${body.getPolicyModel().getVersion()}</simple>
+                       </setProperty>
+                       <setProperty propertyName="policyVersion">
                                <simple>1.0.0</simple>
                        </setProperty>
                        <setProperty propertyName="operationalPolicy">
@@ -71,29 +77,8 @@
                                <constant>null</constant>
                        </setBody>
                        <log loggingLevel="INFO"
-                               message="Processing Micro Service Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
+                               message="Processing Operational Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
                        <to uri="direct:verify-one-policy" />
-                       <log loggingLevel="INFO"
-                               message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
-                       <split>
-                               <simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
-                               </simple>
-                               <setProperty propertyName="policyName">
-                                       <simple>${body.getKey()}</simple>
-                               </setProperty>
-                               <setProperty propertyName="policyType">
-                                       <simple>onap.policies.controlloop.Guard</simple>
-                               </setProperty>
-                               <setProperty propertyName="policyVersion">
-                                       <simple>1</simple>
-                               </setProperty>
-                               <setBody>
-                                       <constant>null</constant>
-                               </setBody>
-                               <log loggingLevel="INFO"
-                                       message="Processing Guard Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
-                               <to uri="direct:verify-one-policy" />
-                       </split>
                </split>
                <setProperty propertyName="policyState">
                        <simple> ${exchangeProperty[policyComponent].getState()}