disable http for drools apps using dmaap

per security guidelines ..

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

2 files changed, 54 insertions, 47 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 e1267afa1..0d5013868 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
@@ -29,7 +29,7 @@ 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.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
-dmaap.source.topics.${{DCAE_TOPIC}}.https=false
+dmaap.source.topics.${{DCAE_TOPIC}}.https=true
 
 dmaap.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
 dmaap.source.topics.APPC-CL.apiKey=
@@ -37,7 +37,7 @@ 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.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
-dmaap.source.topics.APPC-CL.servers.https=false
+dmaap.source.topics.APPC-CL.servers.https=true
 
 dmaap.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}}
 dmaap.source.topics.APPC-LCM-WRITE.apiKey=
@@ -45,7 +45,7 @@ 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.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
-dmaap.source.topics.APPC-LCM-WRITE.https=false
+dmaap.source.topics.APPC-LCM-WRITE.https=true
 
 dmaap.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT
 
@@ -54,21 +54,21 @@ dmaap.sink.topics.APPC-CL.apiKey=
 dmaap.sink.topics.APPC-CL.apiSecret=
 dmaap.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
 dmaap.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
-dmaap.sink.topics.APPC-CL.https=false
+dmaap.sink.topics.APPC-CL.https=true
 
 dmaap.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}}
 dmaap.sink.topics.APPC-LCM-READ.apiKey=
 dmaap.sink.topics.APPC-LCM-READ.apiSecret=
 dmaap.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LcmRequestWrapper
 dmaap.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
-dmaap.sink.topics.APPC-LCM-READ.https=false
+dmaap.sink.topics.APPC-LCM-READ.https=true
 
 dmaap.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
 dmaap.sink.topics.POLICY-CL-MGT.apiKey=
 dmaap.sink.topics.POLICY-CL-MGT.apiSecret=
 dmaap.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
 dmaap.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
-dmaap.sink.topics.POLICY-CL-MGT.https=false
+dmaap.sink.topics.POLICY-CL-MGT.https=true
 
 rules.groupId=
 rules.artifactId=
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 5d1a0a3c6..5c055009b 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
@@ -20,55 +20,62 @@
 
 controller.name=casablanca
 
-ueb.source.topics=${{PDPD_CONFIGURATION_TOPIC}},${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE
+dmaap.source.topics=${{PDPD_CONFIGURATION_TOPIC}},${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE
 
-ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${{PDPD_CONFIGURATION_SERVERS}}
-ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=
-ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=
-ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events=org.onap.policy.controlloop.params.ControlLoopParams
-ueb.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=closedLoopControlName=.*,controlLoopYaml=.*
+dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${{PDPD_CONFIGURATION_SERVERS}}
+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}}.https=true
 
-ueb.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
-ueb.source.topics.${{DCAE_TOPIC}}.apiKey=
-ueb.source.topics.${{DCAE_TOPIC}}.apiSecret=
-ueb.source.topics.${{DCAE_TOPIC}}.consumerGroup=${{DCAE_CONSUMER_GROUP}}
-ueb.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.*
-ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
+dmaap.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
+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.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
+dmaap.source.topics.${{DCAE_TOPIC}}.https=true
 
-ueb.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
-ueb.source.topics.APPC-CL.apiKey=
-ueb.source.topics.APPC-CL.apiSecret=
-ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response
-ueb.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.*
-ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+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.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.source.topics.APPC-CL.https=true
 
-ueb.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}}
-ueb.source.topics.APPC-LCM-WRITE.apiKey=
-ueb.source.topics.APPC-LCM-WRITE.apiSecret=
-ueb.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper
-ueb.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=type\=response
-ueb.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+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.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.source.topics.APPC-LCM-WRITE.https=true
 
-ueb.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT
+dmaap.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT
 
-ueb.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.APPC-CL.apiKey=
-ueb.sink.topics.APPC-CL.apiSecret=
-ueb.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
-ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
+dmaap.sink.topics.APPC-CL.apiKey=
+dmaap.sink.topics.APPC-CL.apiSecret=
+dmaap.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
+dmaap.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.sink.topics.APPC-CL.https=true
 
-ueb.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.APPC-LCM-READ.apiKey=
-ueb.sink.topics.APPC-LCM-READ.apiSecret=
-ueb.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LcmRequestWrapper
-ueb.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}}
+dmaap.sink.topics.APPC-LCM-READ.apiKey=
+dmaap.sink.topics.APPC-LCM-READ.apiSecret=
+dmaap.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LcmRequestWrapper
+dmaap.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.sink.topics.APPC-LCM-READ.https=true
 
-ueb.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.POLICY-CL-MGT.apiKey=
-ueb.sink.topics.POLICY-CL-MGT.apiSecret=
-ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
-ueb.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+dmaap.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
+dmaap.sink.topics.POLICY-CL-MGT.apiKey=
+dmaap.sink.topics.POLICY-CL-MGT.apiSecret=
+dmaap.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
+dmaap.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+dmaap.sink.topics.POLICY-CL-MGT.https=true
 
 rules.groupId=${project.groupId}
 rules.artifactId=controller-casablanca