WIFI-1947: OpensyncGateway - ApNode use only ON channel survey data

This commit is contained in:
Mike Hansen
2021-04-06 13:32:01 -04:00
parent eeeec8999f
commit f96b5b4bed

View File

@@ -1088,6 +1088,8 @@ public class MqttStatsPublisher {
// populate it from report.survey // populate it from report.survey
for (Survey survey : report.getSurveyList()) { for (Survey survey : report.getSurveyList()) {
if (survey.getSurveyType().equals(SurveyType.ON_CHANNEL)) { // only interested in ON_CHANNEL for this Metrics Report
int busyRx = 0; /* Rx = Rx_obss + Rx_errr (self and obss errors) */ int busyRx = 0; /* Rx = Rx_obss + Rx_errr (self and obss errors) */
int busyTx = 0; /* Tx */ int busyTx = 0; /* Tx */
int busySelf = 0; /* Rx_self (derived from succesful Rx frames) */ int busySelf = 0; /* Rx_self (derived from succesful Rx frames) */
@@ -1100,10 +1102,8 @@ public class MqttStatsPublisher {
if (surveySample.getDurationMs() == 0) { if (surveySample.getDurationMs() == 0) {
continue; continue;
} }
// we need to perform a weighted average here because the // we need to perform a weighted average here because the
// samples are in percentage, and may be of different durations // samples are in percentage, and may be of different durations
busyTx += surveySample.getBusyTx() * surveySample.getDurationMs(); busyTx += surveySample.getBusyTx() * surveySample.getDurationMs();
busyRx += surveySample.getBusyRx() * surveySample.getDurationMs(); busyRx += surveySample.getBusyRx() * surveySample.getDurationMs();
busy += surveySample.getBusy() * surveySample.getDurationMs(); busy += surveySample.getBusy() * surveySample.getDurationMs();
@@ -1154,6 +1154,8 @@ public class MqttStatsPublisher {
capacityDetails.put(radioType, cap); capacityDetails.put(radioType, cap);
} }
} }
}
} }
populateNetworkProbeMetrics(report, apNodeMetrics); populateNetworkProbeMetrics(report, apNodeMetrics);