summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java3
-rw-r--r--standalone/src/main/assembly/bin/run.sh7
-rw-r--r--standalone/src/main/assembly/conf/aaiesr.keystorebin0 -> 1386 bytes
-rw-r--r--standalone/src/main/assembly/conf/extsys.yml8
4 files changed, 15 insertions, 3 deletions
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java
index 41c9d91..77cbba6 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java
@@ -1,5 +1,5 @@
/**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2018 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ public class MsbHelper {
msinfo.setUrl("/api/aai-esr-server/v1");
msinfo.setProtocol("REST");
msinfo.setVisualRange("0|1");
+ msinfo.setEnable_ssl(true);
Set<Node> nodes = new HashSet<>();
Node node1 = new Node();
diff --git a/standalone/src/main/assembly/bin/run.sh b/standalone/src/main/assembly/bin/run.sh
index 9c25410..7d93765 100644
--- a/standalone/src/main/assembly/bin/run.sh
+++ b/standalone/src/main/assembly/bin/run.sh
@@ -32,5 +32,12 @@ echo @JAVA_OPTS@ $JAVA_OPTS
class_path="$main_path/:$main_path/esr-service.jar"
echo @class_path@ $class_path
+KEY_PATH="$main_path/conf/aaiesr.keystore"
+KEY_PASSWORD="aaiesr"
+
+#HTTPS Configurations
+sed -i "s|keyStorePath:.*|keyStorePath: $KEY_PATH|" "$main_path/conf/extsys.yml"
+sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf/extsys.yml"
+
"$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.aai.esr.ExtsysApp server "$main_path/conf/extsys.yml"
diff --git a/standalone/src/main/assembly/conf/aaiesr.keystore b/standalone/src/main/assembly/conf/aaiesr.keystore
new file mode 100644
index 0000000..bf5d34f
--- /dev/null
+++ b/standalone/src/main/assembly/conf/aaiesr.keystore
Binary files differ
diff --git a/standalone/src/main/assembly/conf/extsys.yml b/standalone/src/main/assembly/conf/extsys.yml
index 41faea9..44b9b98 100644
--- a/standalone/src/main/assembly/conf/extsys.yml
+++ b/standalone/src/main/assembly/conf/extsys.yml
@@ -1,5 +1,5 @@
#
-# Copyright 2016-2017 ZTE Corporation.
+# Copyright 2016-2018 ZTE Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -36,8 +36,12 @@ server:
applicationContextPath: /
adminContextPath: /admin
connector:
- type: http
+ type: https
port: 9518
+ keyStorePath: /home/esr/conf/aaiesr.keystore
+ keyStorePassword: aaiesr
+ validateCerts: false
+ validatePeers: false
# Logging settings.
logging: