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

AP Configuration, adding 5GHz U/L support, pre-work to extend SSID config support

Browse Source
This commit is contained in:
Mike Hansen
2020-05-12 15:58:24 -04:00
parent b3e3aa68af
commit d0289e61c5
4 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java
View File

@@ -237,7 +237,7 @@ public class ConnectusOvsdbClient implements ConnectusOvsdbClientInterface {
OvsdbClient ovsdbClient = ovsdbSession.getOvsdbClient();
OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
if (opensyncAPConfig != null) {
ovsdbDao.removeAllSsids(ovsdbClient);
ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig.getRadioConfig());

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

@@ -967,6 +967,8 @@ public class OvsdbDao {
public static final String homeAp24 = "home-ap-24";
public static final String homeApL50 = "home-ap-l50";
public static final String homeApU50 = "home-ap-u50";
public static final String brHome = "br-home";
public static final String brWan = "br-wan";
@@ -995,8 +997,12 @@ public class OvsdbDao {
provisionSingleBridgePortInterface(ovsdbClient, patchW2h, brWan, "patch", patchW2hOptions,
provisionedInterfaces, provisionedPorts, provisionedBridges);
provisionSingleBridgePortInterface(ovsdbClient, homeApU50, brHome, null, null, provisionedInterfaces,
provisionedPorts, provisionedBridges);
provisionSingleBridgePortInterface(ovsdbClient, homeApL50, brHome, null, null, provisionedInterfaces,
provisionedPorts, provisionedBridges);
provisionSingleBridgePortInterface(ovsdbClient, homeAp24, brHome, null, null, provisionedInterfaces,
provisionedPorts, provisionedBridges);
@@ -1701,8 +1707,18 @@ public class OvsdbDao {
for (OpensyncAPSsidConfig ssidCfg : ssidConfigs) {
String bridge = brHome;
String ifName = (ssidCfg.getRadioType() == RadioType.is2dot4GHz) ? homeAp24 : homeApL50;
String radioIfName = (ssidCfg.getRadioType() == RadioType.is2dot4GHz) ? "wifi0" : "wifi1";
String ifName = null;
String radioIfName = null;
if (ssidCfg.getRadioType() == RadioType.is2dot4GHz) {
ifName = homeAp24;
radioIfName = "wifi0";
} else if (ssidCfg.getRadioType() == RadioType.is5GHzL) {
ifName = homeApL50;
radioIfName = "wifi1";
} else if (ssidCfg.getRadioType() == RadioType.is5GHzU) {
ifName = homeApU50;
radioIfName = "wifi2";
}
String ssid = ssidCfg.getSsid();
boolean ssidBroadcast = ssidCfg.isBroadcast();
Map<String, String> security = new HashMap<>();
@@ -1804,6 +1820,11 @@ public class OvsdbDao {
if (!provisionedWifiInetConfigs.containsKey(ifName)) {
configureWifiInet(ovsdbClient, provisionedWifiInetConfigs, ifName);
}
ifName = homeApU50;
if (!provisionedWifiInetConfigs.containsKey(ifName)) {
configureWifiInet(ovsdbClient, provisionedWifiInetConfigs, ifName);
}
if (!provisionedWifiInetConfigs.containsKey(brHome) || !provisionedWifiInetConfigs.get(brHome).network) {
// set network flag on brHome in wifiInetConfig table