[WIFI-3166] Session ID is a -ve number in opensyncgw logs and on UI logs

Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>

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

@@ -5,23 +5,14 @@ import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalField;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
-import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -46,11 +37,11 @@ import com.telecominfraproject.wlan.client.session.models.AssociationState;
 import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
 import com.telecominfraproject.wlan.client.session.models.ClientSession;
 import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
+import com.telecominfraproject.wlan.client.session.models.ClientSessionMetricDetails;
 import com.telecominfraproject.wlan.core.model.entity.CountryCode;
 import com.telecominfraproject.wlan.core.model.equipment.EquipmentType;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
-import com.telecominfraproject.wlan.core.model.equipment.WiFiSessionUtility;
 import com.telecominfraproject.wlan.core.model.pagination.PaginationContext;
 import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse;
 import com.telecominfraproject.wlan.customer.models.Customer;
@@ -128,14 +119,10 @@ import com.telecominfraproject.wlan.systemevent.equipment.realtime.ApcElectionEv
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.ApcElectionEvent.ApcMode;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
 
-import sts.OpensyncStats.Report;
-
 @org.springframework.context.annotation.Profile("opensync_cloud_config")
 @Component
 public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegrationInterface {
 
-    protected static final String standard_linux_date_format = "EEE MMM dd HH:mm:ss zzz yyyy";
-
     private static final Logger LOG = LoggerFactory.getLogger(OpensyncExternalIntegrationCloud.class);
 
     @Autowired
@@ -157,7 +144,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
     @Autowired
     private FirmwareServiceInterface firmwareServiceInterface;
     @Autowired
-    private StatsPublisherInterface statsPublisherInterface;
+    private StatsPublisherInterface mqttMessageProcessor;
     @Autowired
     private AlarmServiceInterface alarmServiceInterface;
 
@@ -223,14 +210,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 }
 
                 long locationId = autoProvisionedLocationId;
-                if ((customer.getDetails() != null) && (customer.getDetails().getAutoProvisioning() != null)
+                locationId = customer.getDetails().getAutoProvisioning().getLocationId();
-                        && customer.getDetails().getAutoProvisioning().isEnabled()) {
+
-                    locationId = customer.getDetails().getAutoProvisioning().getLocationId();
-                }
                 try {
-                    Location location = locationServiceInterface.getOrNull(locationId);
+                    Location location = locationServiceInterface.get(locationId);
-                    if (location != null)
+                    ce.setLocationId(location.getId());
-                        ce.setLocationId(location.getId());
                 } catch (Exception e) {
                     LOG.error("Cannot auto-provision equipment because customer location with id {} cannot be found", locationId);
                     throw new IllegalStateException("Cannot auto-provision equipment because customer location cannot be found : " + locationId);
@@ -397,7 +381,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 }
 
             }
-
+            
             EquipmentRoutingRecord equipmentRoutingRecord = gatewayController.registerCustomerEquipment(ce.getName(), ce.getCustomerId(), ce.getId());
 
             // Status and client cleanup, when AP reconnects or has been
@@ -419,30 +403,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             LOG.info("AP {} got connected to the gateway", apId);
             LOG.info("ConnectNodeInfo {}", connectNodeInfo);
 
-            if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY) && connectNodeInfo.versionMatrix.containsKey("DATE")) {
+            if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY)) {
-                // The AP uses standard linux date format. So the format would be:
+                reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY), connectNodeInfo.model);
-                // root@OpenAp-0498b5:~# date
-                // Tue Aug 3 14:55:28 UTC 2021
-                DateFormat dateFormat = new SimpleDateFormat(standard_linux_date_format, Locale.ENGLISH);
-                String dateString = connectNodeInfo.versionMatrix.get("DATE").strip();
-                try {
-                    Date date = dateFormat.parse(dateString);
-                    reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY),
-                            connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_INACTIVE_KEY), date.getTime(), connectNodeInfo.model,
-                            connectNodeInfo.firmwareVersion);
-                } catch (java.text.ParseException p) {
-                    LOG.info("Could not parse release date {} from AP fw, set date to EPOCH start value.", dateString, Instant.EPOCH);
-                    reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY),
-                            connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_INACTIVE_KEY), Instant.EPOCH.getLong(ChronoField.INSTANT_SECONDS), connectNodeInfo.model,
-                            connectNodeInfo.firmwareVersion);
-                }
             } else {
                 LOG.info("Cloud based firmware upgrade is not supported for this AP");
             }
 
         } catch (Exception e) {
             LOG.error("Could not process connection from AP {}", apId, e);
-            throw new RuntimeException(e);
+            throw e;
         }
 
     }
