WIFI-1167: Radio Utilization and Channel Utilization reporting values over 100%

This commit is contained in:
Mike Hansen
2020-12-09 09:50:39 -05:00
parent 8bc37f4a9a
commit 08b9b62f81

View File

@@ -1682,10 +1682,10 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
radioType = OvsdbToWlanCloudTypeMappingUtility
.getRadioTypeFromOpensyncStatsRadioBandType(survey.getBand());
if (radioType != RadioType.UNSUPPORTED) {
List<RadioUtilization> radioUtilizationList = new ArrayList<>();
radioUtilizationList.add(radioUtil);
apNodeMetrics.getRadioUtilizationPerRadio().put(radioType, radioUtilizationList);
if (apNodeMetrics.getRadioUtilization(radioType) == null) {
apNodeMetrics.setRadioUtilization(radioType, new ArrayList<>());
}
apNodeMetrics.getRadioUtilization(radioType).add(radioUtil);
int noiseAvg = (int) Math.round(DecibelUtils.getAverageDecibel(toIntArray(noiseList)));
avgNoiseFloor.put(radioType, noiseAvg);
apNodeMetrics.setNoiseFloor(radioType, noiseAvg);
@@ -1703,10 +1703,6 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
apNodeMetrics.setChannelUtilization(radioType, totalUtilization.intValue());
capacityDetails.put(radioType, cap);
// EquipmentPerRadioUtilizationDetails details = new
// EquipmentPerRadioUtilizationDetails();
// details.setWifiFromOtherBss(new MinMaxAvgValueInt());
radioUtilizationDetailsMap.put(radioType, new EquipmentPerRadioUtilizationDetails());
}
@@ -1715,12 +1711,7 @@ public class OpensyncExternalIntegrationMqttMessageProcessor {
populateNetworkProbeMetrics(report, apNodeMetrics);
updateNetworkAdminStatusReport(customerId, equipmentId, apNodeMetrics);
RadioUtilizationReport radioUtilizationReport = new RadioUtilizationReport();
radioUtilizationReport.setAvgNoiseFloor(avgNoiseFloor);
radioUtilizationReport.setRadioUtilization(radioUtilizationDetailsMap);
radioUtilizationReport.setCapacityDetails(capacityDetails);
updateDeviceStatusRadioUtilizationReport(customerId, equipmentId, radioUtilizationReport);
}
private void updateNetworkAdminStatusReport(int customerId, long equipmentId, ApNodeMetrics apNodeMetrics) {