Telecominfraproject/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2026-03-22 03:39:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Adding support for multiple SSIDs per Radio, and multiple SSID Profiles in single SSID json file

Browse Source
This commit is contained in:
Mike Hansen
2020-05-22 15:20:40 -04:00
parent 055fe42346
commit 591629f90b
14 changed files with 769 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1658,7 +1658,7 @@ public class OvsdbDao {
if (txPower > 0)
updateColumns.put("tx_power", new Atom<Integer>(txPower));
else
updateColumns.put("tx_power", new Atom<Integer>(1));
updateColumns.put("tx_power", new com.vmware.ovsdb.protocol.operation.notation.Set());
Row row = new Row(updateColumns);
operations.add(new Update(wifiRadioConfigDbTable, conditions, row));
@@ -1669,7 +1669,7 @@ public class OvsdbDao {
LOG.debug("Provisioned channel {} for {}", channel, configName);
for (OperationResult res : result) {
LOG.debug("MJH Op Result {}", res);
LOG.debug("Op Result {}", res);
}
}
@@ -1693,7 +1693,8 @@ public class OvsdbDao {
updateColumns.put("ssid", new Atom<>(ssid));
updateColumns.put("ssid_broadcast", new Atom<>(ssidBroadcast ? "enabled" : "disabled"));
updateColumns.put("uapsd_enable", new Atom<>(true));
updateColumns.put("vif_radio_idx", new Atom<>(vifRadioIdx));
updateColumns.put("vif_radio_idx", new Atom<Integer>(vifRadioIdx));
updateColumns.put("vlan_id", new Atom<>(vlanId));
@SuppressWarnings("unchecked")
@@ -1766,24 +1767,35 @@ public class OvsdbDao {
public void configureSsids(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
Map<String, WifiVifConfigInfo> provisionedWifiVifConfigs = getProvisionedWifiVifConfigs(ovsdbClient);
Map<String, WifiRadioConfigInfo> provisionedWifiRadioConfigs = getProvisionedWifiRadioConfigs(ovsdbClient);
LOG.debug("Existing WifiVifConfigs: {}", provisionedWifiVifConfigs.keySet());
boolean rrmEnabled = false;
if (opensyncApConfig.getEquipmentLocation() != null &&
opensyncApConfig.getEquipmentLocation().getDetails() != null) {
rrmEnabled = opensyncApConfig.getEquipmentLocation().getDetails().isRrmEnabled();
}
boolean rrmEnabled = false;
if (opensyncApConfig.getEquipmentLocation() != null
&& opensyncApConfig.getEquipmentLocation().getDetails() != null) {
rrmEnabled = opensyncApConfig.getEquipmentLocation().getDetails().isRrmEnabled();
}
for (Profile ssidProfile : opensyncApConfig.getSsidProfile()) {
Map<String, WifiVifConfigInfo> provisionedWifiVifConfigs = getProvisionedWifiVifConfigs(ovsdbClient);
LOG.debug("Existing WifiVifConfigs: {}", provisionedWifiVifConfigs.keySet());
SsidConfiguration ssidConfig = (SsidConfiguration) ssidProfile.getDetails();
for (RadioType radioType : ssidConfig.getAppliedRadios()) {
Map<String, WifiRadioConfigInfo> provisionedWifiRadioConfigs = getProvisionedWifiRadioConfigs(
ovsdbClient);
boolean ssidBroadcast = ssidConfig.getBroadcastSsid() == StateSetting.enabled;
Map<String, String> security = new HashMap<>();
String ssidSecurityMode = ssidConfig.getSecureMode().name();
String opensyncSecurityMode = "OPEN";
security.put("encryption", ssidConfig.getSecureMode().name());
if (ssidSecurityMode.equalsIgnoreCase("wpaPSK") || ssidSecurityMode.equalsIgnoreCase("wpa2PSK"))
opensyncSecurityMode = "WPA-PSK";
else if (ssidSecurityMode.equalsIgnoreCase("wep"))
opensyncSecurityMode = "WEP";
security.put("encryption", opensyncSecurityMode);
security.put("key", ssidConfig.getKeyStr());
security.put("mode", Long.toString(ssidConfig.getSecureMode().getId()));
String bridge = brHome;