[WIFI-3344] remove artifact from removing ClientSessionMetricDetails()

opensync-ext-cloud/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-ext-cloud</artifactId>
@@ -14,126 +14,126 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
  	 
         <dependency>
             <artifactId>base-client</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
      
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>profile-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>portal-user-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>service-metric-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
       
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>status-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
  
        <dependency>
         <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>manufacturer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
  
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>     
 
 	</dependencies>

opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java

@@ -20,6 +20,7 @@ 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;
@@ -34,6 +35,8 @@ 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;
@@ -95,8 +98,13 @@ 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;
@@ -148,7 +156,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
@@ -311,6 +319,7 @@ 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()) {
@@ -319,25 +328,168 @@ 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.
+                // is published, asynchronously.
                 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();
@@ -359,7 +511,9 @@ 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());
@@ -528,6 +682,144 @@ 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()));
@@ -584,6 +876,52 @@ 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();
@@ -897,7 +1235,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());
@@ -905,7 +1243,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();
@@ -1112,6 +1450,13 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                     continue;
                 }
 
+                ClientSession session = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(cl.getMacAddress()));
+
+                if (session == null) {
+                    LOG.info("No session for Client {}, ignore.");
+                    continue;
+                }
+
                 if (cl.hasStats()) {
                     LOG.debug("Processing ClientReport from AP for client device {}", cl.getMacAddress());
                     ServiceMetric smr = new ServiceMetric(customerId, equipmentId, MacAddress.valueOf(cl.getMacAddress()));
@@ -1127,6 +1472,8 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                     // OvsdbDao.configureStats(OvsdbClient)
                     cMetrics.setPeriodLengthSec(periodLengthSec);
                     cMetrics.setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(clReport.getBand()));
+                    cMetrics.setSessionId(session.getDetails().getSessionId());
+                    LOG.debug("populateApClientMetrics Session Id {}", session.getDetails().getSessionId());
 
                     if (cl.getStats().hasRssi()) {
                         int rssi = cl.getStats().getRssi();

opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/RealtimeEventPublisher.java

@@ -8,10 +8,13 @@ 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;
@@ -26,6 +29,7 @@ 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;
@@ -40,6 +44,7 @@ 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;
@@ -48,8 +53,22 @@ 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;
@@ -72,7 +91,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 {}");
@@ -161,8 +180,96 @@ 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,
@@ -213,6 +320,7 @@ public class RealtimeEventPublisher {
 
     }
     
+   @Async
     void publishClientAuthSystemEvent(int customerId, long equipmentId, long locationId, ClientAuthEvent clientAuthEvent) {
         LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientAuthEvent, customerId, equipmentId);
 
@@ -237,6 +345,7 @@ public class RealtimeEventPublisher {
 
     }
    
+   @Async
     void publishClientAssocEvent(int customerId, long equipmentId, long locationId, ClientAssocEvent clientAssocEvent) {
         LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientAssocEvent, customerId, equipmentId);
 
@@ -286,7 +395,82 @@ 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);
@@ -312,7 +496,320 @@ 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

opensync-ext-cloud/src/test/java/com/telecominfraproject/wlan/opensync/external/integration/utils/RealtimeEventPublisherTest.java

@@ -159,6 +159,130 @@ 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 {
 

opensync-ext-interface/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-ext-interface</artifactId>
@@ -13,33 +13,33 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>tip-wlan-opensync-protobuf</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<artifactId>equipment-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>profile-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>location-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>routing-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		
 

opensync-ext-static/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
   <artifactId>opensync-ext-static</artifactId>
@@ -13,7 +13,7 @@
   	<dependency>
   		<groupId>com.telecominfraproject.wlan</groupId>
   		<artifactId>opensync-gateway</artifactId>
-  		<version>1.3.0-SNAPSHOT</version>
+  		<version>1.2.0-SNAPSHOT</version>
   	</dependency>
   </dependencies>
 </project>

opensync-gateway-build/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
   <artifactId>opensync-gateway-build</artifactId>

opensync-gateway-cloud-docker/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-cloud-docker</artifactId>
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway-cloud-process</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway-cloud-process/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-cloud-process</artifactId>
@@ -20,95 +20,95 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-cloud</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <artifactId>filestore-service</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
 		<dependency>
 			<artifactId>customer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>location-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>equipment-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>profile-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>portal-user-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>service-metric-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>system-event-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>alarm-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>client-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>routing-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>firmware-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>manufacturer-service-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-remote</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway-static-docker/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-static-docker</artifactId>
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-gateway-static-process</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway-static-process/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway-static-process</artifactId>
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-static</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

opensync-gateway/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>opensync-gateway</artifactId>
@@ -14,22 +14,22 @@
 		<dependency>
 			<artifactId>base-container</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>client-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>customer-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vmware.ovsdb</groupId>
@@ -47,13 +47,13 @@
 		<dependency>
 			<artifactId>service-metric-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>status-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util -->

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java

@@ -321,7 +321,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         ovsdbDao.removeAllInetConfigs(ovsdbClient);
         ovsdbDao.removeWifiRrm(ovsdbClient);
         ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
-        ovsdbDao.removeAllStatsConfigs(ovsdbClient);
 
         extIntegrationInterface.clearEquipmentStatus(apId);
 
@@ -337,15 +336,8 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
         ovsdbDao.configureInterfaces(ovsdbClient);
         ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
-        
-        ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
-        if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
-            ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
-        }
-        ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
-        ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
-        
         LOG.debug("Finished processConfigChanged for {}", apId);
