Compare commits

...

1 Commits

Author SHA1 Message Date
Mike Hansen
49d59dcd15 [WIFI-3166] Session ID is a -ve number in opensyncgw logs and on UI logs
Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>
2021-07-19 18:07:07 -04:00
3 changed files with 58 additions and 57 deletions

View File

@@ -1610,8 +1610,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
clientSession.setMacAddress(clientInstance.getMacAddress()); clientSession.setMacAddress(clientInstance.getMacAddress());
clientSession.setLocationId(ce.getLocationId()); clientSession.setLocationId(ce.getLocationId());
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setSessionId(clientInstance.getMacAddress().getAddressAsLong()); clientSession.getDetails().setSessionId(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong()));
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(clientInstance.getMacAddress().getAddressAsLong())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated); clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
clientSession.getDetails().setAssocTimestamp(timestamp); clientSession.getDetails().setAssocTimestamp(timestamp);

View File

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.google.common.base.Objects;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import com.telecominfraproject.wlan.alarm.AlarmServiceInterface; import com.telecominfraproject.wlan.alarm.AlarmServiceInterface;
import com.telecominfraproject.wlan.alarm.models.Alarm; import com.telecominfraproject.wlan.alarm.models.Alarm;
@@ -338,20 +339,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand())); clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
clientSession.getDetails().setSsid(apClientEvent.getSsid()); clientSession.getDetails().setSsid(apClientEvent.getSsid());
@@ -462,20 +463,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand())); clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
clientSession.getDetails().setSsid(apClientEvent.getSsid()); clientSession.getDetails().setSsid(apClientEvent.getSsid());
if (apClientEvent.hasDevType()) { if (apClientEvent.hasDevType()) {
@@ -541,20 +542,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand())); clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
clientSession.getDetails().setSsid(apClientEvent.getSsid()); clientSession.getDetails().setSsid(apClientEvent.getSsid());
if (apClientEvent.hasAuthStatus()) { if (apClientEvent.hasAuthStatus()) {
@@ -592,20 +593,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand())); clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
clientSession.getDetails().setSsid(apClientEvent.getSsid()); clientSession.getDetails().setSsid(apClientEvent.getSsid());
if (apClientEvent.hasStatus()) { if (apClientEvent.hasStatus()) {
@@ -657,20 +658,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
clientSession.getDetails().setSsid(apClientEvent.getSsid()); clientSession.getDetails().setSsid(apClientEvent.getSsid());
ClientFailureDetails clientFailureDetails = new ClientFailureDetails(); ClientFailureDetails clientFailureDetails = new ClientFailureDetails();
@@ -705,20 +706,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
if (apClientEvent.hasFdataRxUpTsInUs()) { if (apClientEvent.hasFdataRxUpTsInUs()) {
clientSession.getDetails().setFirstDataRcvdTimestamp(apClientEvent.getFdataRxUpTsInUs()); clientSession.getDetails().setFirstDataRcvdTimestamp(apClientEvent.getFdataRxUpTsInUs());
@@ -757,20 +758,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getCltMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getCltMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
if (apClientEvent.hasCltId()) { if (apClientEvent.hasCltId()) {
clientSession.getDetails().setHostname(apClientEvent.getCltId()); clientSession.getDetails().setHostname(apClientEvent.getCltId());
} }
@@ -799,20 +800,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
if (apClientEvent.hasIpAddr()) { if (apClientEvent.hasIpAddr()) {
ByteString ipAddress = apClientEvent.getIpAddr(); ByteString ipAddress = apClientEvent.getIpAddr();
if (ipAddress != null) { if (ipAddress != null) {
@@ -856,20 +857,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac())); clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
clientSession.setLocationId(locationId); clientSession.setLocationId(locationId);
clientSession.setDetails(new ClientSessionDetails()); clientSession.setDetails(new ClientSessionDetails());
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(apEventClientSession.getSessionId())); clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails()); clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
} }
if (clientSession.getDetails().getPriorEquipmentId() == null) { if (clientSession.getDetails().getPriorEquipmentId() == null) {
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId()); clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
} }
if (clientSession.getDetails().getPriorSessionId() == null) { if (clientSession.getDetails().getPriorSessionId() == null) {
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId())))
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
if (clientSession.getDetails().getSessionId() != apEventClientSession.getSessionId()) { if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId()); clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
} }
clientSession.getDetails().setSessionId(apEventClientSession.getSessionId()); clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
if (apClientEvent.hasLastRcvUpTsInUs()) { if (apClientEvent.hasLastRcvUpTsInUs()) {
clientSession.getDetails().setLastRxTimestamp(apClientEvent.getLastRcvUpTsInUs()); clientSession.getDetails().setLastRxTimestamp(apClientEvent.getLastRcvUpTsInUs());
} }

