From 8cff591ea14954b1566e9ad59b2405602c22a5c6 Mon Sep 17 00:00:00 2001 From: Lynn Shi Date: Fri, 31 Jul 2020 14:53:03 -0400 Subject: [PATCH] Calculate equipment capacity details --- .../OpensyncExternalIntegrationCloud.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java index 58657a8..ce6cb27 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java @@ -1149,6 +1149,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra radioUtil.setTimestampSeconds((int) ((survey.getTimestampMs() + surveySample.getOffsetMs()) / 1000)); radioUtil.setAssocClientTx((100 * surveySample.getBusyTx()) / surveySample.getDurationMs()); radioUtil.setAssocClientRx((100 * surveySample.getBusyRx()) / surveySample.getDurationMs()); + //TODO not totally correct, NonWifi = totalBusy - iBSS - oBSS radioUtil.setNonWifi( (100 * (surveySample.getBusy() - surveySample.getBusyTx() - surveySample.getBusyRx())) / surveySample.getDurationMs()); @@ -1177,9 +1178,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra } else { apNodeMetrics.getRadioUtilizationPerRadio().get(radioType).add(radioUtil); } - } - } if (survey.getSurveyListCount() > 0 && radioType != RadioType.UNSUPPORTED) { @@ -1188,8 +1187,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra apNodeMetrics.setNoiseFloor(radioType, noiseAvg); } Double totalUtilization = (100D * totalBusy) / durationMs; + Double totalNonWifi = (100D * (totalBusy - iBSS - oBSS)) / durationMs; + 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) { apNodeMetrics.setChannelUtilization(radioType, totalUtilization.intValue()); capacityDetails.put(radioType, cap);