Make HTTPS configurable on drools featureshonolulu

This commit makes HTTPS configurable on drools-applications features.
Prior to this, https was mandatory on some features.

This change is required to allow the CSITs to use http,a nd will be
required for service mesh as well.

Issue-ID: POLICY-4338
Change-Id: I73ea46b016288ecae4ea4eb1b2349a64c3e56f63
Signed-off-by: liamfallon <liam.fallon@est.tech>

5 files changed, 10 insertions, 5 deletions

diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties
index 774bbadb3..a32511743 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
 http.client.services=AAI
 
 http.client.services.AAI.managed=true
-http.client.services.AAI.https=true
+http.client.services.AAI.https=${envd:AAI_HTTPS:true}
 http.client.services.AAI.host=${envd:AAI_HOST}
 http.client.services.AAI.port=${envd:AAI_PORT}
 http.client.services.AAI.userName=${envd:AAI_USERNAME}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties
index b0d88b483..9cf096b79 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
 http.client.services=GUARD
 
 http.client.services.GUARD.managed=true
-http.client.services.GUARD.https=true
+http.client.services.GUARD.https=${envd:PDP_HTTPS:true}
 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/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties
index 1a8990b4d..03f329a39 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
 http.client.services=SDNC
 
 http.client.services.SDNC.managed=true
-http.client.services.SDNC.https=true
+http.client.services.SDNC.https=${envd:SDNC_HTTPS:true}
 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/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties
index 3b71fd474..7415753ec 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
 http.client.services=SO
 
 http.client.services.SO.managed=true
-http.client.services.SO.https=false
+http.client.services.SO.https=${envd:SO_HTTPS:false}
 http.client.services.SO.host=${envd:SO_HOST}
 http.client.services.SO.port=${envd:SO_PORT}
 http.client.services.SO.userName=${envd:SO_USERNAME}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties
index a781ed2d1..c9d92087d 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties
@@ -2,6 +2,7 @@
 # ONAP
 # ================================================================================
 # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
 http.client.services=VFC
 
 http.client.services.VFC.managed=true
-http.client.services.VFC.https=true
+http.client.services.VFC.https=${envd:VFC_HTTPS:true}
 http.client.services.VFC.host=${envd:VFC_HOST}
 http.client.services.VFC.port=${envd:VFC_PORT}
 http.client.services.VFC.userName=${envd:VFC_USERNAME}