View File

@@ -190,7 +190,7 @@ public class RealtimeEventPublisher {
clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
.getRadioTypeFromOpensyncStatsRadioBandType(clientConnectEvent.getBand())); .getRadioTypeFromOpensyncStatsRadioBandType(clientConnectEvent.getBand()));
clientEvent.setSsid(clientConnectEvent.getSsid()); clientEvent.setSsid(clientConnectEvent.getSsid());
clientEvent.setSessionId(clientConnectEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientConnectEvent.getSessionId()));
if (clientConnectEvent.hasFbtUsed()) { if (clientConnectEvent.hasFbtUsed()) {
clientEvent.setFbtUsed(clientConnectEvent.getFbtUsed()); clientEvent.setFbtUsed(clientConnectEvent.getFbtUsed());
@@ -278,7 +278,7 @@ public class RealtimeEventPublisher {
com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent( com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent(
clientDisconnectEvent.getTimestampMs()); clientDisconnectEvent.getTimestampMs());
clientEvent.setClientMacAddress(MacAddress.valueOf(clientDisconnectEvent.getStaMac())); clientEvent.setClientMacAddress(MacAddress.valueOf(clientDisconnectEvent.getStaMac()));
clientEvent.setSessionId(clientDisconnectEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientDisconnectEvent.getSessionId()));
clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
.getRadioTypeFromOpensyncStatsRadioBandType(clientDisconnectEvent.getBand())); .getRadioTypeFromOpensyncStatsRadioBandType(clientDisconnectEvent.getBand()));
clientEvent.setSsid(clientDisconnectEvent.getSsid()); clientEvent.setSsid(clientDisconnectEvent.getSsid());
@@ -326,7 +326,7 @@ public class RealtimeEventPublisher {
com.telecominfraproject.wlan.client.models.events.realtime.ClientAuthEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientAuthEvent( com.telecominfraproject.wlan.client.models.events.realtime.ClientAuthEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientAuthEvent(
clientAuthEvent.getTimestampMs()); clientAuthEvent.getTimestampMs());
clientEvent.setSessionId(clientAuthEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientAuthEvent.getSessionId()));
clientEvent.setSsid(clientAuthEvent.getSsid()); clientEvent.setSsid(clientAuthEvent.getSsid());
clientEvent.setClientMacAddress(MacAddress.valueOf(clientAuthEvent.getStaMac())); clientEvent.setClientMacAddress(MacAddress.valueOf(clientAuthEvent.getStaMac()));
clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
@@ -352,7 +352,7 @@ public class RealtimeEventPublisher {
com.telecominfraproject.wlan.client.models.events.realtime.ClientAssocEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientAssocEvent( com.telecominfraproject.wlan.client.models.events.realtime.ClientAssocEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientAssocEvent(
clientAssocEvent.getTimestampMs()); clientAssocEvent.getTimestampMs());
clientEvent.setSessionId(clientAssocEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientAssocEvent.getSessionId()));
clientEvent.setSsid(clientAssocEvent.getSsid()); clientEvent.setSsid(clientAssocEvent.getSsid());
clientEvent.setClientMacAddress(MacAddress.valueOf(clientAssocEvent.getStaMac())); clientEvent.setClientMacAddress(MacAddress.valueOf(clientAssocEvent.getStaMac()));
clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
@@ -403,7 +403,7 @@ public class RealtimeEventPublisher {
com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent( com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent(
clientFailureEvent.getTimestampMs()); clientFailureEvent.getTimestampMs());
clientEvent.setSessionId(clientFailureEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientFailureEvent.getSessionId()));
clientEvent.setClientMacAddress(MacAddress.valueOf(clientFailureEvent.getStaMac())); clientEvent.setClientMacAddress(MacAddress.valueOf(clientFailureEvent.getStaMac()));
clientEvent.setSsid(clientFailureEvent.getSsid()); clientEvent.setSsid(clientFailureEvent.getSsid());
@@ -430,7 +430,7 @@ public class RealtimeEventPublisher {
com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent( com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent(
clientFirstDataEvent.getTimestampMs()); clientFirstDataEvent.getTimestampMs());
clientEvent.setSessionId(clientFirstDataEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientFirstDataEvent.getSessionId()));
clientEvent.setClientMacAddress(MacAddress.valueOf(clientFirstDataEvent.getStaMac())); clientEvent.setClientMacAddress(MacAddress.valueOf(clientFirstDataEvent.getStaMac()));
if (clientFirstDataEvent.hasFdataTxUpTsInUs()) { if (clientFirstDataEvent.hasFdataTxUpTsInUs()) {
@@ -457,7 +457,7 @@ public class RealtimeEventPublisher {
com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent( com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent(
clientIdEvent.getTimestampMs()); clientIdEvent.getTimestampMs());
clientEvent.setSessionId(clientIdEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientIdEvent.getSessionId()));
clientEvent.setClientMacAddress(MacAddress.valueOf(clientIdEvent.getCltMac())); clientEvent.setClientMacAddress(MacAddress.valueOf(clientIdEvent.getCltMac()));
if (clientIdEvent.hasCltId()) { if (clientIdEvent.hasCltId()) {
clientEvent.setUserId(clientIdEvent.getCltId()); clientEvent.setUserId(clientIdEvent.getCltId());
@@ -478,7 +478,7 @@ public class RealtimeEventPublisher {
com.telecominfraproject.wlan.client.models.events.realtime.ClientIpAddressEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIpAddressEvent( com.telecominfraproject.wlan.client.models.events.realtime.ClientIpAddressEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIpAddressEvent(
clientIpEvent.getTimestampMs()); clientIpEvent.getTimestampMs());
clientEvent.setSessionId(clientIpEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientIpEvent.getSessionId()));
clientEvent.setClientMacAddress(MacAddress.valueOf(clientIpEvent.getStaMac())); clientEvent.setClientMacAddress(MacAddress.valueOf(clientIpEvent.getStaMac()));
if (clientIpEvent.hasIpAddr()) { if (clientIpEvent.hasIpAddr()) {
try { try {
@@ -505,7 +505,7 @@ public class RealtimeEventPublisher {
com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent( com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent(
clientTimeoutEvent.getTimestampMs()); clientTimeoutEvent.getTimestampMs());
clientEvent.setSessionId(clientTimeoutEvent.getSessionId()); clientEvent.setSessionId(Long.toUnsignedString( clientTimeoutEvent.getSessionId()));
clientEvent.setClientMacAddress(MacAddress.valueOf(clientTimeoutEvent.getStaMac())); clientEvent.setClientMacAddress(MacAddress.valueOf(clientTimeoutEvent.getStaMac()));
if (clientTimeoutEvent.hasRCode()) { if (clientTimeoutEvent.hasRCode()) {
clientEvent.setTimeoutReason(clientTimeoutEvent.getRCode().equals(CTReasonType.CTR_IDLE_TOO_LONG) clientEvent.setTimeoutReason(clientTimeoutEvent.getRCode().equals(CTReasonType.CTR_IDLE_TOO_LONG)
@@ -861,7 +861,7 @@ public class RealtimeEventPublisher {
cloudSipCallReportEvent.setEventType(RealTimeEventType.SipCallReport); cloudSipCallReportEvent.setEventType(RealTimeEventType.SipCallReport);
cloudSipCallReportEvent.setSipCallId(callReport.getWifiSessionId()); cloudSipCallReportEvent.setSipCallId(callReport.getWifiSessionId());
cloudSipCallReportEvent.setAssociationId(callReport.getSessionId()); cloudSipCallReportEvent.setAssociationId(Long.toUnsignedString( callReport.getSessionId()));
if (callReport.hasReason()) { if (callReport.hasReason()) {
cloudSipCallReportEvent.setReportReason(getCallReportReason(callReport.getReason())); cloudSipCallReportEvent.setReportReason(getCallReportReason(callReport.getReason()));
@@ -927,11 +927,11 @@ public class RealtimeEventPublisher {
} }
if (apCallStart.hasSessionId()) { if (apCallStart.hasSessionId()) {
cloudSipCallStartEvent.setAssociationId(apCallStart.getSessionId()); cloudSipCallStartEvent.setAssociationId(Long.toUnsignedString( apCallStart.getSessionId()));
} }
if (apCallStart.hasWifiSessionId()) { if (apCallStart.hasWifiSessionId()) {
cloudSipCallStartEvent.setAssociationId(apCallStart.getWifiSessionId()); cloudSipCallStartEvent.setAssociationId(Long.toUnsignedString( apCallStart.getWifiSessionId()));
} }
if (apCallStart.getCodecsCount() > 0) { if (apCallStart.getCodecsCount() > 0) {
@@ -991,7 +991,7 @@ public class RealtimeEventPublisher {
if (apCallStop.hasSessionId()) { if (apCallStop.hasSessionId()) {
cloudSipCallStopEvent.setAssociationId(apCallStop.getSessionId()); cloudSipCallStopEvent.setAssociationId(Long.toUnsignedString( apCallStop.getSessionId()));
} }
@@ -1055,11 +1055,11 @@ public class RealtimeEventPublisher {
} }
if (apStreamVideoServer.hasSessionId()) { if (apStreamVideoServer.hasSessionId()) {
rtsStartEvent.setSessionId(apStreamVideoServer.getSessionId()); rtsStartEvent.setSessionId(Long.toUnsignedString( apStreamVideoServer.getSessionId()));
} }
if (apStreamVideoServer.hasVideoSessionId()) { if (apStreamVideoServer.hasVideoSessionId()) {
rtsStartEvent.setVideoSessionId(apStreamVideoServer.getVideoSessionId()); rtsStartEvent.setVideoSessionId(Long.toUnsignedString( apStreamVideoServer.getVideoSessionId()));
} }
eventsList.add(rtsStartEvent); eventsList.add(rtsStartEvent);
@@ -1179,7 +1179,7 @@ public class RealtimeEventPublisher {
} }
if (apStreamVideoSessionStart.hasSessionId()) { if (apStreamVideoSessionStart.hasSessionId()) {
rtsStartSessionEvent.setSessionId(apStreamVideoSessionStart.getSessionId()); rtsStartSessionEvent.setSessionId(Long.toUnsignedString( apStreamVideoSessionStart.getSessionId()));
} }
@@ -1190,7 +1190,7 @@ public class RealtimeEventPublisher {
} }
if (apStreamVideoSessionStart.hasVideoSessionId()) { if (apStreamVideoSessionStart.hasVideoSessionId()) {
rtsStartSessionEvent.setVideoSessionId(apStreamVideoSessionStart.getVideoSessionId()); rtsStartSessionEvent.setVideoSessionId(Long.toUnsignedString( apStreamVideoSessionStart.getVideoSessionId()));
} }
eventsList.add(rtsStartSessionEvent); eventsList.add(rtsStartSessionEvent);
} }
@@ -1220,7 +1220,7 @@ public class RealtimeEventPublisher {
} }
if (apStreamVideoStop.hasSessionId()) { if (apStreamVideoStop.hasSessionId()) {
rtsStopEvent.setSessionId(apStreamVideoStop.getSessionId()); rtsStopEvent.setSessionId(Long.toUnsignedString( apStreamVideoStop.getSessionId()));
} }
if (apStreamVideoStop.hasStreamingVideoType()) { if (apStreamVideoStop.hasStreamingVideoType()) {
@@ -1235,7 +1235,7 @@ public class RealtimeEventPublisher {
} }
if (apStreamVideoStop.hasVideoSessionId()) { if (apStreamVideoStop.hasVideoSessionId()) {
rtsStopEvent.setVideoSessionId(apStreamVideoStop.getVideoSessionId()); rtsStopEvent.setVideoSessionId(Long.toUnsignedString( apStreamVideoStop.getVideoSessionId()));
} }
eventsList.add(rtsStopEvent); eventsList.add(rtsStopEvent);