[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,13 +210,10 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 }
 
                 long locationId = autoProvisionedLocationId;
-                if ((customer.getDetails() != null) && (customer.getDetails().getAutoProvisioning() != null)
-                        && customer.getDetails().getAutoProvisioning().isEnabled()) {
                 locationId = customer.getDetails().getAutoProvisioning().getLocationId();
-                }
+
                 try {
-                    Location location = locationServiceInterface.getOrNull(locationId);
-                    if (location != null)
+                    Location location = locationServiceInterface.get(locationId);
                     ce.setLocationId(location.getId());
                 } catch (Exception e) {
                     LOG.error("Cannot auto-provision equipment because customer location with id {} cannot be found", locationId);
@@ -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")) {
-                // The AP uses standard linux date format. So the format would be:
-                // 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);
-                }
+            if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY)) {
+                reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY), connectNodeInfo.model);
             } 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,8 +543,7 @@ 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()));
-            if (countryCode != null)
+            CountryCode countryCode = Location.getCountryCode(locationServiceInterface.get(ce.getLocationId()));
             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,
-            String firmwareVersion) {
+    private void reconcileFwVersionToTrack(Equipment ce, String reportedFwVersionFromAp, String model) {
+
+        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>() {
-                            @Override
-                            public boolean test(FirmwareTrackAssignmentDetails t) {
-                                // AP may report type as UPPER case
-                                return model.equalsIgnoreCase(t.getModelId());
+
+                List<FirmwareTrackAssignmentDetails> fwTrackAssignmentDetails =
+                        firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName());
+
+                String targetFwVersionNameForTrack = null;
+
+                if (fwTrackAssignmentDetails != null) {
+                    for (FirmwareTrackAssignmentDetails details : fwTrackAssignmentDetails) {
+                        if (model.equalsIgnoreCase(details.getModelId())) {
+                            targetFwVersionNameForTrack = details.getVersionName();
+                            break;
                         }
-                        }).findFirst();
-                if (assignmentDetails.isPresent()) {
-                    FirmwareTrackAssignmentDetails targetFirmwareForTrack = assignmentDetails.get();
-                    if (activeFwReleaseDate == null) {
-                        LOG.info("Active FW release date is unknown, firmware upgrade required.");
-                        fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
+                    }
+                }
+
+                if (targetFwVersionNameForTrack == null) {
+                    LOG.info("No target FW version for this track {}", fwTrackRecord);
+
+                } else {
+                    LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion for track {}", ce.getInventoryId(), targetFwVersionNameForTrack);
+
+                    if (reportedFwVersionFromAp != null) {
+                        if (!targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
+                            LOG.debug(
+                                    "reconcileFwVersionToTrack for AP {} targetFwVersion {} doesn't match reported fw version {}, triggering download and flash",
+                                    ce.getInventoryId(), targetFwVersionNameForTrack, reportedFwVersionFromAp);
+
+                            fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
                             fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
                             statusRecord.setDetails(fwUpgradeStatusData);
                             statusRecord = statusServiceInterface.update(statusRecord);
                             triggerFwDownload(ce, fwUpgradeStatusData, trackSettings);
-                    } else {
-                        Date activeReleaseDate = new Date(activeFwReleaseDate);
-                        Date targetReleaseDate = new Date(targetFirmwareForTrack.getReleaseDate());
-                        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.",
-                                    activeReleaseDate, targetReleaseDate);
+                        } else if (targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
+                            LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion {} is active", ce.getInventoryId(), targetFwVersionNameForTrack);
+
                             fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.up_to_date);
-                            fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
+                            fwUpgradeStatusData.setActiveSwVersion(targetFwVersionNameForTrack);
+                            fwUpgradeStatusData.setAlternateSwVersion(targetFwVersionNameForTrack);
+                            fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
+
                             statusRecord.setDetails(fwUpgradeStatusData);
                             statusRecord = statusServiceInterface.update(statusRecord);
-                        } else {
-                            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 {
-                    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(derivedSessionId));
-                clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(derivedSessionId)));
+                clientSession.getDetails().setSessionId(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong()));
+                clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong())));
+                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);
+                }
+            }
+            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:
-//                        ret.add(sendGetMostRecentStatsTimestampRequest(command, inventoryId));
-//                        break;
+                    case MostRecentStatsTimestamp:
+                        ret.add(sendGetMostRecentStatsTimestampRequest(command, inventoryId));
+                        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/MqttStatsPublisher.java

