Use env variables in drools/drools-apps CSITs

Issue-ID: POLICY-3199
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Iefd75ae810c7b91b8cc37469b1169031346b2c4e
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

4 files changed, 6 insertions, 97 deletions

diff --git a/csit/config/drools-apps/custom/engine.properties b/csit/config/drools-apps/custom/engine.properties
deleted file mode 100644
index ee55f28a..00000000
--- a/csit/config/drools-apps/custom/engine.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright (C) 2021 Bell Canada. 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.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-# Policy Engine Configuration Channels
-
-dmaap.source.topics=PDPD-CONFIGURATION
-
-dmaap.source.topics.PDPD-CONFIGURATION.servers=${envd:DMAAP_SERVERS}
-dmaap.source.topics.PDPD-CONFIGURATION.effectiveTopic=${envd:PDPD_CONFIGURATION_TOPIC}
-dmaap.source.topics.PDPD-CONFIGURATION.apiKey=${envd:PDPD_CONFIGURATION_API_KEY}
-dmaap.source.topics.PDPD-CONFIGURATION.apiSecret=${envd:PDPD_CONFIGURATION_API_SECRET}
-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
-
-http.server.services=SECURED-CONFIG
-
-http.server.services.SECURED-CONFIG.host=${envd:TELEMETRY_HOST}
-http.server.services.SECURED-CONFIG.port=9696
-http.server.services.SECURED-CONFIG.userName=${envd:TELEMETRY_USER}
-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=${envd:HTTP_SERVER_HTTPS:false}
-http.server.services.SECURED-CONFIG.prometheus=${envd:PROMETHEUS:true}
-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
-
-aaf.namespace=${envd:AAF_NAMESPACE:false}
-aaf.root.permission=${envd:AAF_NAMESPACE:org.onap.policy}.pdpd
diff --git a/csit/config/drools-apps/env/base.conf b/csit/config/drools-apps/env/base.conf
index 86749619..3ec5e831 100644
--- a/csit/config/drools-apps/env/base.conf
+++ b/csit/config/drools-apps/env/base.conf
@@ -49,6 +49,7 @@ REPOSITORY_OFFLINE=true
 SQL_HOST=mariadb
 SQL_USER=policy_user
 SQL_PASSWORD=policy_user
+SQL_PORT=3306
 
 # AAF
 
@@ -56,12 +57,9 @@ AAF=false
 AAF_NAMESPACE=org.onap.policy
 AAF_HOST=aaf.api.simpledemo.onap.org
 
-# HTTP Servers https enabled
+# HTTP Servers
 
 HTTP_SERVER_HTTPS=true
-
-# Prometheus
-
 PROMETHEUS=true
 
 # PDP-D DMaaP configuration channel
@@ -106,6 +104,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared
 # Open DMaaP
 
 DMAAP_SERVERS=message-router
+DMAAP_HTTPS=true
 
 # AAI
 
diff --git a/csit/config/drools/custom/engine.properties b/csit/config/drools/custom/engine.properties
deleted file mode 100644
index 4d00d647..00000000
--- a/csit/config/drools/custom/engine.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright (C) 2021 Bell Canada. 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.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-# Policy Engine Telemetry Server
-
-http.server.services=SECURED-CONFIG
-
-http.server.services.SECURED-CONFIG.host=${envd:TELEMETRY_HOST}
-http.server.services.SECURED-CONFIG.port=9696
-http.server.services.SECURED-CONFIG.userName=${envd:TELEMETRY_USER}
-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=${envd:HTTP_SERVER_HTTPS:false}
-http.server.services.SECURED-CONFIG.prometheus=${envd:PROMETHEUS:true}
-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
-
-aaf.namespace=${envd:AAF_NAMESPACE:false}
-aaf.root.permission=${envd:AAF_NAMESPACE:org.onap.policy}.pdpd
diff --git a/csit/config/drools/env/base.conf b/csit/config/drools/env/base.conf
index 769f8fb9..8f3c4c0d 100644
--- a/csit/config/drools/env/base.conf
+++ b/csit/config/drools/env/base.conf
@@ -49,6 +49,7 @@ REPOSITORY_OFFLINE=false
 SQL_HOST=mariadb
 SQL_USER=policy_user
 SQL_PASSWORD=policy_user
+SQL_PORT=3306
 
 # AAF
 
@@ -56,12 +57,9 @@ AAF=false
 AAF_NAMESPACE=org.onap.policy
 AAF_HOST=aaf.api.simpledemo.onap.org
 
-# HTTP Servers https enabled
+# HTTP Servers
 
 HTTP_SERVER_HTTPS=true
-
-# Prometheus
-
 PROMETHEUS=true
 
 # PDP-D DMaaP configuration channel
@@ -106,6 +104,7 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared
 # Open DMaaP
 
 DMAAP_SERVERS=mr.api.simpledemo.onap.org
+DMAAP_HTTPS=true
 
 # AAI