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

Calculate equipment capacity details

Browse Source
This commit is contained in:
Lynn Shi
2020-07-31 14:53:03 -04:00
parent 835d045d14
commit 8cff591ea1
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1149,6 +1149,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
radioUtil.setTimestampSeconds((int) ((survey.getTimestampMs() + surveySample.getOffsetMs()) / 1000)); radioUtil.setTimestampSeconds((int) ((survey.getTimestampMs() + surveySample.getOffsetMs()) / 1000));
radioUtil.setAssocClientTx((100 * surveySample.getBusyTx()) / surveySample.getDurationMs()); radioUtil.setAssocClientTx((100 * surveySample.getBusyTx()) / surveySample.getDurationMs());
radioUtil.setAssocClientRx((100 * surveySample.getBusyRx()) / surveySample.getDurationMs()); radioUtil.setAssocClientRx((100 * surveySample.getBusyRx()) / surveySample.getDurationMs());
//TODO not totally correct, NonWifi = totalBusy - iBSS - oBSS
radioUtil.setNonWifi( radioUtil.setNonWifi(
(100 * (surveySample.getBusy() - surveySample.getBusyTx() - surveySample.getBusyRx())) (100 * (surveySample.getBusy() - surveySample.getBusyTx() - surveySample.getBusyRx()))
/ surveySample.getDurationMs()); / surveySample.getDurationMs());
@@ -1177,9 +1178,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
} else { } else {
apNodeMetrics.getRadioUtilizationPerRadio().get(radioType).add(radioUtil); apNodeMetrics.getRadioUtilizationPerRadio().get(radioType).add(radioUtil);
} }
} }
} }
if (survey.getSurveyListCount() > 0 && radioType != RadioType.UNSUPPORTED) { if (survey.getSurveyListCount() > 0 && radioType != RadioType.UNSUPPORTED) {
@@ -1188,8 +1187,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
apNodeMetrics.setNoiseFloor(radioType, noiseAvg); apNodeMetrics.setNoiseFloor(radioType, noiseAvg);
} }
Double totalUtilization = (100D * totalBusy) / durationMs; Double totalUtilization = (100D * totalBusy) / durationMs;
Double totalNonWifi = (100D * (totalBusy - iBSS - oBSS)) / durationMs;
EquipmentCapacityDetails cap = new EquipmentCapacityDetails(); EquipmentCapacityDetails cap = new EquipmentCapacityDetails();
cap.setTotalCapacity(totalUtilization.intValue()); cap.setUnavailableCapacity(totalNonWifi.intValue());
int avaiCapacity = 100 - totalNonWifi.intValue();
cap.setAvailableCapacity(avaiCapacity);
cap.setUsedCapacity(totalUtilization.intValue());
cap.setUnusedCapacity(avaiCapacity - totalUtilization.intValue());
if (radioType != RadioType.UNSUPPORTED) { if (radioType != RadioType.UNSUPPORTED) {
apNodeMetrics.setChannelUtilization(radioType, totalUtilization.intValue()); apNodeMetrics.setChannelUtilization(radioType, totalUtilization.intValue());
capacityDetails.put(radioType, cap); capacityDetails.put(radioType, cap);