@@ -5,16 +5,16 @@ import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,6 +39,7 @@ 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.client.session.models.ClientSessionMetricDetails;
 import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
 import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
 import com.telecominfraproject.wlan.core.model.equipment.DetectedAuthMode;
@@ -51,6 +52,7 @@ import com.telecominfraproject.wlan.equipment.EquipmentServiceInterface;
 import com.telecominfraproject.wlan.equipment.models.Equipment;
 import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession;
 import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
+import com.telecominfraproject.wlan.opensync.external.integration.controller.OpensyncCloudGatewayController;
 import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
 import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
 import com.telecominfraproject.wlan.profile.models.Profile;
@@ -72,7 +74,6 @@ import com.telecominfraproject.wlan.servicemetric.channelinfo.models.ChannelInfo
 import com.telecominfraproject.wlan.servicemetric.channelinfo.models.ChannelInfoReports;
 import com.telecominfraproject.wlan.servicemetric.client.models.ClientMetrics;
 import com.telecominfraproject.wlan.servicemetric.models.ServiceMetric;
-import com.telecominfraproject.wlan.servicemetric.models.ServiceMetricDataType;
 import com.telecominfraproject.wlan.servicemetric.neighbourscan.models.NeighbourReport;
 import com.telecominfraproject.wlan.servicemetric.neighbourscan.models.NeighbourScanReports;
 import com.telecominfraproject.wlan.status.StatusServiceInterface;
@@ -139,6 +140,8 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
     private RealtimeEventPublisher realtimeEventPublisher;
     @Autowired
     private AlarmServiceInterface alarmServiceInterface;
+    @Autowired
+    private OpensyncCloudGatewayController gatewayController;
     
     @Value("${tip.wlan.mqttStatsPublisher.temperatureThresholdInC:80}")
     private int temperatureThresholdInC;
@@ -158,16 +161,12 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
     @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
-        LOG.info("processMqttMessage for {} start", topic);
-
         long startTime = System.nanoTime();
         String apId = extractApIdFromTopic(topic);
-        
+        LOG.info("Received report on topic {} for ap {}", topic, report.getNodeID());
         Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
         if (ce == null) {
-            LOG.error("Cannot get equipment for inventoryId {}. Ignore mqtt message for topic {}. Exiting processMqttMessage without processing report.", apId, topic);
+            LOG.warn("Cannot get equipment for inventoryId {}. Ignore mqtt message for topic {}", apId, topic);
             return;
         }
 
@@ -177,72 +176,44 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
         long profileId = ce.getProfileId();
         
         // update timestamp for active customer equipment
+        gatewayController.updateActiveCustomer(customerId);
         List<ServiceMetric> metricRecordList = new ArrayList<>();
 
         try {
             long clientMetricsStart = System.nanoTime();
             populateApClientMetrics(metricRecordList, report, customerId, equipmentId, locationId);
             long clientMetricsStop = System.nanoTime();
-            if (LOG.isDebugEnabled())
             LOG.debug("Elapsed time for constructing Client metrics record was {} milliseconds for topic {}",
                     TimeUnit.MILLISECONDS.convert(clientMetricsStop - clientMetricsStart, TimeUnit.NANOSECONDS), topic);
-        } catch (Exception e) {
-            LOG.error("Exception when trying to populateApClientMetrics.", e);
-        }
 
-        try {
             long nodeMetricsStart = System.nanoTime();
             populateApNodeMetrics(metricRecordList, report, customerId, equipmentId, locationId);
             long nodeMetricsStop = System.nanoTime();
-            if (LOG.isDebugEnabled())
             LOG.debug("Elapsed time for constructing ApNode metrics record was {} milliseconds for topic {}",
                     TimeUnit.MILLISECONDS.convert(nodeMetricsStop - nodeMetricsStart, TimeUnit.NANOSECONDS), topic);
-        } catch (Exception e) {
-            LOG.error("Exception when trying to populateApNodeMetrics.", e);
-        }
 
-        try {
             long neighbourScanStart = System.nanoTime();
             populateNeighbourScanReports(metricRecordList, report, customerId, equipmentId, locationId);
             long neighbourScanStop = System.nanoTime();
-            if (LOG.isDebugEnabled())
             LOG.debug("Elapsed time for constructing Neighbour metrics record was {} milliseconds for topic {}",
                     TimeUnit.MILLISECONDS.convert(neighbourScanStop - neighbourScanStart, TimeUnit.NANOSECONDS), topic);
-        } catch (Exception e) {
-            LOG.error("Exception when trying to populateNeighbourScanReports.", e);
-        }
 
