scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-01 19:17:52 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of github.com:Telecominfraproject/wlan-cloud-opensync-controller

Browse Source
This commit is contained in:
Mike Hansen
2020-07-29 12:16:33 -04:00
parent b93523d848 d9bef48a12
commit 64d87e7e50
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opensync-gateway-cloud-process/src/main/resources/application.properties
View File

@@ -133,7 +133,7 @@ tip.wlan.firmwareServiceBaseUrl=https://localhost:9092
tip.wlan.manufacturerServiceBaseUrl=https://localhost:9092 tip.wlan.manufacturerServiceBaseUrl=https://localhost:9092
tip.wlan.portalUserServiceBaseUrl=https://localhost:9092 tip.wlan.portalUserServiceBaseUrl=https://localhost:9092
tip.wlan.fileStore=/filestore tip.wlan.fileStoreDirectory=/tmp/tip-wlan-filestore
tip.wlan.externalFileStoreURL=https://localhost:9096 tip.wlan.externalFileStoreURL=https://localhost:9096
#server.session-timeout= # session timeout in seconds #server.session-timeout= # session timeout in seconds

18
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
View File

@@ -139,10 +139,10 @@ public class OvsdbDao {
@org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.awlan-node.upgrade_timer:90}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.awlan-node.upgrade_timer:90}")
public long upgradeTimerSeconds; public long upgradeTimerSeconds;
@org.springframework.beans.factory.annotation.Value("${tip.wlan.fileStore:/filestore}")
private String fileStore;
@org.springframework.beans.factory.annotation.Value("${tip.wlan.externalFileStoreURL:https://localhost:9096}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.externalFileStoreURL:https://localhost:9096}")
private String externalFileStoreURL; private String externalFileStoreURL;
public static final String FILESTORE = "/filestore";
public static final String HTTP = "http"; public static final String HTTP = "http";
public static final String ovsdbName = "Open_vSwitch"; public static final String ovsdbName = "Open_vSwitch";
@@ -2659,8 +2659,8 @@ public class OvsdbDao {
captiveMap.put("backgroundRepeat", captiveProfileDetails.getBackgroundRepeat().toString()); captiveMap.put("backgroundRepeat", captiveProfileDetails.getBackgroundRepeat().toString());
walledGardenAllowlist.addAll(captiveProfileDetails.getWalledGardenAllowlist()); walledGardenAllowlist.addAll(captiveProfileDetails.getWalledGardenAllowlist());
captiveMap.put("logoFileURL", getCaptiveFileUrl("logoFileURL", captiveProfileDetails.getLogoFile())); captiveMap.put("logoFileURL", getCaptiveManagedFileUrl("logoFileURL", captiveProfileDetails.getLogoFile()));
captiveMap.put("backgroundFileURL", getCaptiveFileUrl("backgroundFileURL", captiveProfileDetails.getBackgroundFile())); captiveMap.put("backgroundFileURL", getCaptiveManagedFileUrl("backgroundFileURL", captiveProfileDetails.getBackgroundFile()));
LOG.debug("captiveMap {}", captiveMap); LOG.debug("captiveMap {}", captiveMap);
} }
@@ -2668,21 +2668,21 @@ public class OvsdbDao {
} }
} }
private String getCaptiveFileUrl(String fileDesc, ManagedFileInfo fileInfo) { private String getCaptiveManagedFileUrl(String fileDesc, ManagedFileInfo fileInfo) {
if (fileInfo == null || fileInfo.getApExportUrl() == null) { if (fileInfo == null || fileInfo.getApExportUrl() == null) {
return ""; return "";
} }
if (fileInfo.getApExportUrl().startsWith(HTTP)) { if (fileInfo.getApExportUrl().startsWith(HTTP)) {
return fileInfo.getApExportUrl(); return fileInfo.getApExportUrl();
} }
if (externalFileStoreURL == null || fileStore == null) { if (externalFileStoreURL == null) {
LOG.error("Missing externalFileStoreURL or fileStoreDirectory)"); LOG.error("Missing externalFileStoreURL)");
return ""; return "";
} }
LOG.debug("Captive file {}: {}", fileDesc, externalFileStoreURL + fileStore + "/" + LOG.debug("Captive file {}: {}", fileDesc, externalFileStoreURL + FILESTORE + "/" +
fileInfo.getApExportUrl()); fileInfo.getApExportUrl());
return externalFileStoreURL + fileStore + "/" + fileInfo.getApExportUrl(); return externalFileStoreURL + FILESTORE + "/" + fileInfo.getApExportUrl();
} }
private void updateWifiInetConfig(OvsdbClient ovsdbClient, int vlanId, String ifName, boolean enabled, private void updateWifiInetConfig(OvsdbClient ovsdbClient, int vlanId, String ifName, boolean enabled,