@@ -574,9 +543,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             protocolStatusData.setBaseMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
             protocolStatusData.setCloudCfgDataVersion(42L);
             protocolStatusData.setReportedCfgDataVersion(42L);
-            CountryCode countryCode = Location.getCountryCode(locationServiceInterface.getOrNull(ce.getLocationId()));
+            CountryCode countryCode = Location.getCountryCode(locationServiceInterface.get(ce.getLocationId()));
-            if (countryCode != null)
+            protocolStatusData.setCountryCode(countryCode.getName());
-                protocolStatusData.setCountryCode(countryCode.getName());
             if (connectNodeInfo.country != null) {
                 protocolStatusData.setReportedCC(CountryCode.getByName(connectNodeInfo.country));
             }
@@ -753,97 +721,102 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
     }
 
-    void reconcileFwVersionToTrack(Equipment ce, String activeFirmwareImageAp, String inactiveFirmwareImageAp, Long activeFwReleaseDate, String model,
+    private void reconcileFwVersionToTrack(Equipment ce, String reportedFwVersionFromAp, String model) {
-            String firmwareVersion) {
+
+        LOG.debug("reconcileFwVersionToTrack for AP {} with active firmware version {} model {}", ce.getInventoryId(), reportedFwVersionFromAp, model);
+        Status statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(), StatusDataType.FIRMWARE);
 
-        LOG.debug("reconcileFwVersionToTrack for AP {} with active firmware version {} model {}", ce.getInventoryId(), activeFirmwareImageAp, model);
-        Status statusRecord = statusServiceInterface.getOrNull(autoProvisionedCustomerId, autoProvisionedCustomerId, StatusDataType.FIRMWARE);
-        if (statusRecord == null) {
-            statusRecord = new Status();
-            statusRecord.setCreatedTimestamp(System.currentTimeMillis());
-            statusRecord.setCustomerId(ce.getCustomerId());
-            statusRecord.setEquipmentId(ce.getId());
-            statusRecord.setStatusDataType(StatusDataType.FIRMWARE);
-            statusRecord.setDetails(new EquipmentUpgradeStatusData());
-            ((EquipmentUpgradeStatusData) statusRecord.getDetails()).setActiveSwVersion(activeFirmwareImageAp);
-            if (inactiveFirmwareImageAp != null) {
-                ((EquipmentUpgradeStatusData) statusRecord.getDetails()).setActiveSwVersion(inactiveFirmwareImageAp);
-            }
-        }
         EquipmentUpgradeStatusData fwUpgradeStatusData = (EquipmentUpgradeStatusData) statusRecord.getDetails();
-        fwUpgradeStatusData.setActiveSwVersion(firmwareVersion);
-        fwUpgradeStatusData.setAlternateSwVersion(inactiveFirmwareImageAp);
 
         // default track settings for firmware
         CustomerFirmwareTrackSettings trackSettings = firmwareServiceInterface.getDefaultCustomerTrackSetting();
 
         // check for updated/modified track settings for this customer
         CustomerFirmwareTrackRecord custFwTrackRecord = firmwareServiceInterface.getCustomerFirmwareTrackRecord(ce.getCustomerId());
-        if (custFwTrackRecord != null)
-            trackSettings = custFwTrackRecord.getSettings();
 
+        long trackRecordId = -1;
+        if (custFwTrackRecord != null) {
+            trackSettings = custFwTrackRecord.getSettings();
+            trackRecordId = custFwTrackRecord.getTrackRecordId();
+        }
         // determine if AP requires FW upgrade before cloud
         // connection/provision
         if (trackSettings.getAutoUpgradeDeprecatedOnBind().equals(TrackFlag.ALWAYS) || trackSettings.getAutoUpgradeUnknownOnBind().equals(TrackFlag.ALWAYS)) {
+
             LOG.debug("reconcileFwVersionToTrack for AP {} track flag for auto-upgrade {}", ce.getInventoryId(),
                     trackSettings.getAutoUpgradeDeprecatedOnBind());
+
             // check the reported fw version for the AP, if it is < than
             // the default version for the cloud, then download and
             // flash the firmware before proceeding.
             // then return;
             FirmwareTrackRecord fwTrackRecord = null;
-            if (custFwTrackRecord == null) {
+            if (trackRecordId == -1) {
                 // take the default
                 fwTrackRecord = firmwareServiceInterface.getFirmwareTrackByName(FirmwareTrackRecord.DEFAULT_TRACK_NAME);
+
             } else {
                 // there must be a customer one
-                fwTrackRecord = firmwareServiceInterface.getFirmwareTrackById(custFwTrackRecord.getTrackRecordId());
+                fwTrackRecord = firmwareServiceInterface.getFirmwareTrackById(trackRecordId);
             }
+
             if (fwTrackRecord != null) {
+
                 LOG.debug("reconcileFwVersionToTrack for AP {} firmwareTrackRecord {}", ce.getInventoryId(), fwTrackRecord);
-                Optional<FirmwareTrackAssignmentDetails> assignmentDetails = firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName())
+
-                        .stream().filter(new Predicate<FirmwareTrackAssignmentDetails>() {
+                List<FirmwareTrackAssignmentDetails> fwTrackAssignmentDetails =
-                            @Override
+                        firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName());
-                            public boolean test(FirmwareTrackAssignmentDetails t) {
+
-                                // AP may report type as UPPER case
+                String targetFwVersionNameForTrack = null;
-                                return model.equalsIgnoreCase(t.getModelId());
+
-                            }
+                if (fwTrackAssignmentDetails != null) {
-                        }).findFirst();
+                    for (FirmwareTrackAssignmentDetails details : fwTrackAssignmentDetails) {
-                if (assignmentDetails.isPresent()) {
+                        if (model.equalsIgnoreCase(details.getModelId())) {
-                    FirmwareTrackAssignmentDetails targetFirmwareForTrack = assignmentDetails.get();
+                            targetFwVersionNameForTrack = details.getVersionName();
-                    if (activeFwReleaseDate == null) {
+                            break;
-                        LOG.info("Active FW release date is unknown, firmware upgrade required.");
+                        }
-                        fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
+                    }
-                        fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
+                }
-                        statusRecord.setDetails(fwUpgradeStatusData);
+
-                        statusRecord = statusServiceInterface.update(statusRecord);
+                if (targetFwVersionNameForTrack == null) {
-                        triggerFwDownload(ce, fwUpgradeStatusData, trackSettings);
+                    LOG.info("No target FW version for this track {}", fwTrackRecord);
-                    } else {
+
-                        Date activeReleaseDate = new Date(activeFwReleaseDate);
+                } else {
-                        Date targetReleaseDate = new Date(targetFirmwareForTrack.getReleaseDate());
+                    LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion for track {}", ce.getInventoryId(), targetFwVersionNameForTrack);
-                        if (activeReleaseDate.after(targetReleaseDate) || activeReleaseDate.equals(targetReleaseDate)) {
+
-                            LOG.info("Active FW release date {} is more recent than or equal to the target firmware release date {}, no upgrade required.",
+                    if (reportedFwVersionFromAp != null) {
-                                    activeReleaseDate, targetReleaseDate);
+                        if (!targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
-                            fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.up_to_date);
+                            LOG.debug(
-                            fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
+                                    "reconcileFwVersionToTrack for AP {} targetFwVersion {} doesn't match reported fw version {}, triggering download and flash",
-                            statusRecord.setDetails(fwUpgradeStatusData);
+                                    ce.getInventoryId(), targetFwVersionNameForTrack, reportedFwVersionFromAp);
-                            statusRecord = statusServiceInterface.update(statusRecord);
+
-                        } else {
+                            fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
-                            LOG.info("Active FW release date {} is earlier than target firmware release date {}, firmware upgrade required.", activeReleaseDate,
-                                    targetReleaseDate);
-                            fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
                             fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
                             statusRecord.setDetails(fwUpgradeStatusData);
                             statusRecord = statusServiceInterface.update(statusRecord);
                             triggerFwDownload(ce, fwUpgradeStatusData, trackSettings);
+                        } else if (targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
+                            LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion {} is active", ce.getInventoryId(), targetFwVersionNameForTrack);
+
+                            fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.up_to_date);
+                            fwUpgradeStatusData.setActiveSwVersion(targetFwVersionNameForTrack);
+                            fwUpgradeStatusData.setAlternateSwVersion(targetFwVersionNameForTrack);
+                            fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
+
+                            statusRecord.setDetails(fwUpgradeStatusData);
+                            statusRecord = statusServiceInterface.update(statusRecord);
+
                         }
                     }
-                } else {
+
-                    LOG.info("No firmware assignment present in track for AP model {}. Auto-upgrade of firmware is not possible for this node.", model);
                 }
+
             }
-        } else {
+
-            LOG.info("Automatic firmware upgrade is not configured for track {}", trackSettings);
+        } else
+
+        {
+            LOG.debug("Automatic firmware upgrade is not configured for track {}", trackSettings);
         }
     }
 
