mirror of
				https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git
				synced 2025-11-03 20:17:53 +00:00 
			
		
		
		
	[WIFI-3363] GW: ClientSession updates and SystemEvent performance improvements for OpensyncStats EventReport
Signed-off-by: Mike Hansen <mike.hansen@netexperience.com>
This commit is contained in:
		@@ -20,7 +20,6 @@ import org.slf4j.Logger;
 | 
			
		||||
import org.slf4j.LoggerFactory;
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.beans.factory.annotation.Value;
 | 
			
		||||
import org.springframework.scheduling.annotation.Async;
 | 
			
		||||
import org.springframework.stereotype.Component;
 | 
			
		||||
 | 
			
		||||
import com.google.common.base.Objects;
 | 
			
		||||
@@ -35,8 +34,6 @@ import com.telecominfraproject.wlan.client.ClientServiceInterface;
 | 
			
		||||
import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
 | 
			
		||||
import com.telecominfraproject.wlan.client.session.models.AssociationState;
 | 
			
		||||
import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
 | 
			
		||||
import com.telecominfraproject.wlan.client.session.models.ClientEapDetails;
 | 
			
		||||
import com.telecominfraproject.wlan.client.session.models.ClientFailureDetails;
 | 
			
		||||
import com.telecominfraproject.wlan.client.session.models.ClientSession;
 | 
			
		||||
import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
 | 
			
		||||
import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
 | 
			
		||||
@@ -98,13 +95,8 @@ import sts.OpensyncStats.DeviceType;
 | 
			
		||||
import sts.OpensyncStats.EventReport;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientAssocEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientAuthEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientConnectEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientDisconnectEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientFailureEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientFirstDataEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientIdEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientIpEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientTimeoutEvent;
 | 
			
		||||
import sts.OpensyncStats.FrameType;
 | 
			
		||||
import sts.OpensyncStats.Neighbor;
 | 
			
		||||
import sts.OpensyncStats.Neighbor.NeighborBss;
 | 
			
		||||