-        try {
             long channelInfoStart = System.nanoTime();
             populateChannelInfoReports(metricRecordList, report, customerId, equipmentId, locationId, profileId);
             long channelInfoStop = System.nanoTime();
-            if (LOG.isDebugEnabled())
             LOG.debug("Elapsed time for constructing Channel metrics record was {} milliseconds for topic {}",
                     TimeUnit.MILLISECONDS.convert(channelInfoStop - channelInfoStart, TimeUnit.NANOSECONDS), topic);
-        } catch (Exception e) {
-            LOG.error("Exception when trying to populateChannelInfoReports.", e);
-        }
 
-        try {
             long ssidStart = System.nanoTime();
             populateApSsidMetrics(metricRecordList, report, customerId, equipmentId, apId, locationId);
             long ssidStop = System.nanoTime();
-            if (LOG.isDebugEnabled())
             LOG.debug("Elapsed time for constructing ApSsid metrics record was {} milliseconds for topic {}",
                     TimeUnit.MILLISECONDS.convert(ssidStop - ssidStart, TimeUnit.NANOSECONDS), topic);
-        } catch (Exception e) {
-            LOG.error("Exception when trying to populateApSsidMetrics.", e);
-        }
 
             if (!metricRecordList.isEmpty()) {
                 long serviceMetricTimestamp = System.currentTimeMillis();
                 metricRecordList.stream().forEach(smr -> {              
-                try {
-                    // TODO use serviceMetricTimestamp rather than 0. This is done for now since there are some
-                    // channel metrics that have overlapping keys which messes up Cassandra if the same time stamp is
-                    // used
-                    // and setting it to 0 allows the CloudEventDispatcherController to assign unique time stamps.
-                    smr.setCreatedTimestamp(0);
+                    smr.setCreatedTimestamp(serviceMetricTimestamp);
                     if (smr.getLocationId() == 0)
                         smr.setLocationId(locationId);
                     if (smr.getCustomerId() == 0)
@@ -255,39 +226,23 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                     long thresholdMillis = statsTimeDriftThresholdSec * 1000L;                    
                     if (diffMillis > thresholdMillis) {
                         double diffSec = diffMillis / 1000D;
-                        LOG.warn("AP {} stats report is {} seconds behind cloud. ServiceMetric {} sourceTimestampMs {} createdTimestampMs {}.", apId, diffSec,
-                                smr.getDataType(), sourceTimestamp, serviceMetricTimestamp);
-                    }
-                } catch (Exception e) {
-                    LOG.error("Exception when trying to set ServiceMetric timestamps and base values where not present.", e);
+                        LOG.warn("AP {} stats report is {} seconds behind cloud. ServiceMetric {} sourceTimestampMs {} createdTimestampMs {}.", apId,diffSec,  smr.getDataType(), sourceTimestamp, serviceMetricTimestamp);
                     } 
                     
                 });
-
-            try {
                 long publishStart = System.nanoTime();
                 cloudEventDispatcherInterface.publishMetrics(metricRecordList);
                 long publishStop = System.nanoTime();
-                if (LOG.isDebugEnabled())
                 LOG.debug("Elapsed publishing time for metrics records from AP {} is {} milliseconds", apId,
                         TimeUnit.MILLISECONDS.convert(publishStop - publishStart, TimeUnit.NANOSECONDS));
-            } catch (Exception e) {
-                LOG.error("Exception when trying to publishServiceMetrics.", e);
-            }
             }
 
-        try {
             long mqttEventsStart = System.nanoTime();
             publishEvents(report, customerId, equipmentId, apId, locationId);
             long mqttEventsStop = System.nanoTime();
-            if (LOG.isDebugEnabled())
             LOG.debug("Elapsed publishing time for mqtt events from AP {} is {} milliseconds", apId,
                     TimeUnit.MILLISECONDS.convert(mqttEventsStop - mqttEventsStart, TimeUnit.NANOSECONDS));
-        } catch (Exception e) {
-            LOG.error("Exception when trying to publishEvents.", e);
-        }
 
