Fix issues with drools pdp of policy framework

Https does not seem to be working in the policy framework, hence changed it to http.
All other components of the framework are also using http.

The following REST call succeeds now that shows the health of drools along with other components:

curl -k -u 'healthcheck:zb!XztG34' -X GET "https://localhost:6868/policy/pap/v1/components/healthcheck"

{"pdps":{"xacml":[{"instanceId":"policy-xacml-pdp","pdpState":"ACTIVE","healthy":"HEALTHY"}],"drools":[{"instanceId":"drools-apps","pdpState":"ACTIVE","healthy":"HEALTHY"}],"apex":[{"instanceId":"policy-apex-pdp","pdpState":"ACTIVE","healthy":"HEALTHY","message":"Pdp Heartbeat"}]},"healthy":true,"api":{"name":"Policy API","url":"https://policy-api:6969/policy/api/v1/healthcheck","healthy":true,"code":200,"message":"alive"},"pap":{"name":"Policy PAP","url":"https://policy-pap:6969/policy/pap/v1/healthcheck","healthy":true,"code":200,"message":"alive"}}

Change-Id: Ie33beafc00176b99eb395d962e3aaceb95a23ee8
Issue-ID: NONRTRIC-533
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-CL-topic.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-CL-topic.properties
index f265b7c..77362f2 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-CL-topic.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-CL-topic.properties
@@ -20,9 +20,9 @@ dmaap.source.topics=APPC-CL
 dmaap.sink.topics=APPC-CL
 
 dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS}
-dmaap.source.topics.APPC-CL.https=true
+dmaap.source.topics.APPC-CL.https=false
 dmaap.source.topics.APPC-CL.selfSignedCertificates=true
 
 dmaap.sink.topics.APPC-CL.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.APPC-CL.https=true
+dmaap.sink.topics.APPC-CL.https=false
 dmaap.sink.topics.APPC-CL.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-LCM-READ-topic.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-LCM-READ-topic.properties
index f4a48dc..f444f38 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-LCM-READ-topic.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-LCM-READ-topic.properties
@@ -19,5 +19,5 @@
 dmaap.sink.topics=APPC-LCM-READ
 
 dmaap.sink.topics.APPC-LCM-READ.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.APPC-LCM-READ.https=true
+dmaap.sink.topics.APPC-LCM-READ.https=false
 dmaap.sink.topics.APPC-LCM-READ.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-LCM-WRITE-topic.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-LCM-WRITE-topic.properties
index 51cb018..2398550 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-LCM-WRITE-topic.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/APPC-LCM-WRITE-topic.properties
@@ -19,5 +19,5 @@
 dmaap.source.topics=APPC-LCM-WRITE
 
 dmaap.source.topics.APPC-LCM-WRITE.servers=${env:DMAAP_SERVERS}
-dmaap.source.topics.APPC-LCM-WRITE.https=true
+dmaap.source.topics.APPC-LCM-WRITE.https=false
 dmaap.source.topics.APPC-LCM-WRITE.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/DCAE_CL_RSP-topic.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/DCAE_CL_RSP-topic.properties
index b02f90c..b31cddb 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/DCAE_CL_RSP-topic.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/DCAE_CL_RSP-topic.properties
@@ -19,5 +19,5 @@
 dmaap.sink.topics=DCAE_CL_RSP
 
 dmaap.sink.topics.DCAE_CL_RSP.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.DCAE_CL_RSP.https=true
+dmaap.sink.topics.DCAE_CL_RSP.https=false
 dmaap.sink.topics.DCAE_CL_RSP.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/DCAE_TOPIC-topic.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/DCAE_TOPIC-topic.properties
index 608ba8d..38f9f89 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/DCAE_TOPIC-topic.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/DCAE_TOPIC-topic.properties
@@ -21,5 +21,5 @@ dmaap.source.topics=DCAE_TOPIC
 dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC}
 dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS}
 dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP}
-dmaap.source.topics.DCAE_TOPIC.https=true
+dmaap.source.topics.DCAE_TOPIC.https=false
 dmaap.source.topics.DCAE_TOPIC.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/GUARD-http-client.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/GUARD-http-client.properties
index e4c2553..4266b04 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/GUARD-http-client.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/GUARD-http-client.properties
@@ -19,7 +19,7 @@
 http.client.services=GUARD
 
 http.client.services.GUARD.managed=true
-http.client.services.GUARD.https=true
+http.client.services.GUARD.https=false
 http.client.services.GUARD.host=${envd:PDP_HOST}
 http.client.services.GUARD.port=${envd:PDP_PORT}
 http.client.services.GUARD.userName=${envd:PDP_USERNAME}

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/POLICY-CL-MGT-topic.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/POLICY-CL-MGT-topic.properties
index f2b6826..7fa0f10 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/POLICY-CL-MGT-topic.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/POLICY-CL-MGT-topic.properties
@@ -18,5 +18,5 @@
 
 dmaap.sink.topics=POLICY-CL-MGT
 dmaap.sink.topics.POLICY-CL-MGT.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.POLICY-CL-MGT.https=true
+dmaap.sink.topics.POLICY-CL-MGT.https=false
 dmaap.sink.topics.POLICY-CL-MGT.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNC-http-client.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNC-http-client.properties
index 9115950..3f91b07 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNC-http-client.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNC-http-client.properties
@@ -19,7 +19,7 @@
 http.client.services=SDNC
 
 http.client.services.SDNC.managed=true
