From: Niharika Sharma <niharika.sharma@amdocs.com>
Date: Fri, 14 Oct 2022 18:03:02 +0000 (-0400)
Subject: [AAI] OOM AAI MODEL LOADER Fixed BabelClient
X-Git-Tag: 11.0.0~43^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=9b5c8a01f3cfffc34131ea4bb38f68eb21b8c67c

[AAI] OOM AAI MODEL LOADER Fixed BabelClient

Added a new property to enable/disable http for AAI BabelClient/AAIRestClient

Issue-ID: AAI-3533
Signed-off-by: Niharika Sharma <niharika.sharma@amdocs.com>
Change-Id: I2b43ed691101c48eff19f5c4ddb1e0beb1073a7e
---

diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
index 89a118b25d..681da5d069 100644
--- a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
+++ b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
@@ -44,8 +44,10 @@ ml.distribution.MSG_BUS_ADDRESSES=message-router.{{.Release.Namespace}}
 ml.aai.BASE_URL=https://aai.{{.Release.Namespace}}:8443
 ml.aai.KEYSTORE_FILE=aai-os-cert.p12
 ml.aai.KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+ml.aai.USE_HTTPS= true
 {{ else }}
-ml.aai.BASE_URL=http://aai.{{.Release.Namespace}}:8080
+ml.aai.BASE_URL=http://aai.{{.Release.Namespace}}:80
+ml.aai.USE_HTTPS= false
 {{ end }}
 ml.aai.MODEL_URL=/aai/v*/service-design-and-creation/models/model/
 ml.aai.NAMED_QUERY_URL=/aai/v*/service-design-and-creation/named-queries/named-query/
@@ -62,9 +64,11 @@ ml.babel.KEYSTORE_FILE=aaf/local/{{ .Values.certInitializer.fqi_namespace }}.p12
 ml.babel.KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}
 ml.babel.TRUSTSTORE_FILE=aaf/local/{{ .Values.certInitializer.fqi_namespace }}.trust.jks
 ml.babel.TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
+ml.babel.USE_HTTPS= true
 {{ else }}
 ml.babel.KEYSTORE_FILE=
 ml.babel.KEYSTORE_PASSWORD=
 ml.babel.TRUSTSTORE_FILE=
 ml.babel.TRUSTSTORE_PASSWORD=
+ml.babel.USE_HTTPS= false
 {{ end }}