@@ -1463,6 +1436,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             LOG.debug("wifiInetStateDbTableUpdate Cannot get customer Equipment for {}", apId);
             return;
         }
+
         int customerId = ce.getCustomerId();
         if ((customerId < 0) || (equipmentId < 0)) {
             LOG.debug("wifiInetStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
@@ -1583,12 +1557,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             LOG.debug("wifiAssociatedClientsDbTableUpdate::Cannot get Session for AP {}", apId);
             return;
         }
+
         long equipmentId = ovsdbSession.getEquipmentId();
         Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
+
         if (ce == null) {
             LOG.debug("wifiAssociatedClientsDbTableUpdate Cannot get customer Equipment for {}", apId);
             return;
         }
+
         int customerId = ce.getCustomerId();
         if ((customerId < 0) || (equipmentId < 0)) {
             LOG.debug("wifiAssociatedClientsDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
@@ -1611,13 +1588,17 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             MacAddress macAddress = MacAddress.valueOf(mMac);
 
             Client clientInstance = clientServiceInterface.getOrNull(customerId, macAddress);
+            boolean isReassociation = true;
             if (clientInstance == null) {
+
+                isReassociation = false; // new client
+
                 clientInstance = new Client();
                 clientInstance.setCustomerId(customerId);
                 clientInstance.setMacAddress(MacAddress.valueOf(mMac));
-                clientInstance.setCreatedTimestamp(System.currentTimeMillis());
                 clientInstance.setDetails(new ClientInfoDetails());
                 clientInstance = clientServiceInterface.create(clientInstance);
+
                 LOG.info("Created client from Wifi_Associated_Clients ovsdb table change {}", clientInstance);
             }
 
@@ -1629,20 +1610,30 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 clientSession.setMacAddress(clientInstance.getMacAddress());
                 clientSession.setLocationId(ce.getLocationId());
                 clientSession.setDetails(new ClientSessionDetails());
-                long derivedSessionId = WiFiSessionUtility.encodeWiFiAssociationId(timestamp / 1000, clientInstance.getMacAddress().getAddressAsLong());
+                clientSession.getDetails().setSessionId(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong()));
-                clientSession.getDetails().setSessionId(Long.toUnsignedString(derivedSessionId));
+                clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong())));
-                clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(derivedSessionId)));
+                clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
                 clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
