scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-01 11:07:49 +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-10-21 17:30:35 -04:00
parent 62672f090b 012935818d
commit 7f51486979
10 changed files with 413 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
import com.telecominfraproject.wlan.core.model.equipment.RadioBestApSettings;
import com.telecominfraproject.wlan.core.model.equipment.RadioType;
import com.telecominfraproject.wlan.core.model.equipment.SourceType;
import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
@@ -1941,12 +1942,14 @@ public class OvsdbDao {
boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled);
int txPower = 0;
if (!elementRadioConfig.getEirpTxPower().isAuto()) {
txPower = elementRadioConfig.getEirpTxPower().getValue();
if (elementRadioConfig.getEirpTxPower().getSource() == SourceType.profile) {
txPower = rfElementConfig.getEirpTxPower();
} else {
txPower = (int) elementRadioConfig.getEirpTxPower().getValue();
}
String hwMode = null;
switch (radioConfig.getRadioMode()) {
switch (rfElementConfig.getRadioMode()) {
case modeA:
hwMode = "11a";
break;
@@ -2977,7 +2980,7 @@ public class OvsdbDao {
int dtimPeriod = radioConfiguration.getDtimPeriod();
int rtsCtsThreshold = rfElementConfig.getRtsCtsThreshold();
int fragThresholdBytes = radioConfiguration.getFragmentationThresholdBytes();
RadioMode radioMode = radioConfiguration.getRadioMode();
RadioMode radioMode = rfElementConfig.getRadioMode();
String minHwMode = "11n"; // min_hw_mode is 11ac, wifi 5, we can
// also take ++ (11ax) but 2.4GHz only
// Wifi4 --
@@ -4723,6 +4726,7 @@ public class OvsdbDao {
ApElementConfiguration apElementConfig = (ApElementConfiguration) opensyncApConfig.getCustomerEquipment()
.getDetails();
RfConfiguration rfConfig = (RfConfiguration) opensyncApConfig.getRfProfile().getDetails();
for (RadioType radioType : apElementConfig.getRadioMap().keySet()) {
String freqBand = null;
if (radioType == RadioType.is2dot4GHz) {
@@ -4734,25 +4738,46 @@ public class OvsdbDao {
} else if (radioType == RadioType.is5GHz) {
freqBand = "5G";
}
if (rfConfig == null) {
continue;
}
ElementRadioConfiguration elementRadioConfig = apElementConfig.getRadioMap().get(radioType);
if (elementRadioConfig == null) {
RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
if (elementRadioConfig == null || rfElementConfig == null) {
continue; // don't have a radio of this kind in the map
}
AutoOrManualValue rxCellSizeDb = null;
AutoOrManualValue probeResponseThresholdDb = null;
AutoOrManualValue clientDisconnectThresholdDb = null;
if (elementRadioConfig != null && rfElementConfig != null) {
rxCellSizeDb = getSourcedValue(elementRadioConfig.getRxCellSizeDb().getSource(),
rfElementConfig.getRxCellSizeDb(), elementRadioConfig.getRxCellSizeDb().getValue());
probeResponseThresholdDb = getSourcedValue(elementRadioConfig.getProbeResponseThresholdDb().getSource(),
rfElementConfig.getProbeResponseThresholdDb(), elementRadioConfig.getProbeResponseThresholdDb().getValue());
clientDisconnectThresholdDb = getSourcedValue(elementRadioConfig.getClientDisconnectThresholdDb().getSource(),
rfElementConfig.getClientDisconnectThresholdDb(), elementRadioConfig.getClientDisconnectThresholdDb().getValue());
}
RadioConfiguration radioConfig = apElementConfig.getAdvancedRadioMap().get(radioType);
ManagementRate managementRate = null;
RadioBestApSettings bestApSettings = null;
if (radioConfig != null) {
managementRate = radioConfig.getManagementRate();
bestApSettings = radioConfig.getBestApSettings();
if (radioConfig != null && rfElementConfig != null) {
managementRate = radioConfig.getManagementRate().getSource() == SourceType.profile ?
rfElementConfig.getManagementRate() : radioConfig.getManagementRate().getValue();
bestApSettings = radioConfig.getBestApSettings().getSource() == SourceType.profile ?
rfElementConfig.getBestApSettings() : radioConfig.getBestApSettings().getValue();
}
if (freqBand != null) {
try {
configureWifiRrm(ovsdbClient, freqBand, elementRadioConfig.getBackupChannelNumber(),
elementRadioConfig.getRxCellSizeDb(), elementRadioConfig.getProbeResponseThresholdDb(),
elementRadioConfig.getClientDisconnectThresholdDb(), managementRate, bestApSettings);
rxCellSizeDb, probeResponseThresholdDb, clientDisconnectThresholdDb,
managementRate, bestApSettings);
} catch (OvsdbClientException e) {
LOG.error("configureRrm failed with OvsdbClient exception.", e);
throw new RuntimeException(e);
@@ -4901,5 +4926,14 @@ public class OvsdbDao {
}
public AutoOrManualValue getSourcedValue(SourceType source, int profileValue, int equipmentValue) {
if (source == SourceType.profile) {
return AutoOrManualValue.createManualInstance(profileValue);
} else if (source == SourceType.auto) {
return AutoOrManualValue.createAutomaticInstance(equipmentValue);
}
return AutoOrManualValue.createManualInstance(equipmentValue);
}
}