-        try {
             long endTime = System.nanoTime();
             long elapsedTimeMillis = TimeUnit.MILLISECONDS.convert(endTime - startTime, TimeUnit.NANOSECONDS);
             long elapsedTimeSeconds = TimeUnit.SECONDS.convert(endTime - startTime, TimeUnit.NANOSECONDS);
@@ -297,23 +252,21 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                         elapsedTimeSeconds, report);
             } else {
                 if (elapsedTimeSeconds < 1) {
-                    if (LOG.isDebugEnabled())
                     LOG.debug("Total elapsed processing time {} milliseconds for stats messages from AP {}", elapsedTimeMillis, apId);
                 } else {
-                    if (LOG.isDebugEnabled())
                     LOG.debug("Total elapsed processing time {} seconds for stats messages from AP {}", elapsedTimeSeconds, apId);
                 }
             }
         } catch (Exception e) {
-            LOG.error("Exception when calculating elapsed time for metrics processing.", e);
+            LOG.error("Exception when processing stats messages from AP", e);
         }
 
-        LOG.info("processMqttMessage for {} complete", topic);
     }
 
     @Override
     public void publishSystemEventFromTableStateMonitor(SystemEvent event) {
         LOG.info("Publishing SystemEvent received by TableStateMonitor {}", event);
+        gatewayController.updateActiveCustomer(event.getCustomerId());
         cloudEventDispatcherInterface.publishEvent(event);
     }
 
@@ -386,19 +339,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
         clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
         clientSession.getDetails().setSsid(apClientEvent.getSsid());
 