@@ -156,7 +148,7 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 | 
			
		||||
    public int statsTimeDriftThresholdSec;
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    @Async
 | 
			
		||||
    
 | 
			
		||||
    public void processMqttMessage(String topic, Report report) {
 | 
			
		||||
        // Numerous try/catch blocks to address situations where logs are not being reported due to corrupt or invalid
 | 
			
		||||
        // data in mqtt stats causing a crash
 | 
			
		||||
@@ -319,7 +311,6 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 | 
			
		||||
 | 
			
		||||
    void publishEvents(Report report, int customerId, long equipmentId, String apId, long locationId) {
 | 
			
		||||
 | 
			
		||||
        // asynchronous
 | 
			
		||||
        realtimeEventPublisher.publishSipCallEvents(customerId, equipmentId, locationId, report.getVideoVoiceReportList());
 | 
			
		||||
 | 
			
		||||
        for (EventReport eventReport : report.getEventReportList()) {
 | 
			
		||||
@@ -328,168 +319,25 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 | 
			
		||||
 | 
			
		||||
                LOG.debug("Processing EventReport::ClientSession for AP {}", apId);
 | 
			
		||||
                // for the following MQTT events, the client/client session is first updated, then the real time event
 | 
			
		||||
                // is published, asynchronously.
 | 
			
		||||
                // is published.
 | 
			
		||||
                if (apEventClientSession.hasClientAuthEvent()) {
 | 
			
		||||
                    processClientAuthEvent(customerId, equipmentId, locationId, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
                if (apEventClientSession.hasClientAssocEvent()) {
 | 
			
		||||
                    processClientAssocEvent(customerId, equipmentId, locationId, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
                if (apEventClientSession.hasClientFirstDataEvent()) {
 | 
			
		||||
                    processClientFirstDataEvent(customerId, equipmentId, locationId, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
                if (apEventClientSession.hasClientIdEvent()) {
 | 
			
		||||
                    processClientIdEvent(customerId, equipmentId, locationId, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
                if (apEventClientSession.hasClientIpEvent()) {
 | 
			
		||||
                    processClientIpEvent(customerId, equipmentId, locationId, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
                if (apEventClientSession.hasClientConnectEvent()) {
 | 
			
		||||
                    processClientConnectEvent(customerId, equipmentId, locationId, eventReport, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
                if (apEventClientSession.hasClientDisconnectEvent()) {
 | 
			
		||||
                    processClientDisconnectEvent(customerId, equipmentId, locationId, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
                if (apEventClientSession.hasClientTimeoutEvent()) {
 | 
			
		||||
                    processClientTimeoutEvent(customerId, equipmentId, locationId, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
                if (apEventClientSession.hasClientFailureEvent()) {
 | 
			
		||||
                    processClientFailureEvent(customerId, equipmentId, locationId, apEventClientSession);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            // asynchronous
 | 
			
		||||
            realtimeEventPublisher.publishChannelHopEvents(customerId, equipmentId, locationId, eventReport);
 | 
			
		||||
            // asynchronous
 | 
			
		||||
            realtimeEventPublisher.publishDhcpTransactionEvents(customerId, equipmentId, locationId, eventReport.getDhcpTransactionList());
 | 
			
		||||
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    protected void processClientConnectEvent(int customerId, long equipmentId, long locationId, EventReport e,
 | 
			
		||||
            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
 | 
			
		||||
        ClientConnectEvent apClientEvent = apEventClientSession.getClientConnectEvent();
 | 
			
		||||
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
        if (client == null) {
 | 
			
		||||
            client = new com.telecominfraproject.wlan.client.models.Client();
 | 
			
		||||
            client.setCustomerId(customerId);
 | 
			
		||||
            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
            client.setDetails(new ClientInfoDetails());
 | 
			
		||||
            client = clientServiceInterface.create(client);
 | 
			
		||||
        }
 | 
			
		||||
        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
        if (clientSession == null) {
 | 
			
		||||
            clientSession = new ClientSession();
 | 
			
		||||
            clientSession.setCustomerId(customerId);
 | 
			
		||||
            clientSession.setEquipmentId(equipmentId);
 | 
			
		||||
            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
            clientSession.setLocationId(locationId);
 | 
			
		||||
            clientSession.setDetails(new ClientSessionDetails());
 | 
			
		||||
            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorEquipmentId() == null) {
 | 
			
		||||
            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorSessionId() == null) {
 | 
			
		||||
            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
 | 
			
		||||
                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
 | 
			
		||||
            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
 | 
			
		||||
        clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
 | 
			
		||||
        clientSession.getDetails().setSsid(apClientEvent.getSsid());
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasEvTimeBootupInUsAssoc()) {
 | 
			
		||||
            clientSession.getDetails().setAssocTimestamp(apClientEvent.getEvTimeBootupInUsAssoc());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasEvTimeBootupInUsAuth()) {
 | 
			
		||||
            clientSession.getDetails().setAuthTimestamp(apClientEvent.getEvTimeBootupInUsAuth());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasEvTimeBootupInUsEapol()) {
 | 
			
		||||
            ClientEapDetails eapDetails = new ClientEapDetails();
 | 
			
		||||
            eapDetails.setEapSuccessTimestamp(apClientEvent.getEvTimeBootupInUsEapol());
 | 
			
		||||
            clientSession.getDetails().setEapDetails(eapDetails);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasEvTimeBootupInUsFirstRx()) {
 | 
			
		||||
            clientSession.getDetails().setFirstDataRcvdTimestamp(apClientEvent.getEvTimeBootupInUsFirstRx());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasEvTimeBootupInUsFirstTx()) {
 | 
			
		||||
            clientSession.getDetails().setFirstDataSentTimestamp(apClientEvent.getEvTimeBootupInUsFirstTx());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasEvTimeBootupInUsIp()) {
 | 
			
		||||
            clientSession.getDetails().setIpTimestamp(apClientEvent.getEvTimeBootupInUsIp());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasEvTimeBootupInUsPortEnable()) {
 | 
			
		||||
            clientSession.getDetails().setPortEnabledTimestamp(apClientEvent.getEvTimeBootupInUsPortEnable());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasCltId()) {
 | 
			
		||||
            clientSession.getDetails().setHostname(apClientEvent.getCltId());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasSecType()) {
 | 
			
		||||
            clientSession.getDetails().setSecurityType(OvsdbToWlanCloudTypeMappingUtility.getCloudSecurityTypeFromOpensyncStats(apClientEvent.getSecType()));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasAssocType()) {
 | 
			
		||||
            clientSession.getDetails().setIsReassociation(apClientEvent.getAssocType().equals(AssocType.REASSOC));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasAssocRssi()) {
 | 
			
		||||
            clientSession.getDetails().setAssocRssi(apClientEvent.getAssocRssi());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasUsing11K()) {
 | 
			
		||||
            clientSession.getDetails().setIs11KUsed(apClientEvent.getUsing11K());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasUsing11R()) {
 | 
			
		||||
            clientSession.getDetails().setIs11RUsed(apClientEvent.getUsing11R());
 | 
			
		||||
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasUsing11V()) {
 | 
			
		||||
            clientSession.getDetails().setIs11VUsed(apClientEvent.getUsing11V());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasIpAddr()) {
 | 
			
		||||
            ByteString ipAddress = apClientEvent.getIpAddr();
 | 
			
		||||
            if (ipAddress != null) {
 | 
			
		||||
                try {
 | 
			
		||||
                    InetAddress inetAddress = InetAddress.getByAddress(ipAddress.toByteArray());
 | 
			
		||||
                    if (inetAddress instanceof Inet4Address) {
 | 
			
		||||
                        clientSession.getDetails().setIpAddress(inetAddress);
 | 
			
		||||
                    } else if (inetAddress instanceof Inet6Address) {
 | 
			
		||||
                        clientSession.getDetails().setIpAddress(inetAddress);
 | 
			
		||||
                    } else {
 | 
			
		||||
                        LOG.error("Invalid IP Address {}", ipAddress);
 | 
			
		||||
                    }
 | 
			
		||||
                    clientSession.getDetails().setIpTimestamp(apClientEvent.getTimestampMs());
 | 
			
		||||
                } catch (UnknownHostException ex) {
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientSession.getDetails().getAssociationState() != null
 | 
			
		||||
                && !clientSession.getDetails().getAssociationState().equals(AssociationState._802_11_Associated)) {
 | 
			
		||||
            clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
 | 
			
		||||
            clientSession.getDetails().setAssocTimestamp(apClientEvent.getTimestampMs());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
 | 
			
		||||
        clientSession = clientServiceInterface.updateSession(clientSession);
 | 
			
		||||
        realtimeEventPublisher.publishClientConnectSuccessEvent(customerId, equipmentId, locationId, apEventClientSession.getClientConnectEvent());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    protected void processClientDisconnectEvent(int customerId, long equipmentId, long locationId,
 | 
			
		||||
            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
 | 
			
		||||
        ClientDisconnectEvent apClientEvent = apEventClientSession.getClientDisconnectEvent();
 | 
			
		||||
@@ -511,9 +359,7 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 | 
			
		||||
            clientSession.setDetails(new ClientSessionDetails());
 | 
			
		||||
            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorEquipmentId() == null) {
 | 
			
		||||
            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientSession.getDetails().getPriorSessionId() == null) {
 | 
			
		||||
            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
 | 
			
		||||
                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
@@ -682,144 +528,6 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    protected void processClientFailureEvent(int customerId, long equipmentId, long locationId,
 | 
			
		||||
            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
 | 
			
		||||
        ClientFailureEvent apClientEvent = apEventClientSession.getClientFailureEvent();
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
        if (client == null) {
 | 
			
		||||
            client = new com.telecominfraproject.wlan.client.models.Client();
 | 
			
		||||
            client.setCustomerId(customerId);
 | 
			
		||||
            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
            client.setDetails(new ClientInfoDetails());
 | 
			
		||||
            client = clientServiceInterface.create(client);
 | 
			
		||||
        }
 | 
			
		||||
        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
        if (clientSession == null) {
 | 
			
		||||
            clientSession = new ClientSession();
 | 
			
		||||
            clientSession.setCustomerId(customerId);
 | 
			
		||||
            clientSession.setEquipmentId(equipmentId);
 | 
			
		||||
            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
            clientSession.setLocationId(locationId);
 | 
			
		||||
            clientSession.setDetails(new ClientSessionDetails());
 | 
			
		||||
            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorEquipmentId() == null) {
 | 
			
		||||
            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorSessionId() == null) {
 | 
			
		||||
            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
 | 
			
		||||
                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
 | 
			
		||||
            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
 | 
			
		||||
        clientSession.getDetails().setSsid(apClientEvent.getSsid());
 | 
			
		||||
 | 
			
		||||
        ClientFailureDetails clientFailureDetails = new ClientFailureDetails();
 | 
			
		||||
        if (apClientEvent.hasReasonStr()) {
 | 
			
		||||
            clientFailureDetails.setReason(apClientEvent.getReasonStr());
 | 
			
		||||
        }
 | 
			
		||||
        if (apClientEvent.hasReasonCode()) {
 | 
			
		||||
            clientFailureDetails.setReasonCode(apClientEvent.getReasonCode());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setLastFailureDetails(clientFailureDetails);
 | 
			
		||||
        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
 | 
			
		||||
        clientSession = clientServiceInterface.updateSession(clientSession);
 | 
			
		||||
        realtimeEventPublisher.publishClientFailureEvent(customerId, equipmentId, locationId, apEventClientSession.getClientFailureEvent());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    protected void processClientFirstDataEvent(int customerId, long equipmentId, long locationId,
 | 
			
		||||
            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
 | 
			
		||||
        ClientFirstDataEvent apClientEvent = apEventClientSession.getClientFirstDataEvent();
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
        if (client == null) {
 | 
			
		||||
            client = new com.telecominfraproject.wlan.client.models.Client();
 | 
			
		||||
            client.setCustomerId(customerId);
 | 
			
		||||
            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
            client.setDetails(new ClientInfoDetails());
 | 
			
		||||
            client = clientServiceInterface.create(client);
 | 
			
		||||
        }
 | 
			
		||||
        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
        if (clientSession == null) {
 | 
			
		||||
            clientSession = new ClientSession();
 | 
			
		||||
            clientSession.setCustomerId(customerId);
 | 
			
		||||
            clientSession.setEquipmentId(equipmentId);
 | 
			
		||||
            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
            clientSession.setLocationId(locationId);
 | 
			
		||||
            clientSession.setDetails(new ClientSessionDetails());
 | 
			
		||||
            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorEquipmentId() == null) {
 | 
			
		||||
            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorSessionId() == null) {
 | 
			
		||||
            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
 | 
			
		||||
                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
 | 
			
		||||
            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasFdataRxUpTsInUs()) {
 | 
			
		||||
            clientSession.getDetails().setFirstDataRcvdTimestamp(apClientEvent.getFdataRxUpTsInUs());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (apClientEvent.hasFdataTxUpTsInUs()) {
 | 
			
		||||
            clientSession.getDetails().setFirstDataSentTimestamp(apClientEvent.getFdataTxUpTsInUs());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
 | 
			
		||||
        clientSession = clientServiceInterface.updateSession(clientSession);
 | 
			
		||||
 | 
			
		||||
        realtimeEventPublisher.publishClientFirstDataEvent(customerId, equipmentId, locationId, apEventClientSession.getClientFirstDataEvent());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    protected void processClientIdEvent(int customerId, long equipmentId, long locationId, sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
 | 
			
		||||
        ClientIdEvent apClientEvent = apEventClientSession.getClientIdEvent();
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getCltMac()));
 | 
			
		||||
        if (client == null) {
 | 
			
		||||
            client = new com.telecominfraproject.wlan.client.models.Client();
 | 
			
		||||
            client.setCustomerId(customerId);
 | 
			
		||||
            client.setMacAddress(MacAddress.valueOf(apClientEvent.getCltMac()));
 | 
			
		||||
            client.setDetails(new ClientInfoDetails());
 | 
			
		||||
            client = clientServiceInterface.create(client);
 | 
			
		||||
        }
 | 
			
		||||
        if (apClientEvent.hasCltId()) {
 | 
			
		||||
            ((ClientInfoDetails) client.getDetails()).setHostName(apClientEvent.getCltId());
 | 
			
		||||
        }
 | 
			
		||||
        client = clientServiceInterface.update(client);
 | 
			
		||||
 | 
			
		||||
        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getCltMac()));
 | 
			
		||||
        if (clientSession == null) {
 | 
			
		||||
            clientSession = new ClientSession();
 | 
			
		||||
            clientSession.setCustomerId(customerId);
 | 
			
		||||
            clientSession.setEquipmentId(equipmentId);
 | 
			
		||||
            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getCltMac()));
 | 
			
		||||
            clientSession.setLocationId(locationId);
 | 
			
		||||
            clientSession.setDetails(new ClientSessionDetails());
 | 
			
		||||
            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorEquipmentId() == null) {
 | 
			
		||||
            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorSessionId() == null) {
 | 
			
		||||
            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
 | 
			
		||||
                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
 | 
			
		||||
            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
 | 
			
		||||
        if (apClientEvent.hasCltId()) {
 | 
			
		||||
            clientSession.getDetails().setHostname(apClientEvent.getCltId());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
 | 
			
		||||
        clientSession = clientServiceInterface.updateSession(clientSession);
 | 
			
		||||
        realtimeEventPublisher.publishClientIdEvent(customerId, equipmentId, locationId, apEventClientSession.getClientIdEvent());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    protected void processClientIpEvent(int customerId, long equipmentId, long locationId, sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
 | 
			
		||||
        ClientIpEvent apClientEvent = apEventClientSession.getClientIpEvent();
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
@@ -876,52 +584,6 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 | 
			
		||||
        realtimeEventPublisher.publishClientIpEvent(customerId, equipmentId, locationId, apEventClientSession.getClientIpEvent());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    protected void processClientTimeoutEvent(int customerId, long equipmentId, long locationId,
 | 
			
		||||
            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
 | 
			
		||||
        ClientTimeoutEvent apClientEvent = apEventClientSession.getClientTimeoutEvent();
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
        if (client == null) {
 | 
			
		||||
            client = new com.telecominfraproject.wlan.client.models.Client();
 | 
			
		||||
            client.setCustomerId(customerId);
 | 
			
		||||
            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
            client.setDetails(new ClientInfoDetails());
 | 
			
		||||
            client = clientServiceInterface.create(client);
 | 
			
		||||
        }
 | 
			
		||||
        client = clientServiceInterface.update(client);
 | 
			
		||||
        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
        if (clientSession == null) {
 | 
			
		||||
            clientSession = new ClientSession();
 | 
			
		||||
            clientSession.setCustomerId(customerId);
 | 
			
		||||
            clientSession.setEquipmentId(equipmentId);
 | 
			
		||||
            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
 | 
			
		||||
            clientSession.setLocationId(locationId);
 | 
			
		||||
            clientSession.setDetails(new ClientSessionDetails());
 | 
			
		||||
            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorEquipmentId() == null) {
 | 
			
		||||
            clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
 | 
			
		||||
        }
 | 
			
		||||
        if (clientSession.getDetails().getPriorSessionId() == null) {
 | 
			
		||||
            if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
 | 
			
		||||
                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
 | 
			
		||||
            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
 | 
			
		||||
        if (apClientEvent.hasLastRcvUpTsInUs()) {
 | 
			
		||||
            clientSession.getDetails().setLastRxTimestamp(apClientEvent.getLastRcvUpTsInUs());
 | 
			
		||||
        }
 | 
			
		||||
        if (apClientEvent.hasLastSentUpTsInUs()) {
 | 
			
		||||
            clientSession.getDetails().setLastTxTimestamp(apClientEvent.getLastSentUpTsInUs());
 | 
			
		||||
        }
 | 
			
		||||
        clientSession.getDetails().setTimeoutTimestamp(apClientEvent.getTimestampMs());
 | 
			
		||||
        clientSession.getDetails().setAssociationState(AssociationState.AP_Timeout);
 | 
			
		||||
        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
 | 
			
		||||
        clientSession = clientServiceInterface.updateSession(clientSession);
 | 
			
		||||
        realtimeEventPublisher.publishClientTimeoutEvent(customerId, equipmentId, locationId, apEventClientSession.getClientTimeoutEvent());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void populateApNodeMetrics(List<ServiceMetric> metricRecordList, Report report, int customerId, long equipmentId, long locationId) {
 | 
			
		||||
        LOG.info("populateApNodeMetrics for Customer {} Equipment {}", customerId, equipmentId);
 | 
			
		||||
        ApNodeMetrics apNodeMetrics = new ApNodeMetrics();
 | 
			
		||||
@@ -1235,7 +897,7 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 | 
			
		||||
        updateDeviceStatusRadioUtilizationReport(customerId, equipmentId, radioUtilizationReport);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Async
 | 
			
		||||
    
 | 
			
		||||
    void clearDeviceThresholdAlarm(int customerId, long equipmentId, AlarmCode alarmCode) {
 | 
			
		||||
        alarmServiceInterface.get(customerId, Set.of(equipmentId), Set.of(alarmCode)).stream().forEach(a -> {
 | 
			
		||||
            Alarm alarm = alarmServiceInterface.delete(customerId, equipmentId, a.getAlarmCode(), a.getCreatedTimestamp());
 | 
			
		||||
@@ -1243,7 +905,7 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Async
 | 
			
		||||
    
 | 
			
		||||
    void raiseDeviceThresholdAlarm(int customerId, long equipmentId, AlarmCode alarmCode, long timestampMs) {
 | 
			
		||||
        // Raise an alarm for temperature
 | 
			
		||||
        Alarm alarm = new Alarm();
 | 
			
		||||
 
 | 
			
		||||
@@ -8,13 +8,10 @@ import java.util.List;
 | 
			
		||||
import org.slf4j.Logger;
 | 
			
		||||
import org.slf4j.LoggerFactory;
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.scheduling.annotation.Async;
 | 
			
		||||
import org.springframework.stereotype.Component;
 | 
			
		||||
 | 
			
		||||
import com.telecominfraproject.wlan.client.models.events.realtime.ClientConnectSuccessEvent;
 | 
			
		||||
import com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent.DisconnectFrameType;
 | 
			
		||||
import com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent.DisconnectInitiator;
 | 
			
		||||
import com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent.ClientTimeoutReason;
 | 
			
		||||
import com.telecominfraproject.wlan.client.models.events.utils.WlanReasonCode;
 | 
			
		||||
import com.telecominfraproject.wlan.client.models.events.utils.WlanStatusCode;
 | 
			
		||||
import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
 | 
			
		||||
@@ -29,7 +26,6 @@ import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
 | 
			
		||||
import com.telecominfraproject.wlan.profile.models.ProfileContainer;
 | 
			
		||||
import com.telecominfraproject.wlan.profile.models.ProfileType;
 | 
			
		||||
import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
 | 
			
		||||
import com.telecominfraproject.wlan.systemevent.equipment.BaseDhcpEvent;
 | 
			
		||||
import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeChannelHopEvent;
 | 
			
		||||
import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
 | 
			
		||||
import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeSipCallReportEvent;
 | 
			
		||||
@@ -44,7 +40,6 @@ import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
 | 
			
		||||
 | 
			
		||||
import sts.OpensyncStats;
 | 
			
		||||
import sts.OpensyncStats.AssocType;
 | 
			
		||||
import sts.OpensyncStats.CTReasonType;
 | 
			
		||||
import sts.OpensyncStats.CallReport;
 | 
			
		||||
import sts.OpensyncStats.CallStart;
 | 
			
		||||
import sts.OpensyncStats.CallStop;
 | 
			
		||||
@@ -53,22 +48,8 @@ import sts.OpensyncStats.DeviceType;
 | 
			
		||||
import sts.OpensyncStats.EventReport;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientAssocEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientAuthEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientConnectEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientDisconnectEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientFailureEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientFirstDataEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientIdEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientIpEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.ClientTimeoutEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpAckEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpCommonData;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpDeclineEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpDiscoverEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpInformEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpNakEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpOfferEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpRequestEvent;
 | 
			
		||||
import sts.OpensyncStats.EventReport.DhcpTransaction;
 | 
			
		||||
import sts.OpensyncStats.FrameType;
 | 
			
		||||
import sts.OpensyncStats.RtpFlowStats;
 | 
			
		||||
import sts.OpensyncStats.StreamingVideoServerDetected;
 | 
			
		||||
@@ -91,7 +72,7 @@ public class RealtimeEventPublisher {
 | 
			
		||||
 | 
			
		||||
    private static final Logger LOG = LoggerFactory.getLogger(RealtimeEventPublisher.class);
 | 
			
		||||
    
 | 
			
		||||
    @Async
 | 
			
		||||
    
 | 
			
		||||
    void publishChannelHopEvents(int customerId, long equipmentId, long locationId, EventReport e) {
 | 
			
		||||
 | 
			
		||||
        LOG.info("publishChannelHopEvents for customerId {} equipmentId {}");
 | 
			
		||||
@@ -180,96 +161,8 @@ public class RealtimeEventPublisher {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Async
 | 
			
		||||
    void publishClientConnectSuccessEvent(int customerId, long equipmentId, long locationId, ClientConnectEvent clientConnectEvent) {
 | 
			
		||||
    
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientConnectEvent, customerId,
 | 
			
		||||
                equipmentId);
 | 
			
		||||
        ClientConnectSuccessEvent clientEvent = new ClientConnectSuccessEvent(clientConnectEvent.getTimestampMs());
 | 
			
		||||
        clientEvent.setClientMacAddress(MacAddress.valueOf(clientConnectEvent.getStaMac()));
 | 
			
		||||
        clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
 | 
			
		||||
                .getRadioTypeFromOpensyncStatsRadioBandType(clientConnectEvent.getBand()));
 | 
			
		||||
        clientEvent.setSsid(clientConnectEvent.getSsid());
 | 
			
		||||
        clientEvent.setSessionId(Long.toUnsignedString( clientConnectEvent.getSessionId()));
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasFbtUsed()) {
 | 
			
		||||
            clientEvent.setFbtUsed(clientConnectEvent.getFbtUsed());
 | 
			
		||||
        }
 | 
			
		||||
        if (clientConnectEvent.hasEvTimeBootupInUsAssoc()) {
 | 
			
		||||
            clientEvent.setAssocTs(clientConnectEvent.getEvTimeBootupInUsAssoc());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasEvTimeBootupInUsAuth()) {
 | 
			
		||||
            clientEvent.setAuthTs(clientConnectEvent.getEvTimeBootupInUsAuth());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasEvTimeBootupInUsEapol()) {
 | 
			
		||||
            clientEvent.setEapolTs(clientConnectEvent.getEvTimeBootupInUsEapol());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasEvTimeBootupInUsFirstRx()) {
 | 
			
		||||
            clientEvent.setFirstDataRxTs(clientConnectEvent.getEvTimeBootupInUsFirstRx());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasEvTimeBootupInUsFirstTx()) {
 | 
			
		||||
            clientEvent.setFirstDataTxTs(clientConnectEvent.getEvTimeBootupInUsFirstTx());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasEvTimeBootupInUsIp()) {
 | 
			
		||||
            clientEvent.setIpAcquisitionTs(clientConnectEvent.getEvTimeBootupInUsIp());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasEvTimeBootupInUsPortEnable()) {
 | 
			
		||||
            clientEvent.setPortEnabledTs(clientConnectEvent.getEvTimeBootupInUsPortEnable());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasCltId()) {
 | 
			
		||||
            clientEvent.setHostName(clientConnectEvent.getCltId());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasSecType()) {
 | 
			
		||||
            clientEvent.setSecurityType(OvsdbToWlanCloudTypeMappingUtility
 | 
			
		||||
                    .getCloudSecurityTypeFromOpensyncStats(clientConnectEvent.getSecType()));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasAssocType()) {
 | 
			
		||||
            clientEvent.setReassociation(clientConnectEvent.getAssocType().equals(AssocType.REASSOC));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasAssocRssi()) {
 | 
			
		||||
            clientEvent.setAssocRSSI(clientConnectEvent.getAssocRssi());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasUsing11K()) {
 | 
			
		||||
            clientEvent.setUsing11k(clientConnectEvent.getUsing11K());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasUsing11R()) {
 | 
			
		||||
            clientEvent.setUsing11r(clientConnectEvent.getUsing11R());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasUsing11V()) {
 | 
			
		||||
            clientEvent.setUsing11v(clientConnectEvent.getUsing11V());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientConnectEvent.hasIpAddr()) {
 | 
			
		||||
            try {
 | 
			
		||||
                clientEvent.setIpAddr(InetAddress.getByAddress(clientConnectEvent.getIpAddr().toByteArray()));
 | 
			
		||||
 | 
			
		||||
            } catch (UnknownHostException e1) {
 | 
			
		||||
                LOG.error("Invalid Ip Address for client {}", clientConnectEvent.getIpAddr(), e1);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        clientEvent.setEventTimestamp(clientConnectEvent.getTimestampMs());
 | 
			
		||||
        clientEvent.setCustomerId(customerId);
 | 
			
		||||
        clientEvent.setEquipmentId(equipmentId);
 | 
			
		||||
        clientEvent.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
        LOG.info("Publishing client event {} to cloud", clientEvent);
 | 
			
		||||
        cloudEventDispatcherInterface.publishEvent(clientEvent);
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
    @Async
 | 
			
		||||
    void publishClientDisconnectEvent(int customerId, long equipmentId, long locationId, ClientDisconnectEvent clientDisconnectEvent) {
 | 
			
		||||
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientDisconnectEvent, customerId,
 | 
			
		||||
@@ -320,7 +213,6 @@ public class RealtimeEventPublisher {
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
    
 | 
			
		||||
   @Async
 | 
			
		||||
    void publishClientAuthSystemEvent(int customerId, long equipmentId, long locationId, ClientAuthEvent clientAuthEvent) {
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientAuthEvent, customerId, equipmentId);
 | 
			
		||||
 | 
			
		||||
@@ -345,7 +237,6 @@ public class RealtimeEventPublisher {
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
   
 | 
			
		||||
   @Async
 | 
			
		||||
    void publishClientAssocEvent(int customerId, long equipmentId, long locationId, ClientAssocEvent clientAssocEvent) {
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientAssocEvent, customerId, equipmentId);
 | 
			
		||||
 | 
			
		||||
@@ -395,82 +286,7 @@ public class RealtimeEventPublisher {
 | 
			
		||||
        cloudEventDispatcherInterface.publishEvent(clientEvent);
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
   @Async
 | 
			
		||||
    void publishClientFailureEvent(int customerId, long equipmentId, long locationId, ClientFailureEvent clientFailureEvent) {
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientFailureEvent, customerId,
 | 
			
		||||
                equipmentId);
 | 
			
		||||
 
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent(
 | 
			
		||||
                clientFailureEvent.getTimestampMs());
 | 
			
		||||
 | 
			
		||||
        clientEvent.setSessionId(Long.toUnsignedString( clientFailureEvent.getSessionId()));
 | 
			
		||||
        clientEvent.setClientMacAddress(MacAddress.valueOf(clientFailureEvent.getStaMac()));
 | 
			
		||||
        clientEvent.setSsid(clientFailureEvent.getSsid());
 | 
			
		||||
 | 
			
		||||
        if (clientFailureEvent.hasReasonStr()) {
 | 
			
		||||
            clientEvent.setReasonString(clientFailureEvent.getReasonStr());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientFailureEvent.hasReasonCode()) {
 | 
			
		||||
            clientEvent.setReasonCode(WlanReasonCode.getById(clientFailureEvent.getReasonCode()));
 | 
			
		||||
        }
 | 
			
		||||
        clientEvent.setEventTimestamp(clientFailureEvent.getTimestampMs());
 | 
			
		||||
        clientEvent.setCustomerId(customerId);
 | 
			
		||||
        clientEvent.setEquipmentId(equipmentId);
 | 
			
		||||
        clientEvent.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
        LOG.info("publishing client event {} to cloud", clientEvent);
 | 
			
		||||
        cloudEventDispatcherInterface.publishEvent(clientEvent);
 | 
			
		||||
    }
 | 
			
		||||
   @Async
 | 
			
		||||
    void publishClientFirstDataEvent(int customerId, long equipmentId, long locationId, ClientFirstDataEvent clientFirstDataEvent) {
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientFirstDataEvent, customerId,
 | 
			
		||||
                equipmentId);
 | 
			
		||||
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent(
 | 
			
		||||
                clientFirstDataEvent.getTimestampMs());
 | 
			
		||||
 | 
			
		||||
        clientEvent.setSessionId(Long.toUnsignedString( clientFirstDataEvent.getSessionId()));
 | 
			
		||||
        clientEvent.setClientMacAddress(MacAddress.valueOf(clientFirstDataEvent.getStaMac()));
 | 
			
		||||
 | 
			
		||||
        if (clientFirstDataEvent.hasFdataTxUpTsInUs()) {
 | 
			
		||||
            clientEvent.setFirstDataSentTs(clientFirstDataEvent.getFdataTxUpTsInUs());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (clientFirstDataEvent.hasFdataRxUpTsInUs()) {
 | 
			
		||||
            clientEvent.setFirstDataRcvdTs(clientFirstDataEvent.getFdataRxUpTsInUs());
 | 
			
		||||
        }
 | 
			
		||||
        clientEvent.setEventTimestamp(clientFirstDataEvent.getTimestampMs());
 | 
			
		||||
        clientEvent.setCustomerId(customerId);
 | 
			
		||||
        clientEvent.setEquipmentId(equipmentId);
 | 
			
		||||
        clientEvent.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
        LOG.info("publishing client event {} to cloud", clientEvent);
 | 
			
		||||
        cloudEventDispatcherInterface.publishEvent(clientEvent);
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
   @Async
 | 
			
		||||
    void publishClientIdEvent(int customerId, long equipmentId, long locationId, ClientIdEvent clientIdEvent) {
 | 
			
		||||
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientIdEvent, customerId, equipmentId);
 | 
			
		||||
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent(
 | 
			
		||||
                clientIdEvent.getTimestampMs());
 | 
			
		||||
 | 
			
		||||
        clientEvent.setSessionId(Long.toUnsignedString( clientIdEvent.getSessionId()));
 | 
			
		||||
        clientEvent.setClientMacAddress(MacAddress.valueOf(clientIdEvent.getCltMac()));
 | 
			
		||||
        if (clientIdEvent.hasCltId()) {
 | 
			
		||||
            clientEvent.setUserId(clientIdEvent.getCltId());
 | 
			
		||||
        }
 | 
			
		||||
        clientEvent.setEventTimestamp(clientIdEvent.getTimestampMs());
 | 
			
		||||
        clientEvent.setCustomerId(customerId);
 | 
			
		||||
        clientEvent.setEquipmentId(equipmentId);
 | 
			
		||||
        clientEvent.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
        LOG.info("publishing client event {} to cloud", clientEvent);
 | 
			
		||||
        cloudEventDispatcherInterface.publishEvent(clientEvent);
 | 
			
		||||
    }
 | 
			
		||||
   @Async
 | 
			
		||||
    void publishClientIpEvent(int customerId, long equipmentId, long locationId, ClientIpEvent clientIpEvent) {
 | 
			
		||||
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientIpEvent, customerId, equipmentId);
 | 
			
		||||
@@ -496,320 +312,7 @@ public class RealtimeEventPublisher {
 | 
			
		||||
        LOG.info("publishing client event {} to cloud", clientEvent);
 | 
			
		||||
        cloudEventDispatcherInterface.publishEvent(clientEvent);
 | 
			
		||||
    }
 | 
			
		||||
   @Async
 | 
			
		||||
    void publishClientTimeoutEvent(int customerId, long equipmentId, long locationId, ClientTimeoutEvent clientTimeoutEvent) {
 | 
			
		||||
   
 | 
			
		||||
        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientTimeoutEvent, customerId,
 | 
			
		||||
                equipmentId);
 | 
			
		||||
 | 
			
		||||
        com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent(
 | 
			
		||||
                clientTimeoutEvent.getTimestampMs());
 | 
			
		||||
 | 
			
		||||
        clientEvent.setSessionId(Long.toUnsignedString( clientTimeoutEvent.getSessionId()));
 | 
			
		||||
        clientEvent.setClientMacAddress(MacAddress.valueOf(clientTimeoutEvent.getStaMac()));
 | 
			
		||||
        if (clientTimeoutEvent.hasRCode()) {
 | 
			
		||||
            clientEvent.setTimeoutReason(clientTimeoutEvent.getRCode().equals(CTReasonType.CTR_IDLE_TOO_LONG)
 | 
			
		||||
                    ? ClientTimeoutReason.IdleTooLong
 | 
			
		||||
                    : ClientTimeoutReason.FailedProbe);
 | 
			
		||||
        }
 | 
			
		||||
        if (clientTimeoutEvent.hasLastRcvUpTsInUs()) {
 | 
			
		||||
            clientEvent.setLastRecvTime(clientTimeoutEvent.getLastRcvUpTsInUs());
 | 
			
		||||
        }
 | 
			
		||||
        if (clientTimeoutEvent.hasLastSentUpTsInUs()) {
 | 
			
		||||
            clientEvent.setLastSentTime(clientTimeoutEvent.getLastSentUpTsInUs());
 | 
			
		||||
        }
 | 
			
		||||
        clientEvent.setEventTimestamp(clientTimeoutEvent.getTimestampMs());
 | 
			
		||||
        clientEvent.setCustomerId(customerId);
 | 
			
		||||
        clientEvent.setEquipmentId(equipmentId);
 | 
			
		||||
        clientEvent.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
        LOG.info("publishing client event {} to cloud", clientEvent);
 | 
			
		||||
        cloudEventDispatcherInterface.publishEvent(clientEvent);
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
   @Async
 | 
			
		||||
    void publishDhcpTransactionEvents(int customerId, long equipmentId, long locationId, List<DhcpTransaction> dhcpTransactionList) {
 | 
			
		||||
        LOG.info("Publish Dhcp Transaction Events for customer {} equipmentId {}", customerId, equipmentId);
 | 
			
		||||
        List<SystemEvent> dhcpEventsList = new ArrayList<>();
 | 
			
		||||
        for (DhcpTransaction dhcpTransaction : dhcpTransactionList) {
 | 
			
		||||
 | 
			
		||||
            for (DhcpAckEvent ackEvent : dhcpTransaction.getDhcpAckEventList()) {
 | 
			
		||||
                LOG.debug("DhcpAckEvent {}", ackEvent);
 | 
			
		||||
 | 
			
		||||
                com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent cloudDhcpAck = new com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent();
 | 
			
		||||
 | 
			
		||||
                cloudDhcpAck.setCustomerId(customerId);
 | 
			
		||||
                cloudDhcpAck.setEquipmentId(equipmentId);
 | 
			
		||||
                cloudDhcpAck.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasDhcpCommonData()) {
 | 
			
		||||
                    cloudDhcpAck = (com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent) getDhcpCommonDataForEvent(
 | 
			
		||||
                            cloudDhcpAck, ackEvent.getDhcpCommonData());
 | 
			
		||||
                } else {
 | 
			
		||||
                    cloudDhcpAck.setxId(dhcpTransaction.getXId());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasGatewayIp()) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        cloudDhcpAck.setGatewayIp(InetAddress.getByAddress(ackEvent.getGatewayIp().toByteArray()));
 | 
			
		||||
                    } catch (UnknownHostException e) {
 | 
			
		||||
                        LOG.error("Invalid GatewayIP", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasLeaseTime()) {
 | 
			
		||||
                    cloudDhcpAck.setLeaseTime(ackEvent.getLeaseTime());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasPrimaryDns()) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        cloudDhcpAck.setPrimaryDns(InetAddress.getByAddress(ackEvent.getPrimaryDns().toByteArray()));
 | 
			
		||||
                    } catch (UnknownHostException e) {
 | 
			
		||||
                        LOG.error("Invalid PrimaryDNS", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasSecondaryDns()) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        cloudDhcpAck
 | 
			
		||||
                                .setSecondaryDns(InetAddress.getByAddress(ackEvent.getSecondaryDns().toByteArray()));
 | 
			
		||||
                    } catch (UnknownHostException e) {
 | 
			
		||||
                        LOG.error("Invalid SecondaryDNS", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasRebindingTime()) {
 | 
			
		||||
                    cloudDhcpAck.setRebindingTime(ackEvent.getRebindingTime());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasRenewalTime()) {
 | 
			
		||||
                    cloudDhcpAck.setRenewalTime(ackEvent.getRenewalTime());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasSubnetMask()) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        cloudDhcpAck.setSubnetMask(InetAddress.getByAddress(ackEvent.getSubnetMask().toByteArray()));
 | 
			
		||||
                    } catch (UnknownHostException e) {
 | 
			
		||||
                        LOG.error("Invalid SubnetMask", e);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (ackEvent.hasTimeOffset()) {
 | 
			
		||||
                    cloudDhcpAck.setTimeOffset(ackEvent.getTimeOffset());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                LOG.debug("Cloud DhcpAckEvent {}", cloudDhcpAck);
 | 
			
		||||
 | 
			
		||||
                dhcpEventsList.add(cloudDhcpAck);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            for (DhcpNakEvent nakEvent : dhcpTransaction.getDhcpNakEventList()) {
 | 
			
		||||
                LOG.debug("DhcpNakEvent {}", nakEvent);
 | 
			
		||||
 | 
			
		||||
                com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent cloudDhcpNak = new com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent();
 | 
			
		||||
 | 
			
		||||
                cloudDhcpNak.setCustomerId(customerId);
 | 
			
		||||
                cloudDhcpNak.setEquipmentId(equipmentId);
 | 
			
		||||
                cloudDhcpNak.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
                if (nakEvent.hasDhcpCommonData()) {
 | 
			
		||||
                    cloudDhcpNak = (com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent) getDhcpCommonDataForEvent(
 | 
			
		||||
                            cloudDhcpNak, nakEvent.getDhcpCommonData());
 | 
			
		||||
 | 
			
		||||
                } else {
 | 
			
		||||
                    cloudDhcpNak.setxId(dhcpTransaction.getXId());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (nakEvent.hasFromInternal()) {
 | 
			
		||||
                    cloudDhcpNak.setFromInternal(nakEvent.getFromInternal());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                LOG.debug("Cloud DhcpNakEvent {}", cloudDhcpNak);
 | 
			
		||||
 | 
			
		||||
                dhcpEventsList.add(cloudDhcpNak);
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            for (DhcpOfferEvent offerEvent : dhcpTransaction.getDhcpOfferEventList()) {
 | 
			
		||||
                LOG.debug("DhcpOfferEvent {}", offerEvent);
 | 
			
		||||
 | 
			
		||||
                com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent cloudDhcpOffer = new com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent();
 | 
			
		||||
 | 
			
		||||
                cloudDhcpOffer.setCustomerId(customerId);
 | 
			
		||||
                cloudDhcpOffer.setEquipmentId(equipmentId);
 | 
			
		||||
                cloudDhcpOffer.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
                if (offerEvent.hasDhcpCommonData()) {
 | 
			
		||||
                    cloudDhcpOffer = (com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent) getDhcpCommonDataForEvent(
 | 
			
		||||
                            cloudDhcpOffer, offerEvent.getDhcpCommonData());
 | 
			
		||||
 | 
			
		||||
                } else {
 | 
			
		||||
                    cloudDhcpOffer.setxId(dhcpTransaction.getXId());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (offerEvent.hasFromInternal()) {
 | 
			
		||||
                    cloudDhcpOffer.setFromInternal(offerEvent.getFromInternal());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                dhcpEventsList.add(cloudDhcpOffer);
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            for (DhcpInformEvent informEvent : dhcpTransaction.getDhcpInformEventList()) {
 | 
			
		||||
                LOG.debug("DhcpInformEvent {}", informEvent);
 | 
			
		||||
 | 
			
		||||
                com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent cloudDhcpInform = new com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent();
 | 
			
		||||
 | 
			
		||||
                cloudDhcpInform.setCustomerId(customerId);
 | 
			
		||||
                cloudDhcpInform.setEquipmentId(equipmentId);
 | 
			
		||||
                cloudDhcpInform.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
                if (informEvent.hasDhcpCommonData()) {
 | 
			
		||||
                    cloudDhcpInform = (com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent) getDhcpCommonDataForEvent(
 | 
			
		||||
                            cloudDhcpInform, informEvent.getDhcpCommonData());
 | 
			
		||||
 | 
			
		||||
                } else {
 | 
			
		||||
                    cloudDhcpInform.setxId(dhcpTransaction.getXId());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                dhcpEventsList.add(cloudDhcpInform);
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            for (DhcpDeclineEvent declineEvent : dhcpTransaction.getDhcpDeclineEventList()) {
 | 
			
		||||
                LOG.debug("DhcpDeclineEvent {}", declineEvent);
 | 
			
		||||
 | 
			
		||||
                com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent cloudDhcpDecline = new com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent();
 | 
			
		||||
 | 
			
		||||
                cloudDhcpDecline.setCustomerId(customerId);
 | 
			
		||||
                cloudDhcpDecline.setEquipmentId(equipmentId);
 | 
			
		||||
                cloudDhcpDecline.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
                if (declineEvent.hasDhcpCommonData()) {
 | 
			
		||||
                    cloudDhcpDecline = (com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent) getDhcpCommonDataForEvent(
 | 
			
		||||
                            cloudDhcpDecline, declineEvent.getDhcpCommonData());
 | 
			
		||||
 | 
			
		||||
                } else {
 | 
			
		||||
                    cloudDhcpDecline.setxId(dhcpTransaction.getXId());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                LOG.debug("Cloud DhcpDeclineEvent {}", cloudDhcpDecline);
 | 
			
		||||
 | 
			
		||||
                dhcpEventsList.add(cloudDhcpDecline);
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            for (DhcpRequestEvent requestEvent : dhcpTransaction.getDhcpRequestEventList()) {
 | 
			
		||||
                LOG.debug("DhcpRequestEvent {}", requestEvent);
 | 
			
		||||
 | 
			
		||||
                com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent cloudDhcpRequest = new com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent();
 | 
			
		||||
 | 
			
		||||
                cloudDhcpRequest.setCustomerId(customerId);
 | 
			
		||||
                cloudDhcpRequest.setEquipmentId(equipmentId);
 | 
			
		||||
                cloudDhcpRequest.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
                if (requestEvent.hasDhcpCommonData()) {
 | 
			
		||||
                    cloudDhcpRequest = (com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent) getDhcpCommonDataForEvent(
 | 
			
		||||
                            cloudDhcpRequest, requestEvent.getDhcpCommonData());
 | 
			
		||||
 | 
			
		||||
                } else {
 | 
			
		||||
                    cloudDhcpRequest.setxId(dhcpTransaction.getXId());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (requestEvent.hasHostname()) {
 | 
			
		||||
                    cloudDhcpRequest.setHostName(requestEvent.getHostname());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                LOG.debug("Cloud DhcpRequestEvent {}", cloudDhcpRequest);
 | 
			
		||||
 | 
			
		||||
                dhcpEventsList.add(cloudDhcpRequest);
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            for (DhcpDiscoverEvent discoverEvent : dhcpTransaction.getDhcpDiscoverEventList()) {
 | 
			
		||||
                LOG.debug("DhcpDiscoverEvent {}", discoverEvent);
 | 
			
		||||
 | 
			
		||||
                com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent cloudDhcpDiscover = new com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent();
 | 
			
		||||
 | 
			
		||||
                cloudDhcpDiscover.setCustomerId(customerId);
 | 
			
		||||
                cloudDhcpDiscover.setEquipmentId(equipmentId);
 | 
			
		||||
                cloudDhcpDiscover.setLocationId(locationId);
 | 
			
		||||
 | 
			
		||||
                if (discoverEvent.hasDhcpCommonData()) {
 | 
			
		||||
                    cloudDhcpDiscover = (com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent) getDhcpCommonDataForEvent(
 | 
			
		||||
                            cloudDhcpDiscover, discoverEvent.getDhcpCommonData());
 | 
			
		||||
 | 
			
		||||
                } else {
 | 
			
		||||
                    cloudDhcpDiscover.setxId(dhcpTransaction.getXId());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if (discoverEvent.hasHostname()) {
 | 
			
		||||
                    cloudDhcpDiscover.setHostName(discoverEvent.getHostname());
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                LOG.debug("Cloud DhcpDiscoverEvent {}", cloudDhcpDiscover);
 | 
			
		||||
 | 
			
		||||
                dhcpEventsList.add(cloudDhcpDiscover);
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (dhcpEventsList.size() > 0) {
 | 
			
		||||
            LOG.info("Publishing DhcpEvents {}", dhcpEventsList);
 | 
			
		||||
            cloudEventDispatcherInterface.publishEventsBulk(dhcpEventsList);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    BaseDhcpEvent getDhcpCommonDataForEvent(BaseDhcpEvent cloudDhcpEvent, DhcpCommonData dhcpCommonData) {
 | 
			
		||||
        if (dhcpCommonData.hasXId()) {
 | 
			
		||||
            cloudDhcpEvent.setxId(dhcpCommonData.getXId());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (dhcpCommonData.hasVlanId()) {
 | 
			
		||||
            cloudDhcpEvent.setVlanId(dhcpCommonData.getVlanId());
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (dhcpCommonData.hasDeviceMacAddress()) {
 | 
			
		||||
 | 
			
		||||
            try {
 | 
			
		||||
                cloudDhcpEvent.setClientMacAddress(MacAddress.valueOf(dhcpCommonData.getDeviceMacAddress()));
 | 
			
		||||
            } catch (Exception e) {
 | 
			
		||||
                LOG.error("Could not parse device_mac_address from DhcpCommonData ", dhcpCommonData, e);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (dhcpCommonData.hasDhcpServerIp()) {
 | 
			
		||||
            try {
 | 
			
		||||
                cloudDhcpEvent
 | 
			
		||||
                        .setDhcpServerIp(InetAddress.getByAddress(dhcpCommonData.getDhcpServerIp().toByteArray()));
 | 
			
		||||
            } catch (UnknownHostException e) {
 | 
			
		||||
                LOG.error("Invalid Dhcp Server IP", e);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (dhcpCommonData.hasClientIp()) {
 | 
			
		||||
            try {
 | 
			
		||||
                cloudDhcpEvent.setClientIp(InetAddress.getByAddress(dhcpCommonData.getClientIp().toByteArray()));
 | 
			
		||||
            } catch (UnknownHostException e) {
 | 
			
		||||
                LOG.error("Invalid Client IP", e);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (dhcpCommonData.hasRelayIp()) {
 | 
			
		||||
            try {
 | 
			
		||||
                cloudDhcpEvent.setRelayIp(InetAddress.getByAddress(dhcpCommonData.getRelayIp().toByteArray()));
 | 
			
		||||
            } catch (UnknownHostException e) {
 | 
			
		||||
                LOG.error("Invalid Relay IP", e);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        cloudDhcpEvent.setEventTimestamp(dhcpCommonData.getTimestampMs());
 | 
			
		||||
 | 
			
		||||
        return cloudDhcpEvent;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Async
 | 
			
		||||
    void publishSipCallEvents(int customerId, long equipmentId, long locationId, List<VideoVoiceReport> sipCallReportList) {
 | 
			
		||||
        // only in case it is not there, we will just use the time when we
 | 
			
		||||
        // received the report/event
 | 
			
		||||
 
 | 
			
		||||
@@ -159,130 +159,6 @@ public class RealtimeEventPublisherTest {
 | 
			
		||||
        // TODO: implement
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void testPublishDhcpTransactionEvents() throws Exception {
 | 
			
		||||
        
 | 
			
		||||
        long timestamp = System.currentTimeMillis();
 | 
			
		||||
        List<DhcpTransaction> dhcpTransactionList = new ArrayList<>();
 | 
			
		||||
        DhcpAckEvent ackEvent = DhcpAckEvent.newBuilder()
 | 
			
		||||
                .setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
 | 
			
		||||
                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                        .setDeviceMacAddress("c0:9a:d0:76:a9:69")
 | 
			
		||||
                        .setXId(123456789)
 | 
			
		||||
                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build())
 | 
			
		||||
                .setGatewayIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setPrimaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.204").getAddress()))
 | 
			
		||||
                .setSecondaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.198").getAddress()))
 | 
			
		||||
                .setSubnetMask(ByteString.copyFrom(InetAddress.getByName("255.255.255.0").getAddress()))
 | 
			
		||||
                .setLeaseTime(172800).setTimeOffset(10).build();
 | 
			
		||||
        
 | 
			
		||||
        DhcpAckEvent ackEvent2 = DhcpAckEvent.newBuilder()
 | 
			
		||||
                .setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
 | 
			
		||||
                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                        .setDeviceMacAddress("f6:f0:65:99:e2:33")
 | 
			
		||||
                        .setXId(123456789)
 | 
			
		||||
                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build())
 | 
			
		||||
                .setGatewayIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setPrimaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.204").getAddress()))
 | 
			
		||||
                .setSecondaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.198").getAddress()))
 | 
			
		||||
                .setSubnetMask(ByteString.copyFrom(InetAddress.getByName("255.255.255.0").getAddress()))
 | 
			
		||||
                .setLeaseTime(172800).setTimeOffset(10).build();
 | 
			
		||||
        
 | 
			
		||||
        List<DhcpAckEvent> ackEventList = List.of(ackEvent, ackEvent2);
 | 
			
		||||
        
 | 
			
		||||
        DhcpNakEvent nakEvent1 = DhcpNakEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.129").getAddress()))
 | 
			
		||||
                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                        .setDeviceMacAddress("24:f5:a2:ef:2e:53")
 | 
			
		||||
                        .setXId(123456789)
 | 
			
		||||
                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
 | 
			
		||||
        
 | 
			
		||||
        List<DhcpNakEvent> nakEventList = List.of(nakEvent1);
 | 
			
		||||
        
 | 
			
		||||
        DhcpOfferEvent offerEvent1 = DhcpOfferEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
 | 
			
		||||
                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
 | 
			
		||||
                .setXId(123456789)
 | 
			
		||||
                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
 | 
			
		||||
        
 | 
			
		||||
        DhcpOfferEvent offerEvent2 = DhcpOfferEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
 | 
			
		||||
                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setDeviceMacAddress("f6:f0:65:99:e2:33")
 | 
			
		||||
                .setXId(123456789)
 | 
			
		||||
                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
 | 
			
		||||
 | 
			
		||||
        List<DhcpOfferEvent> offerEventList = List.of(offerEvent1,offerEvent2);
 | 
			
		||||
        
 | 
			
		||||
        DhcpDiscoverEvent discoverEvent1 = DhcpDiscoverEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
 | 
			
		||||
                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
 | 
			
		||||
                .setXId(123456789)
 | 
			
		||||
                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPhone").build();
 | 
			
		||||
        
 | 
			
		||||
        DhcpDiscoverEvent discoverEvent2 = DhcpDiscoverEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
 | 
			
		||||
                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setDeviceMacAddress("f6:f0:65:99:e2:33")
 | 
			
		||||
                .setXId(123456789)
 | 
			
		||||
                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPad").build();
 | 
			
		||||
 | 
			
		||||
        List<DhcpDiscoverEvent> discoverEventList = List.of(discoverEvent1,discoverEvent2);
 | 
			
		||||
        
 | 
			
		||||
        DhcpRequestEvent requestEvent1 = DhcpRequestEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
 | 
			
		||||
                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
 | 
			
		||||
                .setXId(123456789)
 | 
			
		||||
                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPhone").build();
 | 
			
		||||
        
 | 
			
		||||
        DhcpRequestEvent requestEvent2 = DhcpRequestEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
 | 
			
		||||
                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setDeviceMacAddress("f6:f0:65:99:e2:33")
 | 
			
		||||
                .setXId(123456789)
 | 
			
		||||
                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPad").build();
 | 
			
		||||
 | 
			
		||||
        List<DhcpRequestEvent> requestEventList = List.of(requestEvent1,requestEvent2);
 | 
			
		||||
        
 | 
			
		||||
        DhcpInformEvent informEvent = DhcpInformEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
 | 
			
		||||
                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
 | 
			
		||||
                .setXId(123456789)
 | 
			
		||||
                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).build();
 | 
			
		||||
        
 | 
			
		||||
        List<DhcpInformEvent> informEventList = List.of(informEvent);
 | 
			
		||||
 | 
			
		||||
        
 | 
			
		||||
        DhcpDeclineEvent declineEvent = DhcpDeclineEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
 | 
			
		||||
                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.129").getAddress()))
 | 
			
		||||
                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
 | 
			
		||||
                .setDeviceMacAddress("24:f5:a2:ef:2e:53")
 | 
			
		||||
                .setXId(123456789)
 | 
			
		||||
                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).build();
 | 
			
		||||
 | 
			
		||||
        List<DhcpDeclineEvent> declineEventList = List.of(declineEvent);
 | 
			
		||||
        
 | 
			
		||||
        
 | 
			
		||||
        DhcpTransaction dhcpTransaction = DhcpTransaction.newBuilder(DhcpTransaction.getDefaultInstance())
 | 
			
		||||
                .addAllDhcpAckEvent(ackEventList).addAllDhcpNakEvent(nakEventList).addAllDhcpOfferEvent(offerEventList)
 | 
			
		||||
                .addAllDhcpInformEvent(informEventList).addAllDhcpDeclineEvent(declineEventList)
 | 
			
		||||
                .addAllDhcpDiscoverEvent(discoverEventList).addAllDhcpRequestEvent(requestEventList).setXId(123456789)
 | 
			
		||||
                .build();
 | 
			
		||||
 | 
			
		||||
        dhcpTransactionList.add(dhcpTransaction);
 | 
			
		||||
        
 | 
			
		||||
        realtimeEventPublisher.publishDhcpTransactionEvents(2, 1L, 0L, dhcpTransactionList);
 | 
			
		||||
 | 
			
		||||
        Mockito.verify(cloudEventDispatcherInterface,Mockito.times(1)).publishEventsBulk(Mockito.anyList());
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    public void testPublishSipCallEvents() throws Exception {
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user