scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-01 02:57:49 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-2081: AP: ON_CHANNEL survey report sometimes has no information

Browse Source 
Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>
This commit is contained in:
Mike Hansen
2021-06-07 15:28:05 -04:00
parent 1264640c33
commit 047ce7f07a
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java vendored
View File

@@ -966,8 +966,8 @@ public class MqttStatsPublisher {
apPerformance.setPsMemUtil(memPerProcess); apPerformance.setPsMemUtil(memPerProcess);
apPerformance.setSourceTimestampMs(deviceReport.getTimestampMs()); apPerformance.setSourceTimestampMs(deviceReport.getTimestampMs());
// The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats // The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats
if (smr.getSourceTimestampMs() < deviceReport.getTimestampMs()) if (apNodeMetrics.getSourceTimestampMs() < deviceReport.getTimestampMs())
smr.setSourceTimestampMs(deviceReport.getTimestampMs()); apNodeMetrics.setSourceTimestampMs(deviceReport.getTimestampMs());
updateDeviceStatusForReport(customerId, equipmentId, deviceReport, avgRadioTemp); updateDeviceStatusForReport(customerId, equipmentId, deviceReport, avgRadioTemp);
} }
@@ -1069,8 +1069,8 @@ public class MqttStatsPublisher {
radioStats.setSourceTimestampMs(clReport.getTimestampMs()); radioStats.setSourceTimestampMs(clReport.getTimestampMs());
// The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats // The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats
if (smr.getSourceTimestampMs() < clReport.getTimestampMs()) if (apNodeMetrics.getSourceTimestampMs() < clReport.getTimestampMs())
smr.setSourceTimestampMs(clReport.getTimestampMs()); apNodeMetrics.setSourceTimestampMs(clReport.getTimestampMs());
apNodeMetrics.setRadioStats(radioType, radioStats); apNodeMetrics.setRadioStats(radioType, radioStats);
@@ -1134,8 +1134,8 @@ public class MqttStatsPublisher {
radioUtil.setSourceTimestampMs(survey.getTimestampMs()); radioUtil.setSourceTimestampMs(survey.getTimestampMs());
// The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats // The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats
if (smr.getSourceTimestampMs() < survey.getTimestampMs()) if (apNodeMetrics.getSourceTimestampMs() < survey.getTimestampMs())
smr.setSourceTimestampMs(survey.getTimestampMs()); apNodeMetrics.setSourceTimestampMs(survey.getTimestampMs());
int pctBusyTx = busyTx / totalDurationMs; int pctBusyTx = busyTx / totalDurationMs;
checkIfOutOfBound("pctBusyTx", pctBusyTx, survey, totalDurationMs, busyTx, busyRx, busy, busySelf); checkIfOutOfBound("pctBusyTx", pctBusyTx, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
@@ -1406,7 +1406,6 @@ public class MqttStatsPublisher {
ServiceMetric smr = new ServiceMetric(customerId, equipmentId, MacAddress.valueOf(cl.getMacAddress())); ServiceMetric smr = new ServiceMetric(customerId, equipmentId, MacAddress.valueOf(cl.getMacAddress()));
smr.setLocationId(locationId); smr.setLocationId(locationId);
smr.setSourceTimestampMs(clReport.getTimestampMs());
metricRecordList.add(smr); metricRecordList.add(smr);
smr.setClientMac(MacAddress.valueOf(cl.getMacAddress()).getAddressAsLong()); smr.setClientMac(MacAddress.valueOf(cl.getMacAddress()).getAddressAsLong());
@@ -1414,6 +1413,7 @@ public class MqttStatsPublisher {
// clReport.getChannel(); // clReport.getChannel();
ClientMetrics cMetrics = new ClientMetrics(); ClientMetrics cMetrics = new ClientMetrics();
smr.setDetails(cMetrics); smr.setDetails(cMetrics);
cMetrics.setSourceTimestampMs(clReport.getTimestampMs());
Integer periodLengthSec = 60; // matches what's configured by Integer periodLengthSec = 60; // matches what's configured by
// OvsdbDao.configureStats(OvsdbClient) // OvsdbDao.configureStats(OvsdbClient)
@@ -1496,10 +1496,10 @@ public class MqttStatsPublisher {
ServiceMetric smr = new ServiceMetric(customerId, equipmentId); ServiceMetric smr = new ServiceMetric(customerId, equipmentId);
smr.setLocationId(locationId); smr.setLocationId(locationId);
smr.setSourceTimestampMs(neighbor.getTimestampMs());
metricRecordList.add(smr); metricRecordList.add(smr);
NeighbourScanReports neighbourScanReports = new NeighbourScanReports(); NeighbourScanReports neighbourScanReports = new NeighbourScanReports();
smr.setDetails(neighbourScanReports); smr.setDetails(neighbourScanReports);
neighbourScanReports.setSourceTimestampMs(neighbor.getTimestampMs());
List<NeighbourReport> neighbourReports = new ArrayList<>(); List<NeighbourReport> neighbourReports = new ArrayList<>();
neighbourScanReports.setNeighbourReports(neighbourReports); neighbourScanReports.setNeighbourReports(neighbourReports);
@@ -1649,8 +1649,8 @@ public class MqttStatsPublisher {
LOG.debug("ClientReport for channel {} RadioBand {}", clientReport.getChannel(), clientReport.getBand()); LOG.debug("ClientReport for channel {} RadioBand {}", clientReport.getChannel(), clientReport.getBand());
// The service metric report's sourceTimestamp will be the most recent ClientReport timestamp // The service metric report's sourceTimestamp will be the most recent ClientReport timestamp
if (smr.getSourceTimestampMs() < clientReport.getTimestampMs()) if (apSsidMetrics.getSourceTimestampMs() < clientReport.getTimestampMs())
smr.setSourceTimestampMs(clientReport.getTimestampMs()); apSsidMetrics.setSourceTimestampMs(clientReport.getTimestampMs());
long txBytes = 0L; long txBytes = 0L;
long rxBytes = 0L; long rxBytes = 0L;
@@ -1839,8 +1839,9 @@ public class MqttStatsPublisher {
smr.setCustomerId(customerId); smr.setCustomerId(customerId);
smr.setEquipmentId(equipmentId); smr.setEquipmentId(equipmentId);
smr.setLocationId(locationId); smr.setLocationId(locationId);
smr.setSourceTimestampMs(survey.getTimestampMs());
ChannelInfoReports channelInfoReports = new ChannelInfoReports(); ChannelInfoReports channelInfoReports = new ChannelInfoReports();
channelInfoReports.setSourceTimestampMs(survey.getTimestampMs());
Map<RadioType, List<ChannelInfo>> channelInfoMap = channelInfoReports.getChannelInformationReportsPerRadio(); Map<RadioType, List<ChannelInfo>> channelInfoMap = channelInfoReports.getChannelInformationReportsPerRadio();
RadioType radioType = null; RadioType radioType = null;