-                clientSession.getDetails().setIsReassociation(false);
                 clientSession.getDetails().setAssocTimestamp(timestamp);
-                clientSessions.add(clientSession);
             } else {
+                if (clientSession.getDetails().getPriorEquipmentId() == null) {
+                    clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
+                }
+                if (clientSession.getDetails().getPriorSessionId() == null) {
+                    clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
+                }
+                if (clientSession.getDetails().getLastEventTimestamp() == null || clientSession.getDetails().getLastEventTimestamp() < timestamp) {
+                    clientSession.getDetails().setLastEventTimestamp(timestamp);
+                }
                 if (!clientSession.getDetails().getAssociationState().equals(AssociationState._802_11_Associated)) {
                     clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
                     clientSession.getDetails().setAssocTimestamp(timestamp);
-                    clientSessions.add(clientSession);
                 }
             }
+            clientSession.getDetails().setIsReassociation(isReassociation);
+
+            clientSessions.add(clientSession);
+
         }
 
         if (clientSessions.size() > 0) {
@@ -1891,12 +1882,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             LOG.debug("wifiVIFStateDbTableDelete::Cannot get Session for AP {}", apId);
             return;
         }
+
         long equipmentId = ovsdbSession.getEquipmentId();
         Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
-        if (ce == null) {
-            LOG.debug("wifiVIFStateDbTableDelete Cannot get customer Equipment for {}", apId);
-            return;
-        }
         int customerId = ce.getCustomerId();
         if ((customerId < 0) || (equipmentId < 0)) {
             LOG.debug("wifiVIFStateDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
@@ -1954,13 +1942,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         }
         long equipmentId = ovsdbSession.getEquipmentId();
         Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
-        if (ce == null) {
-            LOG.debug("wifiAssociatedClientsDbTableDelete Cannot get customer Equipment for {}", apId);
-            return;
-        }
         int customerId = ce.getCustomerId();
         if ((customerId < 0) || (equipmentId < 0)) {
-            LOG.debug("wifiAssociatedClientsDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            LOG.debug("wifiVIFStateDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
             return;
         }
         Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(deletedClientMac));
@@ -1998,11 +1982,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
         long equipmentId = ovsdbSession.getEquipmentId();
         Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
+        int customerId = ce.getCustomerId();
         if (ce == null) {
             LOG.debug("updateDhcpIpClientFingerprints::Cannot get Equipment for AP {}", apId);
             return;
         }
-        int customerId = ce.getCustomerId();
         if ((customerId < 0) || (equipmentId < 0)) {
             LOG.debug("updateDhcpIpClientFingerprints::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
             return;
@@ -2095,6 +2079,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                     if (clientServiceInterface.getOrNull(customerId, clientMacAddress) != null) {
                         LOG.info("Deleting invalid client {}", clientServiceInterface.delete(customerId, clientMacAddress));
                     }
+                } else {
+                    LOG.info("Client {} already exists on the cloud, delete the session for the client if it exists", dhcpLeasedIps);
+                    // In this case, we might have a session, as the client
+                    // already exists on the cloud, update if required
+                    ClientSession session = clientServiceInterface.getSessionOrNull(customerId, equipmentId, clientMacAddress);
+                    if (session != null) {
+                        LOG.info("Delete clientSession that was removed from the Dhcp_Leased_IP table {}",
+                                clientServiceInterface.deleteSession(customerId, equipmentId, clientMacAddress));
+                    }
                 }
             }
         }
