From 52387b60797e093112df82c546813cb37040e394 Mon Sep 17 00:00:00 2001
From: Dmitry Toptygin <dmitry.toptygin@connectus.ai>
Date: Fri, 12 Jun 2020 21:10:10 -0400
Subject: [PATCH] changed log level for ovsdb client startup messages to info,
 provided more flexible SSL config for OpensyncMqttClient

---
 .../opensync/mqtt/OpensyncMqttClient.java     | 26 ++++++++++++++++++-
 .../opensync/ovsdb/ConnectusOvsdbClient.java  |  2 +-
 .../ovsdb/ConnectusOvsdbRedirector.java       |  2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
index 0c5ba5d..043f109 100644
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
@@ -64,9 +64,33 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
             @Value("${connectus.mqttBroker.user:admin}")
             String username,
             @Value("${connectus.mqttBroker.password:admin}")
-            String password            
+            String password,
+            @Value("${mqtt.javax.net.ssl.keyStore:/opt/tip-wlan/certs/client_keystore.jks}")
+            String jdkKeyStoreLocation,
+            @Value("${mqtt.javax.net.ssl.keyStorePassword:mypassword}")
+            String jdkKeyStorePassword,            
+            @Value("${mqtt.javax.net.ssl.trustStore:/opt/tip-wlan/certs/truststore.jks}")
+            String jdkTrustStoreLocation,
+            @Value("${mqtt.javax.net.ssl.trustStorePassword:mypassword}")           
+            String jdkTrustStorePassword
             ){
         
+    	if(System.getProperty("javax.net.ssl.keyStore") == null) {
+    		System.setProperty("javax.net.ssl.keyStore", jdkKeyStoreLocation);
+    	}
+
+    	if(System.getProperty("javax.net.ssl.keyStorePassword") == null) {
+    		System.setProperty("javax.net.ssl.keyStorePassword", jdkKeyStorePassword);
+    	}
+
+    	if(System.getProperty("javax.net.ssl.trustStore") == null) {
+    		System.setProperty("javax.net.ssl.trustStore", jdkTrustStoreLocation);
+    	}
+
+    	if(System.getProperty("javax.net.ssl.trustStorePassword") == null) {
+    		System.setProperty("javax.net.ssl.trustStorePassword", jdkTrustStorePassword);
+    	}
+
         Runnable mqttClientRunnable = () -> {
             while(keepReconnecting) {
                 BlockingConnection connection = null;
diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java
index 4dd3841..5893934 100644
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java
@@ -174,7 +174,7 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
 
         listener.startListeningWithSsl(ovsdbListenPort, sslContext, connectionCallback).join();
 
-        LOG.debug("manager waiting for connection on port {}...", ovsdbListenPort);
+        LOG.info("manager waiting for connection on port {}...", ovsdbListenPort);
     }
 
     private ConnectNodeInfo processConnectRequest(OvsdbClient ovsdbClient, String clientCn,
diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java
index dbea031..e51cf47 100644
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java
@@ -79,7 +79,7 @@ public class ConnectusOvsdbRedirector {
 
         listener.startListeningWithSsl(ovsdbRedirectorListenPort, sslContext, connectionCallback).join();
         
-        LOG.debug("redirector waiting for connection on port {} ...", ovsdbRedirectorListenPort);
+        LOG.info("redirector waiting for connection on port {} ...", ovsdbRedirectorListenPort);
 
     }