-http.client.services.SDNC.https=true
+http.client.services.SDNC.https=false
 http.client.services.SDNC.host=${envd:SDNC_HOST}
 http.client.services.SDNC.port=${envd:SDNC_PORT}
 http.client.services.SDNC.userName=${envd:SDNC_USERNAME}

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNR-CL-RSP-topic.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNR-CL-RSP-topic.properties
index 27a762c..79b5e55 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNR-CL-RSP-topic.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNR-CL-RSP-topic.properties
@@ -18,5 +18,5 @@
 
 dmaap.source.topics=SDNR-CL-RSP
 dmaap.source.topics.SDNR-CL-RSP.servers=${env:DMAAP_SERVERS}
-dmaap.source.topics.SDNR-CL-RSP.https=true
+dmaap.source.topics.SDNR-CL-RSP.https=false
 dmaap.source.topics.SDNR-CL-RSP.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNR-CL-topic.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNR-CL-topic.properties
index 8f2a26c..5eac5e3 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNR-CL-topic.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/SDNR-CL-topic.properties
@@ -19,5 +19,5 @@
 dmaap.sink.topics=SDNR-CL
 
 dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.SDNR-CL.https=true
+dmaap.sink.topics.SDNR-CL.https=false
 dmaap.sink.topics.SDNR-CL.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/VFC-http-client.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/VFC-http-client.properties
index 454e8a9..c267b7a 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/VFC-http-client.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/VFC-http-client.properties
@@ -19,7 +19,7 @@
 http.client.services=VFC
 
 http.client.services.VFC.managed=true
-http.client.services.VFC.https=true
+http.client.services.VFC.https=false
 http.client.services.VFC.host=${envd:VFC_HOST}
 http.client.services.VFC.port=${envd:VFC_PORT}
 http.client.services.VFC.userName=${envd:VFC_USERNAME}

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/engine.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/engine.properties
index cf2ed85..01e6ed6 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/engine.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/engine.properties
@@ -29,7 +29,7 @@ dmaap.source.topics.PDPD-CONFIGURATION.apiSecret=${envd:PDPD_CONFIGURATION_API_S
 dmaap.source.topics.PDPD-CONFIGURATION.consumerGroup=${envd:PDPD_CONFIGURATION_CONSUMER_GROUP}
 dmaap.source.topics.PDPD-CONFIGURATION.consumerInstance=${envd:PDPD_CONFIGURATION_CONSUMER_INSTANCE}
 dmaap.source.topics.PDPD-CONFIGURATION.managed=false
-dmaap.source.topics.PDPD-CONFIGURATION.https=true
+dmaap.source.topics.PDPD-CONFIGURATION.https=false
 dmaap.source.topics.PDPD-CONFIGURATION.selfSignedCertificates=true
 
 http.server.services=SECURED-CONFIG
@@ -41,7 +41,7 @@ http.server.services.SECURED-CONFIG.password=${envd:TELEMETRY_PASSWORD}
 http.server.services.SECURED-CONFIG.restPackages=org.onap.policy.drools.server.restful
 http.server.services.SECURED-CONFIG.managed=false
 http.server.services.SECURED-CONFIG.swagger=true
-http.server.services.SECURED-CONFIG.https=true
+http.server.services.SECURED-CONFIG.https=false
 http.server.services.SECURED-CONFIG.aaf=${envd:AAF:false}
 http.server.services.SECURED-CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler
 

diff --git a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/feature-lifecycle.properties b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/feature-lifecycle.properties
index 2ce112e..ab97035 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/feature-lifecycle.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools-apps/custom/feature-lifecycle.properties
@@ -29,12 +29,12 @@ dmaap.source.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS}
 dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
 dmaap.source.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
 dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
-dmaap.source.topics.POLICY-PDP-PAP.https=true
+dmaap.source.topics.POLICY-PDP-PAP.https=false
 dmaap.source.topics.POLICY-PDP-PAP.selfSignedCertificates=true
 
 dmaap.sink.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS}
 dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
 dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
 dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
-dmaap.sink.topics.POLICY-PDP-PAP.https=true
+dmaap.sink.topics.POLICY-PDP-PAP.https=false
 dmaap.sink.topics.POLICY-PDP-PAP.selfSignedCertificates=true

diff --git a/docker-compose/docker-compose-policy-framework/config/drools/custom/engine.properties b/docker-compose/docker-compose-policy-framework/config/drools/custom/engine.properties
index dfc6a7d..790bf55 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/config/drools/custom/engine.properties
+++ b/docker-compose/docker-compose-policy-framework/config/drools/custom/engine.properties
@@ -29,7 +29,7 @@ http.server.services.SECURED-CONFIG.password=${envd:TELEMETRY_PASSWORD}
 http.server.services.SECURED-CONFIG.restPackages=org.onap.policy.drools.server.restful
 http.server.services.SECURED-CONFIG.managed=false
 http.server.services.SECURED-CONFIG.swagger=true
-http.server.services.SECURED-CONFIG.https=true
+http.server.services.SECURED-CONFIG.https=false
 http.server.services.SECURED-CONFIG.aaf=${envd:AAF:false}
 http.server.services.SECURED-CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler
 

diff --git a/docker-compose/docker-compose-policy-framework/docker-compose.yml b/docker-compose/docker-compose-policy-framework/docker-compose.yml
index 4cdde39..8b13d48 100644 (file)
--- a/docker-compose/docker-compose-policy-framework/docker-compose.yml
+++ b/docker-compose/docker-compose-policy-framework/docker-compose.yml
@@ -138,11 +138,7 @@ services:
         '-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
         'mariadb', '3306',
         'dmaap-mr', '3904',
-        'pap', '6969',
-        'dmaap-mr', '6666',
-        'dmaap-mr', '6668',
-        'dmaap-mr', '6669',
-        'dmaap-mr', '6670'
+        'pap', '6969'
         ]
    apex-pdp:
       image: onap/policy-apex-pdp:latest