@@ -2109,8 +2102,21 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         if (session == null) {
             LOG.info("No session for client {} with for customer {} equipment {}", clientMacAddress, customerId, equipmentId);
             return null;
+        } else {
+            if (session.getDetails().getPriorEquipmentId() == null) {
+                session.getDetails().setPriorEquipmentId(session.getEquipmentId());
+            }
+            if (session.getDetails().getPriorSessionId() == null) {
+                session.getDetails().setPriorSessionId(session.getDetails().getSessionId());
+            }
+            if (session.getDetails().getLastEventTimestamp() == null || session.getDetails().getLastEventTimestamp() < timestamp) {
+                session.getDetails().setLastEventTimestamp(timestamp);
+            }
+            if (!session.getDetails().getAssociationState().equals(AssociationState._802_11_Associated)) {
+                session.getDetails().setAssociationState(AssociationState._802_11_Associated);
+                session.getDetails().setAssocTimestamp(timestamp);
+            }
         }
-
         if (dhcpLeasedIps.containsKey("fingerprint")) {
             session.getDetails().setApFingerprint(dhcpLeasedIps.get("fingerprint"));
         }
@@ -2165,7 +2171,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         if (dhcpLeasedIps.containsKey("lease_time")) {
             Integer leaseTime = Integer.valueOf(dhcpLeasedIps.get("lease_time"));
             session.getDetails().getDhcpDetails().setLeaseTimeInSeconds(leaseTime);
-            session.getDetails().getDhcpDetails().setLeaseStartTimestamp(session.getDetails().getAssocTimestamp());
         }
 
         if (dhcpLeasedIps.containsKey("gateway")) {
@@ -2408,7 +2413,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         ApcElectionEvent electionEvent =
                 new ApcElectionEvent(drIpAddr, bdrIpAddr, localIpV4Addr, drIpAddr, mode, Boolean.valueOf(apcStateAttributes.get("enabled")),
                         RealTimeEventType.APC_Election_event, customerId, ce.getLocationId(), equipmentId, System.currentTimeMillis());
-        statsPublisherInterface.publishSystemEventFromTableStateMonitor(electionEvent);
+        mqttMessageProcessor.publishSystemEventFromTableStateMonitor(electionEvent);
     }
 
     @Override