@@ -509,19 +463,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
         clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
         clientSession.getDetails().setSsid(apClientEvent.getSsid());
         if (apClientEvent.hasDevType()) {
@@ -587,19 +542,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
         clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
         clientSession.getDetails().setSsid(apClientEvent.getSsid());
         if (apClientEvent.hasAuthStatus()) {
@@ -637,19 +593,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
         clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
         clientSession.getDetails().setSsid(apClientEvent.getSsid());
         if (apClientEvent.hasStatus()) {
@@ -701,19 +658,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
         clientSession.getDetails().setSsid(apClientEvent.getSsid());
 
         ClientFailureDetails clientFailureDetails = new ClientFailureDetails();
@@ -748,19 +706,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
 
         if (apClientEvent.hasFdataRxUpTsInUs()) {
             clientSession.getDetails().setFirstDataRcvdTimestamp(apClientEvent.getFdataRxUpTsInUs());
@@ -799,19 +758,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getCltMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
         if (apClientEvent.hasCltId()) {
             clientSession.getDetails().setHostname(apClientEvent.getCltId());
         }
@@ -840,19 +800,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
         if (apClientEvent.hasIpAddr()) {
             ByteString ipAddress = apClientEvent.getIpAddr();
             if (ipAddress != null) {
@@ -896,19 +857,20 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
             clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
             clientSession.setLocationId(locationId);
             clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
+            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
+            clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
         }
         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())))
+            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()))) {
+        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().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
         if (apClientEvent.hasLastRcvUpTsInUs()) {
             clientSession.getDetails().setLastRxTimestamp(apClientEvent.getLastRcvUpTsInUs());
         }
@@ -1599,120 +1561,109 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
     }
 
     void populateApSsidMetrics(List<ServiceMetric> metricRecordList, Report report, int customerId, long equipmentId, String apId, long locationId) {
-        LOG.debug("populateApSsidMetrics start");
-
-        if (report.getClientsCount() == 0) {
-            LOG.info("populateApSsidMetrics no client data present, cannot build {}", ServiceMetricDataType.ApSsid);
-            return;
-        }
-
-        LOG.debug("populateApSsidMetrics for Customer {} Equipment {} LocationId {} AP {}", customerId, equipmentId, locationId, apId);
 
+        LOG.info("populateApSsidMetrics for Customer {} Equipment {}", customerId, equipmentId);
         ServiceMetric smr = new ServiceMetric(customerId, equipmentId);
         smr.setLocationId(locationId);
-        smr.setDataType(ServiceMetricDataType.ApSsid);
         ApSsidMetrics apSsidMetrics = new ApSsidMetrics();
         smr.setDetails(apSsidMetrics);
         metricRecordList.add(smr);
 
         for (ClientReport clientReport : report.getClientsList()) {
+
+            LOG.debug("ClientReport for channel {} RadioBand {}", clientReport.getChannel(), clientReport.getBand());
+
+            // The service metric report's sourceTimestamp will be the most recent ClientReport timestamp
+            if (apSsidMetrics.getSourceTimestampMs() < clientReport.getTimestampMs())
+                apSsidMetrics.setSourceTimestampMs(clientReport.getTimestampMs());
+
+            long txBytes = 0L;
+            long rxBytes = 0L;
+            long txFrames = 0L;
+            long rxFrames = 0L;
+
+            int txErrors = 0;
+            int rxErrors = 0;
+
+            int txRetries = 0;
+            int rxRetries = 0;
+
+            int lastRssi = 0;
+            String ssid = null;
+
+            Set<String> clientMacs = new HashSet<>();
+
             RadioType radioType = OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(clientReport.getBand());
 
-            LOG.debug("populateApSsidMetrics processing clientReport for RadioType {} Channel {}", radioType, clientReport.getChannel());
-            Map<String, List<Client>> clientBySsid = clientReport.getClientListList().stream().filter(new Predicate<Client>() {
-                @Override
-                public boolean test(Client t) {
-                    return t.hasSsid() && t.hasStats();
-                }
-            }).collect(Collectors.groupingBy(c -> c.getSsid()));
-
-            if (LOG.isTraceEnabled())
-                LOG.trace("populateApSsidMetrics clientBySsid {}", clientBySsid);
-
-            final List<SsidStatistics> ssidStats = new ArrayList<>();
-
-            clientBySsid.entrySet().stream().forEach(e -> {
-
-                if (LOG.isTraceEnabled())
-                    LOG.trace("populateApSsidMetrics processing clients {}", e.getValue());
-
-                SsidStatistics stats = new SsidStatistics();
-                stats.setSsid(e.getKey());
-                stats.setNumClient(e.getValue().size());
-                stats.setSourceTimestampMs(clientReport.getTimestampMs());
-
-                // Get the BSSID (MAC address) for this SSID
-                String bssid = getBssidForClientSsid(customerId, equipmentId, apId, e.getKey(), radioType);
-                if (bssid != null)
-                    stats.setBssid(MacAddress.valueOf(bssid));
-                else
-                    LOG.warn("Could not get BSSID for customer {} equipment {} apId {}, ssid {} radioType {}", customerId, equipmentId, apId, e.getKey(),
-                            radioType);
-
-                long txBytes = e.getValue().stream().mapToLong(c -> c.getStats().getTxBytes()).sum();
-                long rxBytes = e.getValue().stream().mapToLong(c -> c.getStats().getRxBytes()).sum();
-                long txFrame = e.getValue().stream().mapToLong(c -> c.getStats().getTxFrames()).sum();
-                long rxFrame = e.getValue().stream().mapToLong(c -> c.getStats().getRxFrames()).sum();
-
-                long txErrors = e.getValue().stream().mapToLong(c -> c.getStats().getTxErrors()).sum();
-                long rxErrors = e.getValue().stream().mapToLong(c -> c.getStats().getRxErrors()).sum();
-
-                long txRetries = e.getValue().stream().mapToLong(c -> c.getStats().getTxRetries()).sum();
-                long rxRetries = e.getValue().stream().mapToLong(c -> c.getStats().getRxRetries()).sum();
-
-                int[] rssi = e.getValue().stream().mapToInt(c -> c.getStats().getRssi()).toArray();
-                double avgRssi = DecibelUtils.getAverageDecibel(rssi);
-
-                stats.setRxLastRssi(Double.valueOf(avgRssi).intValue());
-                stats.setNumRxData(Long.valueOf(rxFrame).intValue());
-                stats.setRxBytes(rxBytes - rxErrors - rxRetries);
-                stats.setNumTxDataRetries(Long.valueOf(txRetries).intValue());
-                stats.setNumRcvFrameForTx(txFrame);
-                stats.setNumTxBytesSucc(txBytes - txErrors - txRetries);
-                stats.setNumRxRetry(Long.valueOf(rxRetries).intValue());
-
-                if (LOG.isTraceEnabled())
-                    LOG.trace("populateApSsidMetrics stats {}", stats.toPrettyString());
-                ssidStats.add(stats);
-
-            });
-
-            if (LOG.isTraceEnabled())
-                LOG.trace("populateApSsidMetrics ssidStats {}", ssidStats);
-            apSsidMetrics.getSsidStats().put(radioType, ssidStats);
-
-        }
-
-        if (LOG.isTraceEnabled())
-            LOG.trace("populateApSsidMetrics apSsidMetrics {}", apSsidMetrics);
-
-        LOG.debug("populateApSsidMetrics finished");
-    }
-
-    String getBssidForClientSsid(int customerId, long equipmentId, String apId, String ssid, RadioType radioType) {
-        try {
+            SsidStatistics ssidStatistics = new SsidStatistics();
+            // GET the Radio IF MAC (BSSID) from the activeBSSIDs
+            ssidStatistics.setSourceTimestampMs(clientReport.getTimestampMs());
             Status activeBssidsStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.ACTIVE_BSSIDS);
-            LOG.debug("populateApSsidMetrics get BSSID from activeBssids {}", activeBssidsStatus);
-            if (activeBssidsStatus != null) {
-                if (activeBssidsStatus.getDetails() != null) {
-                    ActiveBSSIDs activeBssids = (ActiveBSSIDs) activeBssidsStatus.getDetails();
-                    if (activeBssids.getActiveBSSIDs() != null) {
-                        for (ActiveBSSID activeBssid : activeBssids.getActiveBSSIDs()) {
-                            if (activeBssid.getRadioType() != null && activeBssid.getRadioType().equals(radioType)) {
-                                if (activeBssid.getSsid() != null && activeBssid.getSsid().equals(ssid)) {
-                                    if (activeBssid.getBssid() != null) {
-                                        return activeBssid.getBssid();
+            if (activeBssidsStatus != null && activeBssidsStatus.getDetails() != null
+                    && ((ActiveBSSIDs) activeBssidsStatus.getDetails()).getActiveBSSIDs() != null) {
+                for (ActiveBSSID activeBSSID : ((ActiveBSSIDs) activeBssidsStatus.getDetails()).getActiveBSSIDs()) {
+                    if (activeBSSID.getRadioType().equals(radioType)) {
+                        ssidStatistics.setBssid(MacAddress.valueOf(activeBSSID.getBssid()));
                     }
                 }
             }
+            if (LOG.isTraceEnabled())
+                LOG.trace("Client Report Date is {}", new Date(clientReport.getTimestampMs()));
+            int numConnectedClients = 0;
+            for (Client client : clientReport.getClientListList()) {
+                if (client.hasStats()) {
+
+                    if (client.hasSsid()) {
+                        ssid = client.getSsid();
+                    }
+
+                    if (client.hasMacAddress()) {
+                        clientMacs.add(client.getMacAddress());
+
+                    } else {
+                        continue; // cannot have a session without a MAC address
+                    }
+
+                    rxBytes += client.getStats().getRxBytes();
+                    txBytes += client.getStats().getTxBytes();
+                    rxFrames += client.getStats().getRxFrames();
+                    txFrames += client.getStats().getTxFrames();
+                    rxRetries += client.getStats().getRxRetries();
+                    txRetries += client.getStats().getTxRetries();
+                    rxErrors += client.getStats().getRxErrors();
+                    txErrors += client.getStats().getTxErrors();
+                    lastRssi = client.getStats().getRssi();
+
+                    if (client.hasConnected() && client.getConnected() && client.hasMacAddress()) {
+                        numConnectedClients += 1;
                     }
                 }
+
             }
+
+            ssidStatistics.setRxLastRssi(lastRssi);
+            ssidStatistics.setNumRxData(Long.valueOf(rxFrames).intValue());
+            ssidStatistics.setRxBytes(rxBytes - rxErrors - rxRetries);
+            ssidStatistics.setNumTxDataRetries(txRetries);
+            ssidStatistics.setNumRcvFrameForTx(txFrames);
+            ssidStatistics.setNumTxBytesSucc(txBytes - txErrors - txRetries);
+            ssidStatistics.setNumRxRetry(rxRetries);
+            ssidStatistics.setNumClient(numConnectedClients);
+            ssidStatistics.setSsid(ssid);
+
+            if (radioType != null) {
+                List<SsidStatistics> ssidStatsList = apSsidMetrics.getSsidStats().get(radioType);
+                if (ssidStatsList == null) {
+                    ssidStatsList = new ArrayList<>();
                 }
-        } catch (Exception e) {
-            LOG.error("Could not get active BSSIDs for apId {} radioType {}", apId, radioType, e);
+                ssidStatsList.add(ssidStatistics);
+                apSsidMetrics.getSsidStats().put(radioType, ssidStatsList);
             }
-        return null;
+
+        }
+
+        LOG.debug("ApSsidMetrics {}", apSsidMetrics);
+
     }
 
     ChannelInfo createChannelInfo(long equipmentId, RadioType radioType, List<SurveySample> surveySampleList, ChannelBandwidth channelBandwidth) {

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-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) {
@@ -227,4 +245,25 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
         }
     }
     
+    /**
+     * @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