From d3729a47d2661af600690a975780e02ca0d4b473 Mon Sep 17 00:00:00 2001 From: Akshay Jagadish Date: Mon, 16 Nov 2020 17:15:59 -0500 Subject: [PATCH 1/2] NETEXP-485: Added seperate variables for manager_addr port and mqtt_settings port that are displayed the AWLAN table. The default values are 1883 and 6640, but these can be overriden in the helm charts based on customer requirements --- opensync-gateway-cloud-docker/pom.xml | 2 +- .../src/main/docker/app/run.sh | 7 +++++++ .../wlan/opensync/ovsdb/dao/OvsdbDao.java | 10 ++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/opensync-gateway-cloud-docker/pom.xml b/opensync-gateway-cloud-docker/pom.xml index 14c56c2..67a3f17 100644 --- a/opensync-gateway-cloud-docker/pom.xml +++ b/opensync-gateway-cloud-docker/pom.xml @@ -38,7 +38,7 @@ 1.23 - opensync-gateway-cloud:${project.version} + opensync-gateway-cloud:${project.version}-Testing ${project.version}-${timestamp} diff --git a/opensync-gateway-cloud-docker/src/main/docker/app/run.sh b/opensync-gateway-cloud-docker/src/main/docker/app/run.sh index d648a70..296f3e1 100755 --- a/opensync-gateway-cloud-docker/src/main/docker/app/run.sh +++ b/opensync-gateway-cloud-docker/src/main/docker/app/run.sh @@ -20,6 +20,11 @@ SSC_SERVER_HOST="${SSC_SERVER}" ALL_IN_ONE_HOST="${INTEGRATED_SERVER}" FILE_STORE_DIRECTORY="${FILE_STORE_DIRECTORY_INTERNAL:=/tmp/filestore}" FILE_STORE_EXTERNAL_URL="${FILE_STORE_URL}" +MQTT_BROKER_EXTERNAL_PORT="${MQTT_BROKER_EXTERNAL_PORT}" +OVSDB_EXTERNAL_PORT="${OVSDB_EXTERNAL_PORT}" + + + OVSDB_PROPS=" " OVSDB_PROPS+=" -Dtip.wlan.ovsdb.managerAddr=$OVSDB_MANAGER_HOST" @@ -33,6 +38,8 @@ OVSDB_PROPS+=" -Dtip.wlan.ovsdb.configFileName=/app/opensync/config_2_ssids.json MQTT_PROPS=" " MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address.internal=$MQTT_BROKER_HOST_INTERNAL" MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address.external=$MQTT_BROKER_HOST_EXTERNAL" +MQTT_PROPS+=" -Dtip.wlan.ovsdb.externalPort=$OVSDB_EXTERNAL_PORT" +MQTT_PROPS+=" -Dtip.wlan.mqttBroker.externalPort=$MQTT_BROKER_EXTERNAL_PORT" MQTT_PROPS+=" -Dtip.wlan.mqttBroker.listenPort=1883" LOGBACK_CONFIG_FILE="${LOGBACK_CONFIG_FILE:=/app/opensync/logback.xml}" diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index f0ab05c..2dbe83c 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -141,12 +141,18 @@ public class OvsdbDao { @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.listenPort:6640}") private int ovsdbListenPort; + + @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.externalPort:6640}") + private int ovsdbExternalPort; @org.springframework.beans.factory.annotation.Value("${tip.wlan.mqttBroker.address.external:testportal.123wlan.com}") private String mqttBrokerAddress; @org.springframework.beans.factory.annotation.Value("${tip.wlan.mqttBroker.listenPort:1883}") private int mqttBrokerListenPort; + + @org.springframework.beans.factory.annotation.Value("${tip.wlan.mqttBroker.externalPort:1883}") + private int mqttBrokerExternalPort; @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.timeoutSec:30}") private int ovsdbTimeoutSec; @@ -565,7 +571,7 @@ public class OvsdbDao { String mqttClientName = OvsdbToWlanCloudTypeMappingUtility.getAlteredClientCnIfRequired(clientCn, incomingConnectNodeInfo, preventCnAlteration); newMqttSettings.put("topics", "/ap/" + mqttClientName + "/opensync"); - newMqttSettings.put("port", "" + mqttBrokerListenPort); + newMqttSettings.put("port", "" + mqttBrokerExternalPort); newMqttSettings.put("compress", "zlib"); newMqttSettings.put("qos", "0"); newMqttSettings.put("remote_log", "1"); @@ -777,7 +783,7 @@ public class OvsdbDao { operations.clear(); Map updateColumns = new HashMap<>(); - updateColumns.put("manager_addr", new Atom<>("ssl:" + managerIpAddr + ":" + ovsdbListenPort)); + updateColumns.put("manager_addr", new Atom<>("ssl:" + managerIpAddr + ":" + ovsdbExternalPort)); row = new Row(updateColumns); operations.add(new Update(awlanNodeDbTable, row)); From 5f35b59a34b6a20a2e9b63f41c6950bc88e6a873 Mon Sep 17 00:00:00 2001 From: Akshay Jagadish Date: Mon, 16 Nov 2020 17:20:18 -0500 Subject: [PATCH 2/2] reverted tag addition for docker build --- opensync-gateway-cloud-docker/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensync-gateway-cloud-docker/pom.xml b/opensync-gateway-cloud-docker/pom.xml index 67a3f17..14c56c2 100644 --- a/opensync-gateway-cloud-docker/pom.xml +++ b/opensync-gateway-cloud-docker/pom.xml @@ -38,7 +38,7 @@ 1.23 - opensync-gateway-cloud:${project.version}-Testing + opensync-gateway-cloud:${project.version} ${project.version}-${timestamp}