+
     }
 
     @Override

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java

@@ -62,7 +62,7 @@ public class OvsdbDao extends OvsdbDaoBase {
 
     public void configureCommands(OvsdbClient ovsdbClient, String startdebugengineapcommand,
             Map<String, String> payload, long l, long defaultCommandDurationSec) {
-        ovsdbCommand.configureCommands(ovsdbClient, startdebugengineapcommand, payload, l, defaultCommandDurationSec);
+	    ovsdbCommand.configureCommands(ovsdbClient, startdebugengineapcommand, payload, l, defaultCommandDurationSec);
     }
 
     public void configureFirmwareDownload(OvsdbClient ovsdbClient, String apId, String firmwareUrl,

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNetworkConfig.java

@@ -212,8 +212,34 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             List<Operation> operations = new ArrayList<>();
             Map<String, Value> tableColumns = new HashMap<>();
             Map<String, WifiInetConfigInfo> inetConfigMap = ovsdbGet.getProvisionedWifiInetConfigs(ovsdbClient);
+            WifiInetConfigInfo parentLanInterface = inetConfigMap.get(defaultLanInterfaceName);
+            if (parentLanInterface == null) {
+                throw new RuntimeException(
+                        "Cannot get lan interface " + defaultLanInterfaceName + " for vlan " + vlanId);
+            }
+            tableColumns.put("if_type", new Atom<>("vlan"));
+            tableColumns.put("vlan_id", new Atom<>(vlanId));
+            tableColumns.put("if_name", new Atom<>(parentLanInterface.ifName + "_" + Integer.toString(vlanId)));
+            tableColumns.put("parent_ifname", new Atom<>(parentLanInterface.ifName));
+            tableColumns.put("enabled", new Atom<>(true));
+            tableColumns.put("network", new Atom<>(true));
+            tableColumns.put("ip_assign_scheme", new Atom<>(parentLanInterface.ipAssignScheme));
+            tableColumns.put("NAT", new Atom<>(parentLanInterface.nat));
+            tableColumns.put("mtu", new Atom<>(1500));
+            String[] inetAddress = parentLanInterface.inetAddr.split("\\.");
+            String vlanAddress = inetAddress[0] + "." + inetAddress[1] + "." + vlanId + "." + inetAddress[3];
+            tableColumns.put("inet_addr", new Atom<>(vlanAddress));
+            tableColumns.put("netmask", new Atom<>(parentLanInterface.netmask));
+            tableColumns.put("dhcpd", com.vmware.ovsdb.protocol.operation.notation.Map.of(parentLanInterface.dhcpd));
             Row row = new Row(tableColumns);
-
+            if (inetConfigMap.containsKey(parentLanInterface.ifName + "_" + Integer.toString(vlanId))) {
+                List<Condition> conditions = new ArrayList<>();
+                conditions.add(new Condition("vlan_id", Function.EQUALS, new Atom<>(vlanId)));
+                conditions.add(new Condition("parent_ifname", Function.EQUALS, new Atom<>(parentLanInterface.ifName)));
+                operations.add(new Update(wifiInetConfigDbTable, conditions, row));
+            } else {
+                operations.add(new Insert(wifiInetConfigDbTable, row));
+            }
             WifiInetConfigInfo parentWanInterface = inetConfigMap.get(defaultWanInterfaceName);
             if (parentWanInterface == null) {
                 throw new RuntimeException(
@@ -225,7 +251,8 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             tableColumns.put("if_name", new Atom<>(parentWanInterface.ifName + "_" + Integer.toString(vlanId)));
             tableColumns.put("parent_ifname", new Atom<>(parentWanInterface.ifName));
             tableColumns.put("enabled", new Atom<>(true));
-            tableColumns.put("ip_assign_scheme", new Atom<>("none"));
+            tableColumns.put("network", new Atom<>(true));
+            tableColumns.put("ip_assign_scheme", new Atom<>(parentWanInterface.ipAssignScheme));
             tableColumns.put("NAT", new Atom<>(parentWanInterface.nat));
             tableColumns.put("mtu", new Atom<>(1500));
             row = new Row(tableColumns);
@@ -251,7 +278,8 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
             }
             inetConfigMap = ovsdbGet.getProvisionedWifiInetConfigs(ovsdbClient);
             LOG.debug("Provisioned vlan on wan {} and lan {}",
-                    inetConfigMap.get(parentWanInterface.ifName + "_" + Integer.toString(vlanId)));
+                    inetConfigMap.get(parentWanInterface.ifName + "_" + Integer.toString(vlanId)),
+                    inetConfigMap.get(parentLanInterface.ifName + "_" + Integer.toString(vlanId)));
         } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
             LOG.error("Error in provisioning Vlan", e);
             throw new RuntimeException(e);

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbStatsConfig.java

@@ -351,8 +351,8 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
                     rowColumns.put("report_type", new Atom<>("raw"));
                     rowColumns.put("stats_type", new Atom<>("survey"));
                     rowColumns.put("survey_type", new Atom<>("off-chan"));
-                    rowColumns.put("sampling_interval", new Atom<>(10));
+                    rowColumns.put("sampling_interval", new Atom<>(0));
-                    rowColumns.put("survey_interval_ms", new Atom<>(120));
+                    rowColumns.put("survey_interval_ms", new Atom<>(10));
                     rowColumns.put("threshold", thresholds);
                     Row updateRow = new Row(rowColumns);
                     operations.add(new Insert(wifiStatsConfigDbTable, updateRow));