diff options
| author |   LiZi <li.zi30@zte.com.cn> | 2018-03-12 04:40:46 -0400 |
|---|---|---|
| committer | LiZi <li.zi30@zte.com.cn> | 2018-03-12 05:24:59 -0400 |
| commit | 8f2110fa99cda5a17fe62a3916fba2c3c5925c48 (patch) | |
| tree | 4ecdf0a61de151312965578f74daf55ad2a96b1a | |
| parent | effb4f1d758d3d37dbba6f2748c25bfdbe636735 (diff) | |
Change the http REST API to https.
Change-Id: I25365752a881bdda65130ddaabec6305ee31705d
Issue-ID: AAI-851
Signed-off-by: LiZi <li.zi30@zte.com.cn>
| -rw-r--r-- | esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java | 3 | ||||
| -rw-r--r-- | standalone/src/main/assembly/bin/run.sh | 7 | ||||
| -rw-r--r-- | standalone/src/main/assembly/conf/aaiesr.keystore | bin | 0 -> 1386 bytes | |||
| -rw-r--r-- | standalone/src/main/assembly/conf/extsys.yml | 8 |
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 Binary files differnew file mode 100644 index 0000000..bf5d34f --- /dev/null +++ b/standalone/src/main/assembly/conf/aaiesr.keystore 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: |