strengthen APPC Response Cleanup Rules

The existing APPC Response Cleanup Rules will drop responses
that are not specific for that control loop.   For example
vDNS control loop will drop LCM Response for vCPE control loops
preventing progress of the use cases.

This only happens when the control loops coexist with the
current set of rules.

Change-Id: I5a9ae26e39ecce8dd7f1098d02b6c6b97650b67a
Issue-ID: POLICY-298
Signed-off-by: Jorge Hernandez <jh1730@att.com>

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index 3273dc6..fc0cd29 100644 (file)
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
@@ -800,7 +800,7 @@ rule "${policyName}.APPC.RESPONSE.CLEANUP"
     when
         $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" )
         $response : Response($id : getCommonHeader().RequestID )
-        not ( VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) 
+        not ( VirtualControlLoopEvent( requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) 
     then
 
     Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
@@ -906,7 +906,7 @@ rule "${policyName}.APPC.LCM.RESPONSE.CLEANUP"
     when
         $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" )
         $response : LCMResponseWrapper($id : getBody().getCommonHeader().getRequestId )
-        not ( VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) 
+        not ( VirtualControlLoopEvent( requestID == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) 
     then
     
     Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());