@@ -2465,9 +2470,4 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         LOG.debug("finished nodeStateDbTableUpdate for {}", apId);
 
     }
-
-    @Override
-    public void processMqttMessage(String topic, Report report) {
-        statsPublisherInterface.processMqttMessage(topic, report);
-    }
 }

opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java

@@ -209,9 +209,9 @@ public class OpensyncCloudGatewayController {
                     case CellSizeAttributesRequest:
                         ret.add(sendCellSizeRequest(session, (CEGWCellSizeAttributesRequest) command));
                         break;
-//                    case MostRecentStatsTimestamp:
+                    case MostRecentStatsTimestamp:
-//                        ret.add(sendGetMostRecentStatsTimestampRequest(command, inventoryId));
+                        ret.add(sendGetMostRecentStatsTimestampRequest(command, inventoryId));
-//                        break;
+                        break;
                     default:
                         LOG.warn("[{}] Failed to deliver command {}, unsupported command type", inventoryId, command);
                         ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
@@ -250,7 +250,32 @@ public class OpensyncCloudGatewayController {
         return new GatewayDefaults();
     }
     
-
+    private EquipmentCommandResponse sendGetMostRecentStatsTimestampRequest(CEGWBaseCommand command, String inventoryId) {
+        Long ts = lastReceivedStatsTimestamp(inventoryId);
+        if (ts == null) {
+            return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE,
+                    null, command,
+                    registeredGateway == null ? null : registeredGateway.getHostname(),
+                            registeredGateway == null ? -1 : registeredGateway.getPort());
+        } else {
+            return new EquipmentCommandResponse(CEGWCommandResultCode.Success,
+                    ts.toString(), command,
+                    registeredGateway == null ? null : registeredGateway.getHostname(),
+                            registeredGateway == null ? -1 : registeredGateway.getPort());
+        }
+    }
+    
+    @RequestMapping(value = "/lastReceivedStatsTimestamp", method = RequestMethod.GET)
+    public Long lastReceivedStatsTimestamp(@RequestParam String apId) {
+        Long ret = null;
+        if (ovsdbSessionMapInterface.getSession(apId) != null) {
+            ret = ovsdbSessionMapInterface.getSession(apId).getMostRecentStatsTimestamp();
+            LOG.debug("lastReceivedStatsTimestamp for apId {} {}",apId,ret);
+        } else {
+            LOG.warn("lastReceivedStatsTimestamp found no session for {}, cannot get timestamp",apId);
+        }
+        return ret;
+    }
 
     /**
      * Verify a route to customer equipment

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/OpensyncExternalIntegrationCloudTest.java

@@ -176,7 +176,7 @@ public class OpensyncExternalIntegrationCloudTest {
         location.setDetails(details);
         location.setName("Location-UT");
         location.setLocationType(LocationType.BUILDING);
-        Mockito.when(locationServiceInterface.getOrNull(Mockito.anyLong())).thenReturn(location);
+        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
         Customer customer = new Customer();
         customer.setId(2);
         CustomerDetails customerDetails = new CustomerDetails();
@@ -232,7 +232,7 @@ public class OpensyncExternalIntegrationCloudTest {
         opensyncExternalIntegrationCloud.apConnected("Test_Client_21P10C68818122", createConnectNodeInfo());
 
         Mockito.verify(firmwareServiceInterface).getDefaultCustomerTrackSetting();
-        Mockito.verify(locationServiceInterface).getOrNull(ArgumentMatchers.anyLong());
+        Mockito.verify(locationServiceInterface).get(8L);
 
     }
 
@@ -246,7 +246,7 @@ public class OpensyncExternalIntegrationCloudTest {
         location.setDetails(details);
         location.setName("Location-UT");
         location.setLocationType(LocationType.BUILDING);
-        Mockito.when(locationServiceInterface.getOrNull(8L)).thenReturn(location);
+        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
 
         Customer customer = new Customer();
         customer.setId(2);
@@ -326,7 +326,7 @@ public class OpensyncExternalIntegrationCloudTest {
         Mockito.verify(customerServiceInterface).getOrNull(ArgumentMatchers.anyInt());
         Mockito.verify(equipmentServiceInterface).getByInventoryIdOrNull("Test_Client_21P10C68818122");
         Mockito.verify(firmwareServiceInterface).getDefaultCustomerTrackSetting();
-        Mockito.verify(locationServiceInterface, Mockito.times(2)).getOrNull(ArgumentMatchers.anyLong());
+        Mockito.verify(locationServiceInterface, Mockito.times(2)).get(ArgumentMatchers.anyLong());
 
     }
 

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/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java

@@ -54,6 +54,4 @@ public interface OpensyncExternalIntegrationInterface {
     void nodeStateDbTableUpdate(List<Map<String, String>> nodeStateAttributes, String apId);
 
     void clearEquipmentStatus(String apId);
-    
-    void processMqttMessage(String topic, Report report);
 }

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbSession.java

@@ -1,5 +1,7 @@
 package com.telecominfraproject.wlan.opensync.external.integration;
 
+import java.util.Objects;
+
 import com.vmware.ovsdb.service.OvsdbClient;
 
 public class OvsdbSession {
@@ -7,6 +9,7 @@ public class OvsdbSession {
     private String apId;
     private long routingId;
     private long equipmentId;
+    private long mostRecentStatsTimestamp;
     
     public OvsdbClient getOvsdbClient() {
         return ovsdbClient;
@@ -32,5 +35,34 @@ public class OvsdbSession {
     public void setEquipmentId(long equipmentId) {
         this.equipmentId = equipmentId;
     }
- 
+    public long getMostRecentStatsTimestamp() {
+        return mostRecentStatsTimestamp;
+    }
+    public void setMostRecentStatsTimestamp(long mostRecentStatsTimestamp) {
+        this.mostRecentStatsTimestamp = mostRecentStatsTimestamp;
+    }
+    @Override
+    public int hashCode() {
+        return Objects.hash(apId, equipmentId, mostRecentStatsTimestamp, ovsdbClient, routingId);
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        OvsdbSession other = (OvsdbSession) obj;
+        return Objects.equals(apId, other.apId) && equipmentId == other.equipmentId && mostRecentStatsTimestamp == other.mostRecentStatsTimestamp
+                && Objects.equals(ovsdbClient, other.ovsdbClient) && routingId == other.routingId;
+    }
+    
+    @Override
+    public String toString() {
+        return "OvsdbSession [ovsdbClient=" + ovsdbClient + ", apId=" + apId + ", routingId=" + routingId + ", equipmentId=" + equipmentId
+                + ", mostRecentStatsTimestamp=" + mostRecentStatsTimestamp + "]";
+    }
+
+    
 }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java

@@ -11,6 +11,10 @@ import org.fusesource.mqtt.client.MQTT;
 import org.fusesource.mqtt.client.Message;
 import org.fusesource.mqtt.client.QoS;
 import org.fusesource.mqtt.client.Topic;
+import org.fusesource.mqtt.client.Tracer;
+import org.fusesource.mqtt.codec.MQTTFrame;
+import org.fusesource.mqtt.codec.PINGREQ;
+import org.fusesource.mqtt.codec.PINGRESP;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +36,8 @@ import com.netflix.servo.monitor.Stopwatch;
 import com.netflix.servo.monitor.Timer;
 import com.netflix.servo.tag.TagList;
 import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
-import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface;
+import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession;
+import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
 import com.telecominfraproject.wlan.opensync.external.integration.utils.StatsPublisherInterface;
 import com.telecominfraproject.wlan.opensync.util.ZlibUtil;
 
@@ -58,7 +63,10 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
     private final Timer timerMessageProcess = new BasicTimer(MonitorConfig.builder("osgw-mqtt-messageProcessTimer").withTags(tags).build());
 
     @Autowired
-    private OpensyncExternalIntegrationInterface opensyncExternalIntegrationInterface;
+    private StatsPublisherInterface statsPublisher;
+    
+    @Autowired
+    private OvsdbSessionMapInterface ovsdbSessionMapInterface;
 
     // dtop: use anonymous constructor to ensure that the following code always
     // get executed,
@@ -185,8 +193,18 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
                                 // Only supported protobuf on the TIP opensync APs is Report
                                 Report statsReport = Report.parseFrom(payload);
                                 mqttMsg.ack();
+                                String apId = extractApIdFromTopic(mqttMsg.getTopic());
+                                if (apId != null) {
+                                    OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(extractApIdFromTopic(mqttMsg.getTopic()));
+                                    if (ovsdbSession != null) {
+                                        ovsdbSession.setMostRecentStatsTimestamp(System.currentTimeMillis());
+                                        LOG.debug("Last metrics received from AP updated to {}",ovsdbSession.toString());
+                                    } else {
+                                        LOG.debug("No ovsdb session exists for this AP {}",apId);
+                                    }
+                                }
                                 MQTT_LOG.info("Topic {}\n{}", mqttMsg.getTopic(), jsonPrinter.print(statsReport));
-                                opensyncExternalIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), statsReport);                           
+                                statsPublisher.processMqttMessage(mqttMsg.getTopic(), statsReport);                           
                                 LOG.debug("Dispatched report for topic {} to backend for processing", mqttMsg.getTopic());
 
                             } catch (Exception e) {
@@ -226,5 +244,26 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
             mqttClientThread.interrupt();
         }
     }
+    
+    /**
+     * @param topic
+     * @return apId extracted from the topic name, or null if it cannot be
+     *         extracted
+     */
+    static String extractApIdFromTopic(String topic) {
+        // Topic is formatted as
+        // "/ap/"+clientCn+"_"+ret.serialNumber+"/opensync"
+        if (topic == null) {
+            return null;
+        }
 
+        String[] parts = topic.split("/");
+        if (parts.length < 3) {
+            return null;
+        }
+
+        // apId is the third element in the topic
+        return parts[2];
+    }
+    
 }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/util/OvsdbStringConstants.java

@@ -13,7 +13,6 @@ public class OvsdbStringConstants {
     public static final String FW_IMAGE_NAME_KEY = "FW_IMAGE_NAME";
     public static final String FW_IMAGE_ACTIVE_KEY = "FW_IMAGE_ACTIVE";
     public static final String FW_IMAGE_INACTIVE_KEY = "FW_IMAGE_INACTIVE";
-    public static final String FW_IMAGE_DATE = "DATE";
 
     // AWLAN_Node values which can be placed in firmware_url column to trigger
     // behavior other than firmware download/flash