scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-03 12:08:07 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Power saving uapsd enabled/disabled

Browse Source
This commit is contained in:
Mike Hansen
2020-05-26 16:22:21 -04:00
parent 9ad3387e96
commit 46c76cdcaa
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1686,7 +1686,7 @@ public class OvsdbDao {
public void configureSingleSsid(OvsdbClient ovsdbClient, String bridge, String ifName, String ssid, public void configureSingleSsid(OvsdbClient ovsdbClient, String bridge, String ifName, String ssid,
boolean ssidBroadcast, Map<String, String> security, boolean ssidBroadcast, Map<String, String> security,
Map<String, WifiRadioConfigInfo> provisionedWifiRadioConfigs, String radioIfName, int vlanId, Map<String, WifiRadioConfigInfo> provisionedWifiRadioConfigs, String radioIfName, int vlanId,
int vifRadioIdx, boolean rrmEnabled, String minHwMode, boolean enabled, int keyRefresh) { int vifRadioIdx, boolean rrmEnabled, String minHwMode, boolean enabled, int keyRefresh, boolean uapsdEnabled) {
List<Operation> operations = new ArrayList<>(); List<Operation> operations = new ArrayList<>();
Map<String, Value> updateColumns = new HashMap<>(); Map<String, Value> updateColumns = new HashMap<>();
@@ -1707,6 +1707,7 @@ public class OvsdbDao {
updateColumns.put("min_hw_mode", new Atom<>(minHwMode)); updateColumns.put("min_hw_mode", new Atom<>(minHwMode));
updateColumns.put("vlan_id", new Atom<Integer>(vlanId)); updateColumns.put("vlan_id", new Atom<Integer>(vlanId));
updateColumns.put("group_rekey", new Atom<Integer>(keyRefresh)); updateColumns.put("group_rekey", new Atom<Integer>(keyRefresh));
updateColumns.put("uapsd_enable", new Atom<Boolean>(uapsdEnabled));
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
com.vmware.ovsdb.protocol.operation.notation.Map<String, String> securityMap = com.vmware.ovsdb.protocol.operation.notation.Map com.vmware.ovsdb.protocol.operation.notation.Map<String, String> securityMap = com.vmware.ovsdb.protocol.operation.notation.Map
@@ -1800,6 +1801,7 @@ public class OvsdbDao {
int keyRefresh = ssidConfig.getKeyRefresh(); int keyRefresh = ssidConfig.getKeyRefresh();
Map<String, WifiRadioConfigInfo> provisionedWifiRadioConfigs = getProvisionedWifiRadioConfigs( Map<String, WifiRadioConfigInfo> provisionedWifiRadioConfigs = getProvisionedWifiRadioConfigs(
ovsdbClient); ovsdbClient);
@@ -1811,6 +1813,9 @@ public class OvsdbDao {
RadioMode radioMode = ((ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails()) RadioMode radioMode = ((ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails())
.getAdvancedRadioMap().get(radioType).getRadioMode(); .getAdvancedRadioMap().get(radioType).getRadioMode();
boolean uapsdEnabled = (((ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails())
.getAdvancedRadioMap().get(radioType).getUapsdState() == StateSetting.enabled);
String minHwMode = "11n"; // min_hw_mode is 11ac, wifi 5, we can also take ++ (11ax) but 2.4GHz only String minHwMode = "11n"; // min_hw_mode is 11ac, wifi 5, we can also take ++ (11ax) but 2.4GHz only
// Wifi4 -- // Wifi4 --
if (!radioType.equals(RadioType.is2dot4GHz)) if (!radioType.equals(RadioType.is2dot4GHz))
@@ -1856,7 +1861,7 @@ public class OvsdbDao {
try { try {
configureSingleSsid(ovsdbClient, bridge, ifName, ssidConfig.getSsid(), ssidBroadcast, security, configureSingleSsid(ovsdbClient, bridge, ifName, ssidConfig.getSsid(), ssidBroadcast, security,
provisionedWifiRadioConfigs, radioIfName, ssidConfig.getVlanId(), vifRadioIdx, provisionedWifiRadioConfigs, radioIfName, ssidConfig.getVlanId(), vifRadioIdx,
rrmEnabled, minHwMode, enabled, keyRefresh); rrmEnabled, minHwMode, enabled, keyRefresh, uapsdEnabled);
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
// could not provision this SSID, but still can go on // could not provision this SSID, but still can go on