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

ClientSession fix to merge with previous session to preserve values

Browse Source
This commit is contained in:
Mike Hansen
2020-07-29 12:54:24 -04:00
parent 753cb29cc2
commit 1edef6a0e4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1529,7 +1529,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
if (clientSession != null) {
LOG.debug("Session found for Client {}.", client.getMacAddress());
ClientSessionDetails clientSessionDetails = clientSession.getDetails();
ClientSessionDetails clientSessionDetails = new ClientSessionDetails();
clientSessionDetails.setRadioType(getRadioTypeFromOpensyncRadioBand(band));
clientSessionDetails.setSsid(ssid);
clientSessionDetails.setAssocRssi(getNegativeSignedIntFromUnsigned(client.getStats().getRssi()));
@@ -1563,10 +1563,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
// update the client metrics, based on what we see from
// the MQTT data
clientSessionDetails.setMetricDetails(calculateClientSessionMetricDetails(client, timestamp));
clientSession.setDetails(clientSessionDetails);
if (client.getDurationMs() > 0) {
clientSessionDetails.setMetricDetails(calculateClientSessionMetricDetails(client, timestamp));
}
clientSession.getDetails().mergeSession(clientSessionDetails);
clientSession = clientServiceInterface.updateSession(clientSession);
LOG.info("Updated clientSession {}", clientSession);
@@ -1602,6 +1603,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
private ClientSessionMetricDetails calculateClientSessionMetricDetails(sts.OpensyncStats.Client client,
long timestamp) {
LOG.debug("calculateClientSessionMetricDetails for Client {} at timestamp {}", client, timestamp);
ClientSessionMetricDetails metricDetails = new ClientSessionMetricDetails();
metricDetails.setRssi(getNegativeSignedIntFromUnsigned(client.getStats().getRssi()));
metricDetails.setRxBytes(client.getStats().getRxBytes());