Change Controller Filters

The controller properties files have been updated to use
json-path filters in support of the drools-pdp infrastructure
changes.

Issue-ID: POLICY-1489
Change-Id: I21a7ff18bc3716bd675a1d740e7acdf971394e92
Signed-off-by: Daniel Cruz <dc443y@att.com>

2 files changed, 11 insertions, 11 deletions

diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
index d7dc0c1c0..dd2bd86e4 100644
--- a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
+++ b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP
 # ================================================================================
-# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ dmaap.source.topics.${{DCAE_TOPIC}}.apiKey=
 dmaap.source.topics.${{DCAE_TOPIC}}.apiSecret=
 dmaap.source.topics.${{DCAE_TOPIC}}.consumerGroup=${{DCAE_CONSUMER_GROUP}}
 dmaap.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-dmaap.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.*
+dmaap.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)]
 dmaap.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
 dmaap.source.topics.${{DCAE_TOPIC}}.https=true
 
@@ -35,7 +35,7 @@ dmaap.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
 dmaap.source.topics.APPC-CL.apiKey=
 dmaap.source.topics.APPC-CL.apiSecret=
 dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response
-dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.*
+dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)]
 dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
 dmaap.source.topics.APPC-CL.servers.https=true
 
@@ -43,7 +43,7 @@ dmaap.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}}
 dmaap.source.topics.APPC-LCM-WRITE.apiKey=
 dmaap.source.topics.APPC-LCM-WRITE.apiSecret=
 dmaap.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper
-dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=type\=response
+dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=[?($.type == 'response')]
 dmaap.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
 dmaap.source.topics.APPC-LCM-WRITE.https=true
 
@@ -51,7 +51,7 @@ dmaap.source.topics.SDNR-CL-RSP.servers=${{DMAAP_SERVERS}}
 dmaap.source.topics.SDNR-CL-RSP.apiKey=
 dmaap.source.topics.SDNR-CL-RSP.apiSecret=
 dmaap.source.topics.SDNR-CL-RSP.events=org.onap.policy.sdnr.PciResponseWrapper
-dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=type\=response
+dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=[?($.type == 'response')]
 dmaap.source.topics.SDNR-CL-RSP.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson
 dmaap.source.topics.SDNR-CL-RSP.https=true
 
diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
index 3ec25f7a2..4f064c2ba 100644
--- a/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
+++ b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP
 # ================================================================================
-# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${{PDPD_CONFIGURATION_
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events=org.onap.policy.controlloop.params.ControlLoopParams
-dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=closedLoopControlName=.*,controlLoopYaml=.*
+dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=[?($.closedLoopControlName =~ /.*/ && $.controlLoopYaml =~ /.*/)]
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.https=true
 
 dmaap.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
@@ -34,7 +34,7 @@ dmaap.source.topics.${{DCAE_TOPIC}}.apiKey=
 dmaap.source.topics.${{DCAE_TOPIC}}.apiSecret=
 dmaap.source.topics.${{DCAE_TOPIC}}.consumerGroup=${{DCAE_CONSUMER_GROUP}}
 dmaap.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-dmaap.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.*
+dmaap.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)]
 dmaap.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
 dmaap.source.topics.${{DCAE_TOPIC}}.https=true
 
@@ -42,7 +42,7 @@ dmaap.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
 dmaap.source.topics.APPC-CL.apiKey=
 dmaap.source.topics.APPC-CL.apiSecret=
 dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response
-dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.*
+dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)]
 dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
 dmaap.source.topics.APPC-CL.https=true
 
@@ -50,7 +50,7 @@ dmaap.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}}
 dmaap.source.topics.APPC-LCM-WRITE.apiKey=
 dmaap.source.topics.APPC-LCM-WRITE.apiSecret=
 dmaap.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper
-dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=type\=response
+dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=[?($.type == 'response')]
 dmaap.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
 dmaap.source.topics.APPC-LCM-WRITE.https=true
 
@@ -92,6 +92,6 @@ dmaap.source.topics.SDNR-CL-RSP.servers=${{DMAAP_SERVERS}}
 dmaap.source.topics.SDNR-CL-RSP.apiKey=
 dmaap.source.topics.SDNR-CL-RSP.apiSecret=
 dmaap.source.topics.SDNR-CL-RSP.events=org.onap.policy.sdnr.PciResponseWrapper
-dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=type\=response
+dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=[?($.type == 'response')]
 dmaap.source.topics.SDNR-CL-RSP.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson
 dmaap.source.topics.SDNR-CL-RSP.https=true