summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPolavarapu, Chaitanya (cp8128) <cp8128@att.com>2019-04-10 08:42:08 -0400
committerPolavarapu, Chaitanya (cp8128) <cp8128@att.com>2019-04-10 08:42:08 -0400
commit27bfb89b0879b1bda93b3b55a418154ea366509e (patch)
tree7cba49b7c388442d9d913a90e5a7190f286136e3
parentb4da0587a12a4649007b7fbbd36b7f47399cd63c (diff)
Provide the ability to set the truststore properties during model-loader startup
Issue-ID: AAI-2339 Change-Id: Icb6b35a6bf5bccfd1771a670a0626fe5b0b0cc12 Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
-rw-r--r--src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java
index 35d8ada..c338e5b 100644
--- a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java
+++ b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java
@@ -83,6 +83,21 @@ public class ModelLoaderService implements ModelLoaderInterface {
try {
configProperties.load(Files.newInputStream(Paths.get(configDir, "model-loader.properties")));
config = new ModelLoaderConfig(configProperties);
+
+ // Set the truststore for SDC Client to connect to Dmaap central bus if applicable (as in case of TI)
+ if (config.isUseHttpsWithDmaap()) {
+ String trustStorePath = config.getKeyStorePath();
+ String trustStorePassword = config.getKeyStorePassword();
+ if (trustStorePath != null && Paths.get(trustStorePath).toFile().isFile() && trustStorePassword != null
+ && !trustStorePassword.isEmpty()) {
+ System.setProperty("javax.net.ssl.trustStore", trustStorePath);
+ System.setProperty("javax.net.ssl.trustStorePassword", trustStorePassword);
+ } else {
+ throw new IllegalArgumentException("Model Loader property ml.distribution.KEYSTORE_FILE "
+ + "or ml.distribution.KEYSTORE_PASSWORD not set or invalid");
+ }
+ }
+
if (!config.getASDCConnectionDisabled()) {
initSdcClient();
}