scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-10-30 18:17:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-1365: Add OSGW support to populate channelNumber and DFS in ElementRadioConfiguration->ChannelPowerLevel List

Browse Source
This commit is contained in:
Mike Hansen
2021-01-27 17:11:05 -05:00
parent b7ab0b973c
commit cea96f49f3
3 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@@ -42,6 +43,7 @@ import com.telecominfraproject.wlan.customer.service.CustomerServiceInterface;
import com.telecominfraproject.wlan.datastore.exceptions.DsConcurrentModificationException;
import com.telecominfraproject.wlan.equipment.EquipmentServiceInterface;
import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
import com.telecominfraproject.wlan.equipment.models.ChannelPowerLevel;
import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
import com.telecominfraproject.wlan.equipment.models.Equipment;
import com.telecominfraproject.wlan.equipment.models.RadioConfiguration;
@@ -366,7 +368,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
// remove radio configs from the DB that are no longer
// present in the AP but still exist in DB
for (RadioType radio : new ArrayList<>(advancedRadioMap.keySet())) {
if (!radiosFromAp.contains(radio)) {
advancedRadioMap.remove(radio);
@@ -847,7 +849,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
}
Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
if (ce != null) {
List<Status> deletedStatuses = statusServiceInterface.deleteOnEquipmentDisconnect(ce.getCustomerId(), ce.getId());
List<Status> deletedStatuses = statusServiceInterface.deleteOnEquipmentDisconnect(ce.getCustomerId(),
ce.getId());
LOG.info("AP {} disconnected, deleted status records {}", apId, deletedStatuses);
updateApDisconnectedStatus(apId, ce);
disconnectClients(ce);
@@ -1239,6 +1242,68 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
}
if (radioState.getChannels() != null) {
if (apElementConfiguration.getRadioMap().containsKey(radioState.getFreqBand())
&& apElementConfiguration.getRadioMap().get(radioState.getFreqBand()) != null) {
// private Set<ChannelPowerLevel> allowedChannelsPowerLevels
// = new HashSet<>();
Set<ChannelPowerLevel> channelPowerLevels = new HashSet<>();
radioState.getChannels().entrySet().stream().forEach(k -> {
if (k.getKey().equals("allowed") || k.getKey().equals("radar_detection")) {
String[] channelNumbers = k.getValue().split(",");
for (String channel : channelNumbers) {
if (channel != null) {
ChannelPowerLevel cpl = new ChannelPowerLevel();
cpl.setChannelNumber(Integer.parseInt(channel));
cpl.setDfs(k.getKey().equals("radar_detection"));
if (radioState.getChannelMode() != null && radioState.getChannelMode().equals("auto")) {
cpl.setChannelWidth(-1);
} else {
switch (radioState.getHtMode()) {
case "HT20":
cpl.setChannelWidth(20);
break;
case "HT40":
case "HT40-":
case "HT40+":
cpl.setChannelWidth(40);
break;
case "HT80":
cpl.setChannelWidth(80);
break;
case "HT160":
cpl.setChannelWidth(160);
break;
default:
LOG.warn("Unrecognized channel HtMode {}", radioState.getHtMode());
}
}
cpl.setPowerLevel(radioState.getTxPower());
channelPowerLevels.add(cpl);
}
}
}
});
if (!Objects.deepEquals(apElementConfiguration.getRadioMap().get(radioState.getFreqBand())
.getAllowedChannelsPowerLevels(), channelPowerLevels)) {
apElementConfiguration.getRadioMap().get(radioState.getFreqBand())
.setAllowedChannelsPowerLevels(channelPowerLevels);
}
apElementConfiguration.getRadioMap().get(radioState.getFreqBand())
.setAllowedChannels(new ArrayList<>(radioState.getAllowedChannels()));
LOG.debug("Updated AllowedChannels from Wifi_Radio_State table change for AP {}", apId);
}
}
if (radioState.getTxPower() > 0) {
if (apElementConfiguration.getRadioMap().containsKey(radioState.getFreqBand())
&& apElementConfiguration.getRadioMap().get(radioState.getFreqBand()) != null) {

3
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioState.java vendored
View File

@@ -307,4 +307,7 @@ public class OpensyncAPRadioState extends BaseJsonModel {
this.version = version;
}
}

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

@@ -2174,6 +2174,11 @@ public class OvsdbDao {
}
tableState.setAllowedChannels(allowed);
}
if (map.get("channels") != null) {
Map<String, String> channels = row.getMapColumn("channels");
tableState.setChannels(channels);
}
Set<Uuid> vifStates = row.getSetColumn("vif_states");
tableState.setVifStates(vifStates);