Merge pull request #62 from Telecominfraproject/WIFI-2079-master

[WIFI-2079] change survey_interval_ms from 50ms to 120ms

opensync-ext-cloud/pom.xml

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

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

@@ -5,14 +5,23 @@ 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;
@@ -37,11 +46,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;
@@ -119,10 +128,14 @@ 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
@@ -144,7 +157,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
     @Autowired
     private FirmwareServiceInterface firmwareServiceInterface;
     @Autowired
-    private StatsPublisherInterface mqttMessageProcessor;
+    private StatsPublisherInterface statsPublisherInterface;
     @Autowired
     private AlarmServiceInterface alarmServiceInterface;
 
@@ -210,11 +223,14 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 }
 
                 long locationId = autoProvisionedLocationId;
-                locationId = customer.getDetails().getAutoProvisioning().getLocationId();
+                if ((customer.getDetails() != null) && (customer.getDetails().getAutoProvisioning() != null)
-
+                        && customer.getDetails().getAutoProvisioning().isEnabled()) {
+                    locationId = customer.getDetails().getAutoProvisioning().getLocationId();
+                }
                 try {
-                    Location location = locationServiceInterface.get(locationId);
+                    Location location = locationServiceInterface.getOrNull(locationId);
-                    ce.setLocationId(location.getId());
+                    if (location != null)
+                        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);
@@ -381,7 +397,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
@@ -403,15 +419,30 @@ 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)) {
+            if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY) && connectNodeInfo.versionMatrix.containsKey("DATE")) {
-                reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY), connectNodeInfo.model);
+                // 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);
+                }
             } 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 e;
+            throw new RuntimeException(e);
         }
 
     }
@@ -543,8 +574,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             protocolStatusData.setBaseMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
             protocolStatusData.setCloudCfgDataVersion(42L);
             protocolStatusData.setReportedCfgDataVersion(42L);
-            CountryCode countryCode = Location.getCountryCode(locationServiceInterface.get(ce.getLocationId()));
+            CountryCode countryCode = Location.getCountryCode(locationServiceInterface.getOrNull(ce.getLocationId()));
-            protocolStatusData.setCountryCode(countryCode.getName());
+            if (countryCode != null)
+                protocolStatusData.setCountryCode(countryCode.getName());
             if (connectNodeInfo.country != null) {
                 protocolStatusData.setReportedCC(CountryCode.getByName(connectNodeInfo.country));
             }
@@ -721,102 +753,97 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
     }
 
-    private void reconcileFwVersionToTrack(Equipment ce, String reportedFwVersionFromAp, String model) {
+    void reconcileFwVersionToTrack(Equipment ce, String activeFirmwareImageAp, String inactiveFirmwareImageAp, Long activeFwReleaseDate, 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)
-        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 (trackRecordId == -1) {
+            if (custFwTrackRecord == null) {
                 // take the default
                 fwTrackRecord = firmwareServiceInterface.getFirmwareTrackByName(FirmwareTrackRecord.DEFAULT_TRACK_NAME);
-
             } else {
                 // there must be a customer one
-                fwTrackRecord = firmwareServiceInterface.getFirmwareTrackById(trackRecordId);
+                fwTrackRecord = firmwareServiceInterface.getFirmwareTrackById(custFwTrackRecord.getTrackRecordId());
             }
-
             if (fwTrackRecord != null) {
-
                 LOG.debug("reconcileFwVersionToTrack for AP {} firmwareTrackRecord {}", ce.getInventoryId(), fwTrackRecord);
-
+                Optional<FirmwareTrackAssignmentDetails> assignmentDetails = firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName())
-                List<FirmwareTrackAssignmentDetails> fwTrackAssignmentDetails =
+                        .stream().filter(new Predicate<FirmwareTrackAssignmentDetails>() {
-                        firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName());
+                            @Override
-
+                            public boolean test(FirmwareTrackAssignmentDetails t) {
-                String targetFwVersionNameForTrack = null;
+                                // AP may report type as UPPER case
-
+                                return model.equalsIgnoreCase(t.getModelId());
-                if (fwTrackAssignmentDetails != null) {
+                            }
-                    for (FirmwareTrackAssignmentDetails details : fwTrackAssignmentDetails) {
+                        }).findFirst();
-                        if (model.equalsIgnoreCase(details.getModelId())) {
+                if (assignmentDetails.isPresent()) {
-                            targetFwVersionNameForTrack = details.getVersionName();
+                    FirmwareTrackAssignmentDetails targetFirmwareForTrack = assignmentDetails.get();
-                            break;
+                    if (activeFwReleaseDate == null) {
-                        }
+                        LOG.info("Active FW release date is unknown, firmware upgrade required.");
-                    }
+                        fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
-                }
+                        fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
-
+                        statusRecord.setDetails(fwUpgradeStatusData);
-                if (targetFwVersionNameForTrack == null) {
+                        statusRecord = statusServiceInterface.update(statusRecord);
-                    LOG.info("No target FW version for this track {}", fwTrackRecord);
+                        triggerFwDownload(ce, fwUpgradeStatusData, trackSettings);
-
+                    } else {
-                } else {
+                        Date activeReleaseDate = new Date(activeFwReleaseDate);
-                    LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion for track {}", ce.getInventoryId(), targetFwVersionNameForTrack);
+                        Date targetReleaseDate = new Date(targetFirmwareForTrack.getReleaseDate());
-
+                        if (activeReleaseDate.after(targetReleaseDate) || activeReleaseDate.equals(targetReleaseDate)) {
-                    if (reportedFwVersionFromAp != null) {
+                            LOG.info("Active FW release date {} is more recent than or equal to the target firmware release date {}, no upgrade required.",
-                        if (!targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
+                                    activeReleaseDate, targetReleaseDate);
-                            LOG.debug(
+                            fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.up_to_date);
-                                    "reconcileFwVersionToTrack for AP {} targetFwVersion {} doesn't match reported fw version {}, triggering download and flash",
+                            fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
-                                    ce.getInventoryId(), targetFwVersionNameForTrack, reportedFwVersionFromAp);
+                            statusRecord.setDetails(fwUpgradeStatusData);
-
+                            statusRecord = statusServiceInterface.update(statusRecord);
-                            fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
+                        } 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 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 {
-        } else
+            LOG.info("Automatic firmware upgrade is not configured for track {}", trackSettings);
-
-        {
-            LOG.debug("Automatic firmware upgrade is not configured for track {}", trackSettings);
         }
     }
 
@@ -1436,7 +1463,6 @@ 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);
@@ -1557,15 +1583,12 @@ 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);
@@ -1588,17 +1611,13 @@ 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);
             }
 
@@ -1610,30 +1629,20 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                 clientSession.setMacAddress(clientInstance.getMacAddress());
                 clientSession.setLocationId(ce.getLocationId());
                 clientSession.setDetails(new ClientSessionDetails());
-                clientSession.getDetails().setSessionId(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong()));
+                long derivedSessionId = WiFiSessionUtility.encodeWiFiAssociationId(timestamp / 1000, clientInstance.getMacAddress().getAddressAsLong());
-                clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong())));
+                clientSession.getDetails().setSessionId(Long.toUnsignedString(derivedSessionId));
-                clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
+                clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(derivedSessionId)));
                 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) {
@@ -1882,9 +1891,12 @@ 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);
@@ -1942,9 +1954,13 @@ 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("wifiVIFStateDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            LOG.debug("wifiAssociatedClientsDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
             return;
         }
         Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(deletedClientMac));
@@ -1982,11 +1998,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;
@@ -2079,15 +2095,6 @@ 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));
-                    }
                 }
             }
         }
@@ -2102,21 +2109,8 @@ 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"));
         }
@@ -2171,6 +2165,7 @@ 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")) {
@@ -2413,7 +2408,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());
-        mqttMessageProcessor.publishSystemEventFromTableStateMonitor(electionEvent);
+        statsPublisherInterface.publishSystemEventFromTableStateMonitor(electionEvent);
     }
 
     @Override
@@ -2470,4 +2465,9 @@ 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,32 +250,7 @@ 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,22 +5,21 @@ 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import com.google.common.base.Objects;
@@ -35,11 +34,8 @@ import com.telecominfraproject.wlan.client.ClientServiceInterface;
 import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
 import com.telecominfraproject.wlan.client.session.models.AssociationState;
 import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
-import com.telecominfraproject.wlan.client.session.models.ClientEapDetails;
-import com.telecominfraproject.wlan.client.session.models.ClientFailureDetails;
 import com.telecominfraproject.wlan.client.session.models.ClientSession;
 import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
-import com.telecominfraproject.wlan.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;
@@ -52,7 +48,6 @@ 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;
@@ -74,6 +69,7 @@ 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;
@@ -99,13 +95,8 @@ import sts.OpensyncStats.DeviceType;
 import sts.OpensyncStats.EventReport;
 import sts.OpensyncStats.EventReport.ClientAssocEvent;
 import sts.OpensyncStats.EventReport.ClientAuthEvent;
-import sts.OpensyncStats.EventReport.ClientConnectEvent;
 import sts.OpensyncStats.EventReport.ClientDisconnectEvent;
-import sts.OpensyncStats.EventReport.ClientFailureEvent;
-import sts.OpensyncStats.EventReport.ClientFirstDataEvent;
-import sts.OpensyncStats.EventReport.ClientIdEvent;
 import sts.OpensyncStats.EventReport.ClientIpEvent;
-import sts.OpensyncStats.EventReport.ClientTimeoutEvent;
 import sts.OpensyncStats.FrameType;
 import sts.OpensyncStats.Neighbor;
 import sts.OpensyncStats.Neighbor.NeighborBss;
@@ -140,9 +131,7 @@ 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;
 
@@ -159,14 +148,18 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
     public int statsTimeDriftThresholdSec;
 
     @Override
-    @Async
+    
     public void processMqttMessage(String topic, Report report) {
+        // Numerous try/catch blocks to address situations where logs are not being reported due to corrupt or invalid
+        // data in mqtt stats causing a crash
+        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.warn("Cannot get equipment for inventoryId {}. Ignore mqtt message for topic {}", apId, topic);
+            LOG.error("Cannot get equipment for inventoryId {}. Ignore mqtt message for topic {}. Exiting processMqttMessage without processing report.", apId, topic);
             return;
         }
 
@@ -174,75 +167,119 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
         long equipmentId = ce.getId();
         long locationId = ce.getLocationId();
         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();
-            LOG.debug("Elapsed time for constructing Client metrics record was {} milliseconds for topic {}",
+            if (LOG.isDebugEnabled())
-                    TimeUnit.MILLISECONDS.convert(clientMetricsStop - clientMetricsStart, TimeUnit.NANOSECONDS), topic);
+                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();
-            LOG.debug("Elapsed time for constructing ApNode metrics record was {} milliseconds for topic {}",
+            if (LOG.isDebugEnabled())
-                    TimeUnit.MILLISECONDS.convert(nodeMetricsStop - nodeMetricsStart, TimeUnit.NANOSECONDS), topic);
+                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();
-            LOG.debug("Elapsed time for constructing Neighbour metrics record was {} milliseconds for topic {}",
+            if (LOG.isDebugEnabled())
-                    TimeUnit.MILLISECONDS.convert(neighbourScanStop - neighbourScanStart, TimeUnit.NANOSECONDS), topic);
+                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();
-            LOG.debug("Elapsed time for constructing Channel metrics record was {} milliseconds for topic {}",
+            if (LOG.isDebugEnabled())
-                    TimeUnit.MILLISECONDS.convert(channelInfoStop - channelInfoStart, TimeUnit.NANOSECONDS), topic);
+                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();
-            LOG.debug("Elapsed time for constructing ApSsid metrics record was {} milliseconds for topic {}",
+            if (LOG.isDebugEnabled())
-                    TimeUnit.MILLISECONDS.convert(ssidStop - ssidStart, TimeUnit.NANOSECONDS), topic);
+                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()) {
+        if (!metricRecordList.isEmpty()) {
-                long serviceMetricTimestamp = System.currentTimeMillis();
+            long serviceMetricTimestamp = System.currentTimeMillis();
-                metricRecordList.stream().forEach(smr -> {              
+            metricRecordList.stream().forEach(smr -> {
-                    smr.setCreatedTimestamp(serviceMetricTimestamp);
+                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);
                     if (smr.getLocationId() == 0)
                         smr.setLocationId(locationId);
                     if (smr.getCustomerId() == 0)
                         smr.setCustomerId(customerId);
                     if (smr.getEquipmentId() == 0L)
                         smr.setEquipmentId(equipmentId);
-                    
+
                     long sourceTimestamp = smr.getDetails().getSourceTimestampMs();
                     long diffMillis = serviceMetricTimestamp - sourceTimestamp;
-                    long thresholdMillis = statsTimeDriftThresholdSec * 1000L;                    
+                    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);
+                        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);
+                }
+
+            });
+
+            try {
                 long publishStart = System.nanoTime();
                 cloudEventDispatcherInterface.publishMetrics(metricRecordList);
                 long publishStop = System.nanoTime();
-                LOG.debug("Elapsed publishing time for metrics records from AP {} is {} milliseconds", apId,
+                if (LOG.isDebugEnabled())
-                        TimeUnit.MILLISECONDS.convert(publishStop - publishStart, TimeUnit.NANOSECONDS));
+                    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();
-            LOG.debug("Elapsed publishing time for mqtt events from AP {} is {} milliseconds", apId,
+            if (LOG.isDebugEnabled())
-                    TimeUnit.MILLISECONDS.convert(mqttEventsStop - mqttEventsStart, TimeUnit.NANOSECONDS));
+                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);
@@ -252,27 +289,28 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                         elapsedTimeSeconds, report);
             } else {
                 if (elapsedTimeSeconds < 1) {
-                    LOG.debug("Total elapsed processing time {} milliseconds for stats messages from AP {}", elapsedTimeMillis, apId);
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("Total elapsed processing time {} milliseconds for stats messages from AP {}", elapsedTimeMillis, apId);
                 } else {
-                    LOG.debug("Total elapsed processing time {} seconds for stats messages from AP {}", elapsedTimeSeconds, apId);
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("Total elapsed processing time {} seconds for stats messages from AP {}", elapsedTimeSeconds, apId);
                 }
             }
         } catch (Exception e) {
-            LOG.error("Exception when processing stats messages from AP", e);
+            LOG.error("Exception when calculating elapsed time for metrics processing.", 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);
     }
 
     void publishEvents(Report report, int customerId, long equipmentId, String apId, long locationId) {
 
-        // asynchronous
         realtimeEventPublisher.publishSipCallEvents(customerId, equipmentId, locationId, report.getVideoVoiceReportList());
 
         for (EventReport eventReport : report.getEventReportList()) {
@@ -281,169 +319,25 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 
                 LOG.debug("Processing EventReport::ClientSession for AP {}", apId);
                 // for the following MQTT events, the client/client session is first updated, then the real time event
-                // is published, asynchronously.
+                // is published.
                 if (apEventClientSession.hasClientAuthEvent()) {
                     processClientAuthEvent(customerId, equipmentId, locationId, apEventClientSession);
                 }
                 if (apEventClientSession.hasClientAssocEvent()) {
                     processClientAssocEvent(customerId, equipmentId, locationId, apEventClientSession);
                 }
-                if (apEventClientSession.hasClientFirstDataEvent()) {
-                    processClientFirstDataEvent(customerId, equipmentId, locationId, apEventClientSession);
-                }
-                if (apEventClientSession.hasClientIdEvent()) {
-                    processClientIdEvent(customerId, equipmentId, locationId, apEventClientSession);
-                }
                 if (apEventClientSession.hasClientIpEvent()) {
                     processClientIpEvent(customerId, equipmentId, locationId, apEventClientSession);
                 }
-                if (apEventClientSession.hasClientConnectEvent()) {
-                    processClientConnectEvent(customerId, equipmentId, locationId, eventReport, apEventClientSession);
-                }
                 if (apEventClientSession.hasClientDisconnectEvent()) {
                     processClientDisconnectEvent(customerId, equipmentId, locationId, apEventClientSession);
                 }
-                if (apEventClientSession.hasClientTimeoutEvent()) {
-                    processClientTimeoutEvent(customerId, equipmentId, locationId, apEventClientSession);
-                }
-                if (apEventClientSession.hasClientFailureEvent()) {
-                    processClientFailureEvent(customerId, equipmentId, locationId, apEventClientSession);
-                }
             }
-            // asynchronous
             realtimeEventPublisher.publishChannelHopEvents(customerId, equipmentId, locationId, eventReport);
-            // asynchronous
-            realtimeEventPublisher.publishDhcpTransactionEvents(customerId, equipmentId, locationId, eventReport.getDhcpTransactionList());
-
         }
 
     }
 
-    protected void processClientConnectEvent(int customerId, long equipmentId, long locationId, EventReport e,
-            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientConnectEvent apClientEvent = apEventClientSession.getClientConnectEvent();
-
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
-            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())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
-        clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
-        clientSession.getDetails().setSsid(apClientEvent.getSsid());
-
-        if (apClientEvent.hasEvTimeBootupInUsAssoc()) {
-            clientSession.getDetails().setAssocTimestamp(apClientEvent.getEvTimeBootupInUsAssoc());
-        }
-
-        if (apClientEvent.hasEvTimeBootupInUsAuth()) {
-            clientSession.getDetails().setAuthTimestamp(apClientEvent.getEvTimeBootupInUsAuth());
-        }
-
-        if (apClientEvent.hasEvTimeBootupInUsEapol()) {
-            ClientEapDetails eapDetails = new ClientEapDetails();
-            eapDetails.setEapSuccessTimestamp(apClientEvent.getEvTimeBootupInUsEapol());
-            clientSession.getDetails().setEapDetails(eapDetails);
-        }
-
-        if (apClientEvent.hasEvTimeBootupInUsFirstRx()) {
-            clientSession.getDetails().setFirstDataRcvdTimestamp(apClientEvent.getEvTimeBootupInUsFirstRx());
-        }
-
-        if (apClientEvent.hasEvTimeBootupInUsFirstTx()) {
-            clientSession.getDetails().setFirstDataSentTimestamp(apClientEvent.getEvTimeBootupInUsFirstTx());
-        }
-
-        if (apClientEvent.hasEvTimeBootupInUsIp()) {
-            clientSession.getDetails().setIpTimestamp(apClientEvent.getEvTimeBootupInUsIp());
-        }
-
-        if (apClientEvent.hasEvTimeBootupInUsPortEnable()) {
-            clientSession.getDetails().setPortEnabledTimestamp(apClientEvent.getEvTimeBootupInUsPortEnable());
-        }
-
-        if (apClientEvent.hasCltId()) {
-            clientSession.getDetails().setHostname(apClientEvent.getCltId());
-        }
-
-        if (apClientEvent.hasSecType()) {
-            clientSession.getDetails().setSecurityType(OvsdbToWlanCloudTypeMappingUtility.getCloudSecurityTypeFromOpensyncStats(apClientEvent.getSecType()));
-        }
-
-        if (apClientEvent.hasAssocType()) {
-            clientSession.getDetails().setIsReassociation(apClientEvent.getAssocType().equals(AssocType.REASSOC));
-        }
-
-        if (apClientEvent.hasAssocRssi()) {
-            clientSession.getDetails().setAssocRssi(apClientEvent.getAssocRssi());
-        }
-
-        if (apClientEvent.hasUsing11K()) {
-            clientSession.getDetails().setIs11KUsed(apClientEvent.getUsing11K());
-        }
-
-        if (apClientEvent.hasUsing11R()) {
-            clientSession.getDetails().setIs11RUsed(apClientEvent.getUsing11R());
-
-        }
-
-        if (apClientEvent.hasUsing11V()) {
-            clientSession.getDetails().setIs11VUsed(apClientEvent.getUsing11V());
-        }
-
-        if (apClientEvent.hasIpAddr()) {
-            ByteString ipAddress = apClientEvent.getIpAddr();
-            if (ipAddress != null) {
-                try {
-                    InetAddress inetAddress = InetAddress.getByAddress(ipAddress.toByteArray());
-                    if (inetAddress instanceof Inet4Address) {
-                        clientSession.getDetails().setIpAddress(inetAddress);
-                    } else if (inetAddress instanceof Inet6Address) {
-                        clientSession.getDetails().setIpAddress(inetAddress);
-                    } else {
-                        LOG.error("Invalid IP Address {}", ipAddress);
-                    }
-                    clientSession.getDetails().setIpTimestamp(apClientEvent.getTimestampMs());
-                } catch (UnknownHostException ex) {
-                }
-            }
-        }
-
-        if (clientSession.getDetails().getAssociationState() != null
-                && !clientSession.getDetails().getAssociationState().equals(AssociationState._802_11_Associated)) {
-            clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
-            clientSession.getDetails().setAssocTimestamp(apClientEvent.getTimestampMs());
-        }
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-        realtimeEventPublisher.publishClientConnectSuccessEvent(customerId, equipmentId, locationId, apEventClientSession.getClientConnectEvent());
-
-    }
-
     protected void processClientDisconnectEvent(int customerId, long equipmentId, long locationId,
             sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
         ClientDisconnectEvent apClientEvent = apEventClientSession.getClientDisconnectEvent();
@@ -463,20 +357,17 @@ 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()) {
@@ -542,20 +433,19 @@ 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()) {
@@ -593,20 +483,19 @@ 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()) {
@@ -639,147 +528,6 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
 
     }
 
-    protected void processClientFailureEvent(int customerId, long equipmentId, long locationId,
-            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientFailureEvent apClientEvent = apEventClientSession.getClientFailureEvent();
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
-            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())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
-        clientSession.getDetails().setSsid(apClientEvent.getSsid());
-
-        ClientFailureDetails clientFailureDetails = new ClientFailureDetails();
-        if (apClientEvent.hasReasonStr()) {
-            clientFailureDetails.setReason(apClientEvent.getReasonStr());
-        }
-        if (apClientEvent.hasReasonCode()) {
-            clientFailureDetails.setReasonCode(apClientEvent.getReasonCode());
-        }
-        clientSession.getDetails().setLastFailureDetails(clientFailureDetails);
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-        realtimeEventPublisher.publishClientFailureEvent(customerId, equipmentId, locationId, apEventClientSession.getClientFailureEvent());
-    }
-
-    protected void processClientFirstDataEvent(int customerId, long equipmentId, long locationId,
-            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientFirstDataEvent apClientEvent = apEventClientSession.getClientFirstDataEvent();
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
-            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())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
-
-        if (apClientEvent.hasFdataRxUpTsInUs()) {
-            clientSession.getDetails().setFirstDataRcvdTimestamp(apClientEvent.getFdataRxUpTsInUs());
-        }
-
-        if (apClientEvent.hasFdataTxUpTsInUs()) {
-            clientSession.getDetails().setFirstDataSentTimestamp(apClientEvent.getFdataTxUpTsInUs());
-        }
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-
-        realtimeEventPublisher.publishClientFirstDataEvent(customerId, equipmentId, locationId, apEventClientSession.getClientFirstDataEvent());
-
-    }
-
-    protected void processClientIdEvent(int customerId, long equipmentId, long locationId, sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientIdEvent apClientEvent = apEventClientSession.getClientIdEvent();
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getCltMac()));
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getCltMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-        if (apClientEvent.hasCltId()) {
-            ((ClientInfoDetails) client.getDetails()).setHostName(apClientEvent.getCltId());
-        }
-        client = clientServiceInterface.update(client);
-
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getCltMac()));
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getCltMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
-            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())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
-        if (apClientEvent.hasCltId()) {
-            clientSession.getDetails().setHostname(apClientEvent.getCltId());
-        }
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-        realtimeEventPublisher.publishClientIdEvent(customerId, equipmentId, locationId, apEventClientSession.getClientIdEvent());
-    }
-
     protected void processClientIpEvent(int customerId, long equipmentId, long locationId, sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
         ClientIpEvent apClientEvent = apEventClientSession.getClientIpEvent();
         com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
@@ -800,20 +548,19 @@ 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) {
@@ -837,53 +584,6 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
         realtimeEventPublisher.publishClientIpEvent(customerId, equipmentId, locationId, apEventClientSession.getClientIpEvent());
     }
 
-    protected void processClientTimeoutEvent(int customerId, long equipmentId, long locationId,
-            sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
-        ClientTimeoutEvent apClientEvent = apEventClientSession.getClientTimeoutEvent();
-        com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (client == null) {
-            client = new com.telecominfraproject.wlan.client.models.Client();
-            client.setCustomerId(customerId);
-            client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            client.setDetails(new ClientInfoDetails());
-            client = clientServiceInterface.create(client);
-        }
-        client = clientServiceInterface.update(client);
-        ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
-        if (clientSession == null) {
-            clientSession = new ClientSession();
-            clientSession.setCustomerId(customerId);
-            clientSession.setEquipmentId(equipmentId);
-            clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
-            clientSession.setLocationId(locationId);
-            clientSession.setDetails(new ClientSessionDetails());
-            clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString( apEventClientSession.getSessionId())));
-            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())))
-                clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        if (! Objects.equal( clientSession.getDetails().getSessionId(), Long.toUnsignedString( apEventClientSession.getSessionId()))) {
-            clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
-        }
-        clientSession.getDetails().setSessionId(Long.toUnsignedString( apEventClientSession.getSessionId()));
-        if (apClientEvent.hasLastRcvUpTsInUs()) {
-            clientSession.getDetails().setLastRxTimestamp(apClientEvent.getLastRcvUpTsInUs());
-        }
-        if (apClientEvent.hasLastSentUpTsInUs()) {
-            clientSession.getDetails().setLastTxTimestamp(apClientEvent.getLastSentUpTsInUs());
-        }
-        clientSession.getDetails().setTimeoutTimestamp(apClientEvent.getTimestampMs());
-        clientSession.getDetails().setAssociationState(AssociationState.AP_Timeout);
-        clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
-        clientSession = clientServiceInterface.updateSession(clientSession);
-        realtimeEventPublisher.publishClientTimeoutEvent(customerId, equipmentId, locationId, apEventClientSession.getClientTimeoutEvent());
-    }
-
     void populateApNodeMetrics(List<ServiceMetric> metricRecordList, Report report, int customerId, long equipmentId, long locationId) {
         LOG.info("populateApNodeMetrics for Customer {} Equipment {}", customerId, equipmentId);
         ApNodeMetrics apNodeMetrics = new ApNodeMetrics();
@@ -1137,16 +837,16 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                     checkIfOutOfBound("pctBusyRx", pctBusyRx, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
                     radioUtil.setAssocClientRx(pctBusyRx);
 
-                    double pctIBSS = (busyTx + busySelf) / totalDurationMs;        
+                    double pctIBSS = (busyTx + busySelf) / totalDurationMs;
                     if (pctIBSS > 100D || pctIBSS < 0D) {
                         LOG.warn(
                                 "Calculated value for {} {} is out of bounds on totalDurationMs {} for survey.getBand {}. busyTx {} busyRx {} busy {} busySelf {} "
                                         + " survey.getTimestampMs {}, survey.getSurveyListList {}",
                                 "pctIBSS", pctIBSS, totalDurationMs, survey.getBand(), busyTx, busyRx, busy, busySelf, survey.getTimestampMs(),
                                 survey.getSurveyListList());
-                    }                    
+                    }
                     radioUtil.setIbss(pctIBSS);
-                    
+
                     int nonWifi = (busy - (busyTx + busyRx)) / totalDurationMs;
                     checkIfOutOfBound("nonWifi", nonWifi, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
                     radioUtil.setNonWifi(nonWifi);
@@ -1197,7 +897,7 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
         updateDeviceStatusRadioUtilizationReport(customerId, equipmentId, radioUtilizationReport);
     }
 
-    @Async
+    
     void clearDeviceThresholdAlarm(int customerId, long equipmentId, AlarmCode alarmCode) {
         alarmServiceInterface.get(customerId, Set.of(equipmentId), Set.of(alarmCode)).stream().forEach(a -> {
             Alarm alarm = alarmServiceInterface.delete(customerId, equipmentId, a.getAlarmCode(), a.getCreatedTimestamp());
@@ -1205,7 +905,7 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
         });
     }
 
-    @Async
+    
     void raiseDeviceThresholdAlarm(int customerId, long equipmentId, AlarmCode alarmCode, long timestampMs) {
         // Raise an alarm for temperature
         Alarm alarm = new Alarm();
@@ -1412,13 +1112,6 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                     continue;
                 }
 
-                ClientSession session = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(cl.getMacAddress()));
-
-                if (session == null) {
-                    LOG.info("No session for Client {}, ignore.");
-                    continue;
-                }
-
                 if (cl.hasStats()) {
                     LOG.debug("Processing ClientReport from AP for client device {}", cl.getMacAddress());
                     ServiceMetric smr = new ServiceMetric(customerId, equipmentId, MacAddress.valueOf(cl.getMacAddress()));
@@ -1434,8 +1127,6 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                     // OvsdbDao.configureStats(OvsdbClient)
                     cMetrics.setPeriodLengthSec(periodLengthSec);
                     cMetrics.setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(clReport.getBand()));
-                    cMetrics.setSessionId(session.getDetails().getSessionId());
-                    LOG.debug("populateApClientMetrics Session Id {}", session.getDetails().getSessionId());
 
                     if (cl.getStats().hasRssi()) {
                         int rssi = cl.getStats().getRssi();
@@ -1561,109 +1252,120 @@ 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());
 
-            SsidStatistics ssidStatistics = new SsidStatistics();
+            LOG.debug("populateApSsidMetrics processing clientReport for RadioType {} Channel {}", radioType, clientReport.getChannel());
-            // GET the Radio IF MAC (BSSID) from the activeBSSIDs
+            Map<String, List<Client>> clientBySsid = clientReport.getClientListList().stream().filter(new Predicate<Client>() {
-            ssidStatistics.setSourceTimestampMs(clientReport.getTimestampMs());
+                @Override
-            Status activeBssidsStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.ACTIVE_BSSIDS);
+                public boolean test(Client t) {
-            if (activeBssidsStatus != null && activeBssidsStatus.getDetails() != null
+                    return t.hasSsid() && t.hasStats();
-                    && ((ActiveBSSIDs) activeBssidsStatus.getDetails()).getActiveBSSIDs() != null) {
-                for (ActiveBSSID activeBSSID : ((ActiveBSSIDs) activeBssidsStatus.getDetails()).getActiveBSSIDs()) {
-                    if (activeBSSID.getRadioType().equals(radioType)) {
-                        ssidStatistics.setBssid(MacAddress.valueOf(activeBSSID.getBssid()));
-                    }
                 }
-            }
+            }).collect(Collectors.groupingBy(c -> c.getSsid()));
+
             if (LOG.isTraceEnabled())
-                LOG.trace("Client Report Date is {}", new Date(clientReport.getTimestampMs()));
+                LOG.trace("populateApSsidMetrics clientBySsid {}", clientBySsid);
-            int numConnectedClients = 0;
-            for (Client client : clientReport.getClientListList()) {
-                if (client.hasStats()) {
 
-                    if (client.hasSsid()) {
+            final List<SsidStatistics> ssidStats = new ArrayList<>();
-                        ssid = client.getSsid();
-                    }
 
-                    if (client.hasMacAddress()) {
+            clientBySsid.entrySet().stream().forEach(e -> {
-                        clientMacs.add(client.getMacAddress());
 
-                    } else {
+                if (LOG.isTraceEnabled())
-                        continue; // cannot have a session without a MAC address
+                    LOG.trace("populateApSsidMetrics processing clients {}", e.getValue());
-                    }
 
-                    rxBytes += client.getStats().getRxBytes();
+                SsidStatistics stats = new SsidStatistics();
-                    txBytes += client.getStats().getTxBytes();
+                stats.setSsid(e.getKey());
-                    rxFrames += client.getStats().getRxFrames();
+                stats.setNumClient(e.getValue().size());
-                    txFrames += client.getStats().getTxFrames();
+                stats.setSourceTimestampMs(clientReport.getTimestampMs());
-                    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()) {
+                // Get the BSSID (MAC address) for this SSID
-                        numConnectedClients += 1;
+                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();
 
-            ssidStatistics.setRxLastRssi(lastRssi);
+                long txErrors = e.getValue().stream().mapToLong(c -> c.getStats().getTxErrors()).sum();
-            ssidStatistics.setNumRxData(Long.valueOf(rxFrames).intValue());
+                long rxErrors = e.getValue().stream().mapToLong(c -> c.getStats().getRxErrors()).sum();
-            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) {
+                long txRetries = e.getValue().stream().mapToLong(c -> c.getStats().getTxRetries()).sum();
-                List<SsidStatistics> ssidStatsList = apSsidMetrics.getSsidStats().get(radioType);
+                long rxRetries = e.getValue().stream().mapToLong(c -> c.getStats().getRxRetries()).sum();
-                if (ssidStatsList == null) {
+
-                    ssidStatsList = new ArrayList<>();
+                int[] rssi = e.getValue().stream().mapToInt(c -> c.getStats().getRssi()).toArray();
-                }
+                double avgRssi = DecibelUtils.getAverageDecibel(rssi);
-                ssidStatsList.add(ssidStatistics);
+
-                apSsidMetrics.getSsidStats().put(radioType, ssidStatsList);
+                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);
 
         }
 
-        LOG.debug("ApSsidMetrics {}", apSsidMetrics);
+        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 {
+            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();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            LOG.error("Could not get active BSSIDs for apId {} radioType {}", apId, radioType, e);
+        }
+        return null;
     }
 
     ChannelInfo createChannelInfo(long equipmentId, RadioType radioType, List<SurveySample> surveySampleList, ChannelBandwidth channelBandwidth) {

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

@@ -8,13 +8,10 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import com.telecominfraproject.wlan.client.models.events.realtime.ClientConnectSuccessEvent;
 import com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent.DisconnectFrameType;
 import com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent.DisconnectInitiator;
-import com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent.ClientTimeoutReason;
 import com.telecominfraproject.wlan.client.models.events.utils.WlanReasonCode;
 import com.telecominfraproject.wlan.client.models.events.utils.WlanStatusCode;
 import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
@@ -29,7 +26,6 @@ import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
 import com.telecominfraproject.wlan.profile.models.ProfileContainer;
 import com.telecominfraproject.wlan.profile.models.ProfileType;
 import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
-import com.telecominfraproject.wlan.systemevent.equipment.BaseDhcpEvent;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeChannelHopEvent;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
 import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeSipCallReportEvent;
@@ -44,7 +40,6 @@ import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
 
 import sts.OpensyncStats;
 import sts.OpensyncStats.AssocType;
-import sts.OpensyncStats.CTReasonType;
 import sts.OpensyncStats.CallReport;
 import sts.OpensyncStats.CallStart;
 import sts.OpensyncStats.CallStop;
@@ -53,22 +48,8 @@ import sts.OpensyncStats.DeviceType;
 import sts.OpensyncStats.EventReport;
 import sts.OpensyncStats.EventReport.ClientAssocEvent;
 import sts.OpensyncStats.EventReport.ClientAuthEvent;
-import sts.OpensyncStats.EventReport.ClientConnectEvent;
 import sts.OpensyncStats.EventReport.ClientDisconnectEvent;
-import sts.OpensyncStats.EventReport.ClientFailureEvent;
-import sts.OpensyncStats.EventReport.ClientFirstDataEvent;
-import sts.OpensyncStats.EventReport.ClientIdEvent;
 import sts.OpensyncStats.EventReport.ClientIpEvent;
-import sts.OpensyncStats.EventReport.ClientTimeoutEvent;
-import sts.OpensyncStats.EventReport.DhcpAckEvent;
-import sts.OpensyncStats.EventReport.DhcpCommonData;
-import sts.OpensyncStats.EventReport.DhcpDeclineEvent;
-import sts.OpensyncStats.EventReport.DhcpDiscoverEvent;
-import sts.OpensyncStats.EventReport.DhcpInformEvent;
-import sts.OpensyncStats.EventReport.DhcpNakEvent;
-import sts.OpensyncStats.EventReport.DhcpOfferEvent;
-import sts.OpensyncStats.EventReport.DhcpRequestEvent;
-import sts.OpensyncStats.EventReport.DhcpTransaction;
 import sts.OpensyncStats.FrameType;
 import sts.OpensyncStats.RtpFlowStats;
 import sts.OpensyncStats.StreamingVideoServerDetected;
@@ -91,7 +72,7 @@ public class RealtimeEventPublisher {
 
     private static final Logger LOG = LoggerFactory.getLogger(RealtimeEventPublisher.class);
     
-    @Async
+    
     void publishChannelHopEvents(int customerId, long equipmentId, long locationId, EventReport e) {
 
         LOG.info("publishChannelHopEvents for customerId {} equipmentId {}");
@@ -180,96 +161,8 @@ public class RealtimeEventPublisher {
         }
     }
 
-    @Async
+    
-    void publishClientConnectSuccessEvent(int customerId, long equipmentId, long locationId, ClientConnectEvent clientConnectEvent) {
 
-        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientConnectEvent, customerId,
-                equipmentId);
-        ClientConnectSuccessEvent clientEvent = new ClientConnectSuccessEvent(clientConnectEvent.getTimestampMs());
-        clientEvent.setClientMacAddress(MacAddress.valueOf(clientConnectEvent.getStaMac()));
-        clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
-                .getRadioTypeFromOpensyncStatsRadioBandType(clientConnectEvent.getBand()));
-        clientEvent.setSsid(clientConnectEvent.getSsid());
-        clientEvent.setSessionId(Long.toUnsignedString( clientConnectEvent.getSessionId()));
-
-        if (clientConnectEvent.hasFbtUsed()) {
-            clientEvent.setFbtUsed(clientConnectEvent.getFbtUsed());
-        }
-        if (clientConnectEvent.hasEvTimeBootupInUsAssoc()) {
-            clientEvent.setAssocTs(clientConnectEvent.getEvTimeBootupInUsAssoc());
-        }
-
-        if (clientConnectEvent.hasEvTimeBootupInUsAuth()) {
-            clientEvent.setAuthTs(clientConnectEvent.getEvTimeBootupInUsAuth());
-        }
-
-        if (clientConnectEvent.hasEvTimeBootupInUsEapol()) {
-            clientEvent.setEapolTs(clientConnectEvent.getEvTimeBootupInUsEapol());
-        }
-
-        if (clientConnectEvent.hasEvTimeBootupInUsFirstRx()) {
-            clientEvent.setFirstDataRxTs(clientConnectEvent.getEvTimeBootupInUsFirstRx());
-        }
-
-        if (clientConnectEvent.hasEvTimeBootupInUsFirstTx()) {
-            clientEvent.setFirstDataTxTs(clientConnectEvent.getEvTimeBootupInUsFirstTx());
-        }
-
-        if (clientConnectEvent.hasEvTimeBootupInUsIp()) {
-            clientEvent.setIpAcquisitionTs(clientConnectEvent.getEvTimeBootupInUsIp());
-        }
-
-        if (clientConnectEvent.hasEvTimeBootupInUsPortEnable()) {
-            clientEvent.setPortEnabledTs(clientConnectEvent.getEvTimeBootupInUsPortEnable());
-        }
-
-        if (clientConnectEvent.hasCltId()) {
-            clientEvent.setHostName(clientConnectEvent.getCltId());
-        }
-
-        if (clientConnectEvent.hasSecType()) {
-            clientEvent.setSecurityType(OvsdbToWlanCloudTypeMappingUtility
-                    .getCloudSecurityTypeFromOpensyncStats(clientConnectEvent.getSecType()));
-        }
-
-        if (clientConnectEvent.hasAssocType()) {
-            clientEvent.setReassociation(clientConnectEvent.getAssocType().equals(AssocType.REASSOC));
-        }
-
-        if (clientConnectEvent.hasAssocRssi()) {
-            clientEvent.setAssocRSSI(clientConnectEvent.getAssocRssi());
-        }
-
-        if (clientConnectEvent.hasUsing11K()) {
-            clientEvent.setUsing11k(clientConnectEvent.getUsing11K());
-        }
-
-        if (clientConnectEvent.hasUsing11R()) {
-            clientEvent.setUsing11r(clientConnectEvent.getUsing11R());
-        }
-
-        if (clientConnectEvent.hasUsing11V()) {
-            clientEvent.setUsing11v(clientConnectEvent.getUsing11V());
-        }
-
-        if (clientConnectEvent.hasIpAddr()) {
-            try {
-                clientEvent.setIpAddr(InetAddress.getByAddress(clientConnectEvent.getIpAddr().toByteArray()));
-
-            } catch (UnknownHostException e1) {
-                LOG.error("Invalid Ip Address for client {}", clientConnectEvent.getIpAddr(), e1);
-            }
-        }
-        clientEvent.setEventTimestamp(clientConnectEvent.getTimestampMs());
-        clientEvent.setCustomerId(customerId);
-        clientEvent.setEquipmentId(equipmentId);
-        clientEvent.setLocationId(locationId);
-
-        LOG.info("Publishing client event {} to cloud", clientEvent);
-        cloudEventDispatcherInterface.publishEvent(clientEvent);
-
-    }
-    @Async
     void publishClientDisconnectEvent(int customerId, long equipmentId, long locationId, ClientDisconnectEvent clientDisconnectEvent) {
 
         LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientDisconnectEvent, customerId,
@@ -320,7 +213,6 @@ public class RealtimeEventPublisher {
 
     }
     
-   @Async
     void publishClientAuthSystemEvent(int customerId, long equipmentId, long locationId, ClientAuthEvent clientAuthEvent) {
         LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientAuthEvent, customerId, equipmentId);
 
@@ -345,7 +237,6 @@ public class RealtimeEventPublisher {
 
     }
    
-   @Async
     void publishClientAssocEvent(int customerId, long equipmentId, long locationId, ClientAssocEvent clientAssocEvent) {
         LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientAssocEvent, customerId, equipmentId);
 
@@ -395,82 +286,7 @@ public class RealtimeEventPublisher {
         cloudEventDispatcherInterface.publishEvent(clientEvent);
 
     }
-   @Async
+ 
-    void publishClientFailureEvent(int customerId, long equipmentId, long locationId, ClientFailureEvent clientFailureEvent) {
-        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientFailureEvent, customerId,
-                equipmentId);
-
-        com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent(
-                clientFailureEvent.getTimestampMs());
-
-        clientEvent.setSessionId(Long.toUnsignedString( clientFailureEvent.getSessionId()));
-        clientEvent.setClientMacAddress(MacAddress.valueOf(clientFailureEvent.getStaMac()));
-        clientEvent.setSsid(clientFailureEvent.getSsid());
-
-        if (clientFailureEvent.hasReasonStr()) {
-            clientEvent.setReasonString(clientFailureEvent.getReasonStr());
-        }
-
-        if (clientFailureEvent.hasReasonCode()) {
-            clientEvent.setReasonCode(WlanReasonCode.getById(clientFailureEvent.getReasonCode()));
-        }
-        clientEvent.setEventTimestamp(clientFailureEvent.getTimestampMs());
-        clientEvent.setCustomerId(customerId);
-        clientEvent.setEquipmentId(equipmentId);
-        clientEvent.setLocationId(locationId);
-
-        LOG.info("publishing client event {} to cloud", clientEvent);
-        cloudEventDispatcherInterface.publishEvent(clientEvent);
-    }
-   @Async
-    void publishClientFirstDataEvent(int customerId, long equipmentId, long locationId, ClientFirstDataEvent clientFirstDataEvent) {
-        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientFirstDataEvent, customerId,
-                equipmentId);
-
-        com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent(
-                clientFirstDataEvent.getTimestampMs());
-
-        clientEvent.setSessionId(Long.toUnsignedString( clientFirstDataEvent.getSessionId()));
-        clientEvent.setClientMacAddress(MacAddress.valueOf(clientFirstDataEvent.getStaMac()));
-
-        if (clientFirstDataEvent.hasFdataTxUpTsInUs()) {
-            clientEvent.setFirstDataSentTs(clientFirstDataEvent.getFdataTxUpTsInUs());
-        }
-
-        if (clientFirstDataEvent.hasFdataRxUpTsInUs()) {
-            clientEvent.setFirstDataRcvdTs(clientFirstDataEvent.getFdataRxUpTsInUs());
-        }
-        clientEvent.setEventTimestamp(clientFirstDataEvent.getTimestampMs());
-        clientEvent.setCustomerId(customerId);
-        clientEvent.setEquipmentId(equipmentId);
-        clientEvent.setLocationId(locationId);
-
-        LOG.info("publishing client event {} to cloud", clientEvent);
-        cloudEventDispatcherInterface.publishEvent(clientEvent);
-
-    }
-   @Async
-    void publishClientIdEvent(int customerId, long equipmentId, long locationId, ClientIdEvent clientIdEvent) {
-
-        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientIdEvent, customerId, equipmentId);
-
-        com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent(
-                clientIdEvent.getTimestampMs());
-
-        clientEvent.setSessionId(Long.toUnsignedString( clientIdEvent.getSessionId()));
-        clientEvent.setClientMacAddress(MacAddress.valueOf(clientIdEvent.getCltMac()));
-        if (clientIdEvent.hasCltId()) {
-            clientEvent.setUserId(clientIdEvent.getCltId());
-        }
-        clientEvent.setEventTimestamp(clientIdEvent.getTimestampMs());
-        clientEvent.setCustomerId(customerId);
-        clientEvent.setEquipmentId(equipmentId);
-        clientEvent.setLocationId(locationId);
-
-        LOG.info("publishing client event {} to cloud", clientEvent);
-        cloudEventDispatcherInterface.publishEvent(clientEvent);
-    }
-   @Async
     void publishClientIpEvent(int customerId, long equipmentId, long locationId, ClientIpEvent clientIpEvent) {
 
         LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientIpEvent, customerId, equipmentId);
@@ -496,320 +312,7 @@ public class RealtimeEventPublisher {
         LOG.info("publishing client event {} to cloud", clientEvent);
         cloudEventDispatcherInterface.publishEvent(clientEvent);
     }
-   @Async
+   
-    void publishClientTimeoutEvent(int customerId, long equipmentId, long locationId, ClientTimeoutEvent clientTimeoutEvent) {
-
-        LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientTimeoutEvent, customerId,
-                equipmentId);
-
-        com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent(
-                clientTimeoutEvent.getTimestampMs());
-
-        clientEvent.setSessionId(Long.toUnsignedString( clientTimeoutEvent.getSessionId()));
-        clientEvent.setClientMacAddress(MacAddress.valueOf(clientTimeoutEvent.getStaMac()));
-        if (clientTimeoutEvent.hasRCode()) {
-            clientEvent.setTimeoutReason(clientTimeoutEvent.getRCode().equals(CTReasonType.CTR_IDLE_TOO_LONG)
-                    ? ClientTimeoutReason.IdleTooLong
-                    : ClientTimeoutReason.FailedProbe);
-        }
-        if (clientTimeoutEvent.hasLastRcvUpTsInUs()) {
-            clientEvent.setLastRecvTime(clientTimeoutEvent.getLastRcvUpTsInUs());
-        }
-        if (clientTimeoutEvent.hasLastSentUpTsInUs()) {
-            clientEvent.setLastSentTime(clientTimeoutEvent.getLastSentUpTsInUs());
-        }
-        clientEvent.setEventTimestamp(clientTimeoutEvent.getTimestampMs());
-        clientEvent.setCustomerId(customerId);
-        clientEvent.setEquipmentId(equipmentId);
-        clientEvent.setLocationId(locationId);
-
-        LOG.info("publishing client event {} to cloud", clientEvent);
-        cloudEventDispatcherInterface.publishEvent(clientEvent);
-
-    }
-
-   @Async
-    void publishDhcpTransactionEvents(int customerId, long equipmentId, long locationId, List<DhcpTransaction> dhcpTransactionList) {
-        LOG.info("Publish Dhcp Transaction Events for customer {} equipmentId {}", customerId, equipmentId);
-        List<SystemEvent> dhcpEventsList = new ArrayList<>();
-        for (DhcpTransaction dhcpTransaction : dhcpTransactionList) {
-
-            for (DhcpAckEvent ackEvent : dhcpTransaction.getDhcpAckEventList()) {
-                LOG.debug("DhcpAckEvent {}", ackEvent);
-
-                com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent cloudDhcpAck = new com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent();
-
-                cloudDhcpAck.setCustomerId(customerId);
-                cloudDhcpAck.setEquipmentId(equipmentId);
-                cloudDhcpAck.setLocationId(locationId);
-
-                if (ackEvent.hasDhcpCommonData()) {
-                    cloudDhcpAck = (com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent) getDhcpCommonDataForEvent(
-                            cloudDhcpAck, ackEvent.getDhcpCommonData());
-                } else {
-                    cloudDhcpAck.setxId(dhcpTransaction.getXId());
-                }
-
-                if (ackEvent.hasGatewayIp()) {
-                    try {
-                        cloudDhcpAck.setGatewayIp(InetAddress.getByAddress(ackEvent.getGatewayIp().toByteArray()));
-                    } catch (UnknownHostException e) {
-                        LOG.error("Invalid GatewayIP", e);
-                    }
-                }
-
-                if (ackEvent.hasLeaseTime()) {
-                    cloudDhcpAck.setLeaseTime(ackEvent.getLeaseTime());
-                }
-
-                if (ackEvent.hasPrimaryDns()) {
-                    try {
-                        cloudDhcpAck.setPrimaryDns(InetAddress.getByAddress(ackEvent.getPrimaryDns().toByteArray()));
-                    } catch (UnknownHostException e) {
-                        LOG.error("Invalid PrimaryDNS", e);
-                    }
-                }
-
-                if (ackEvent.hasSecondaryDns()) {
-                    try {
-                        cloudDhcpAck
-                                .setSecondaryDns(InetAddress.getByAddress(ackEvent.getSecondaryDns().toByteArray()));
-                    } catch (UnknownHostException e) {
-                        LOG.error("Invalid SecondaryDNS", e);
-                    }
-                }
-
-                if (ackEvent.hasRebindingTime()) {
-                    cloudDhcpAck.setRebindingTime(ackEvent.getRebindingTime());
-                }
-
-                if (ackEvent.hasRenewalTime()) {
-                    cloudDhcpAck.setRenewalTime(ackEvent.getRenewalTime());
-                }
-
-                if (ackEvent.hasSubnetMask()) {
-                    try {
-                        cloudDhcpAck.setSubnetMask(InetAddress.getByAddress(ackEvent.getSubnetMask().toByteArray()));
-                    } catch (UnknownHostException e) {
-                        LOG.error("Invalid SubnetMask", e);
-                    }
-                }
-
-                if (ackEvent.hasTimeOffset()) {
-                    cloudDhcpAck.setTimeOffset(ackEvent.getTimeOffset());
-                }
-
-                LOG.debug("Cloud DhcpAckEvent {}", cloudDhcpAck);
-
-                dhcpEventsList.add(cloudDhcpAck);
-            }
-
-            for (DhcpNakEvent nakEvent : dhcpTransaction.getDhcpNakEventList()) {
-                LOG.debug("DhcpNakEvent {}", nakEvent);
-
-                com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent cloudDhcpNak = new com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent();
-
-                cloudDhcpNak.setCustomerId(customerId);
-                cloudDhcpNak.setEquipmentId(equipmentId);
-                cloudDhcpNak.setLocationId(locationId);
-
-                if (nakEvent.hasDhcpCommonData()) {
-                    cloudDhcpNak = (com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent) getDhcpCommonDataForEvent(
-                            cloudDhcpNak, nakEvent.getDhcpCommonData());
-
-                } else {
-                    cloudDhcpNak.setxId(dhcpTransaction.getXId());
-                }
-
-                if (nakEvent.hasFromInternal()) {
-                    cloudDhcpNak.setFromInternal(nakEvent.getFromInternal());
-                }
-
-                LOG.debug("Cloud DhcpNakEvent {}", cloudDhcpNak);
-
-                dhcpEventsList.add(cloudDhcpNak);
-
-            }
-
-            for (DhcpOfferEvent offerEvent : dhcpTransaction.getDhcpOfferEventList()) {
-                LOG.debug("DhcpOfferEvent {}", offerEvent);
-
-                com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent cloudDhcpOffer = new com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent();
-
-                cloudDhcpOffer.setCustomerId(customerId);
-                cloudDhcpOffer.setEquipmentId(equipmentId);
-                cloudDhcpOffer.setLocationId(locationId);
-
-                if (offerEvent.hasDhcpCommonData()) {
-                    cloudDhcpOffer = (com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent) getDhcpCommonDataForEvent(
-                            cloudDhcpOffer, offerEvent.getDhcpCommonData());
-
-                } else {
-                    cloudDhcpOffer.setxId(dhcpTransaction.getXId());
-                }
-
-                if (offerEvent.hasFromInternal()) {
-                    cloudDhcpOffer.setFromInternal(offerEvent.getFromInternal());
-                }
-
-                dhcpEventsList.add(cloudDhcpOffer);
-
-            }
-
-            for (DhcpInformEvent informEvent : dhcpTransaction.getDhcpInformEventList()) {
-                LOG.debug("DhcpInformEvent {}", informEvent);
-
-                com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent cloudDhcpInform = new com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent();
-
-                cloudDhcpInform.setCustomerId(customerId);
-                cloudDhcpInform.setEquipmentId(equipmentId);
-                cloudDhcpInform.setLocationId(locationId);
-
-                if (informEvent.hasDhcpCommonData()) {
-                    cloudDhcpInform = (com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent) getDhcpCommonDataForEvent(
-                            cloudDhcpInform, informEvent.getDhcpCommonData());
-
-                } else {
-                    cloudDhcpInform.setxId(dhcpTransaction.getXId());
-                }
-
-                dhcpEventsList.add(cloudDhcpInform);
-
-            }
-
-            for (DhcpDeclineEvent declineEvent : dhcpTransaction.getDhcpDeclineEventList()) {
-                LOG.debug("DhcpDeclineEvent {}", declineEvent);
-
-                com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent cloudDhcpDecline = new com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent();
-
-                cloudDhcpDecline.setCustomerId(customerId);
-                cloudDhcpDecline.setEquipmentId(equipmentId);
-                cloudDhcpDecline.setLocationId(locationId);
-
-                if (declineEvent.hasDhcpCommonData()) {
-                    cloudDhcpDecline = (com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent) getDhcpCommonDataForEvent(
-                            cloudDhcpDecline, declineEvent.getDhcpCommonData());
-
-                } else {
-                    cloudDhcpDecline.setxId(dhcpTransaction.getXId());
-                }
-
-                LOG.debug("Cloud DhcpDeclineEvent {}", cloudDhcpDecline);
-
-                dhcpEventsList.add(cloudDhcpDecline);
-
-            }
-
-            for (DhcpRequestEvent requestEvent : dhcpTransaction.getDhcpRequestEventList()) {
-                LOG.debug("DhcpRequestEvent {}", requestEvent);
-
-                com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent cloudDhcpRequest = new com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent();
-
-                cloudDhcpRequest.setCustomerId(customerId);
-                cloudDhcpRequest.setEquipmentId(equipmentId);
-                cloudDhcpRequest.setLocationId(locationId);
-
-                if (requestEvent.hasDhcpCommonData()) {
-                    cloudDhcpRequest = (com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent) getDhcpCommonDataForEvent(
-                            cloudDhcpRequest, requestEvent.getDhcpCommonData());
-
-                } else {
-                    cloudDhcpRequest.setxId(dhcpTransaction.getXId());
-                }
-
-                if (requestEvent.hasHostname()) {
-                    cloudDhcpRequest.setHostName(requestEvent.getHostname());
-                }
-
-                LOG.debug("Cloud DhcpRequestEvent {}", cloudDhcpRequest);
-
-                dhcpEventsList.add(cloudDhcpRequest);
-
-            }
-
-            for (DhcpDiscoverEvent discoverEvent : dhcpTransaction.getDhcpDiscoverEventList()) {
-                LOG.debug("DhcpDiscoverEvent {}", discoverEvent);
-
-                com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent cloudDhcpDiscover = new com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent();
-
-                cloudDhcpDiscover.setCustomerId(customerId);
-                cloudDhcpDiscover.setEquipmentId(equipmentId);
-                cloudDhcpDiscover.setLocationId(locationId);
-
-                if (discoverEvent.hasDhcpCommonData()) {
-                    cloudDhcpDiscover = (com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent) getDhcpCommonDataForEvent(
-                            cloudDhcpDiscover, discoverEvent.getDhcpCommonData());
-
-                } else {
-                    cloudDhcpDiscover.setxId(dhcpTransaction.getXId());
-                }
-
-                if (discoverEvent.hasHostname()) {
-                    cloudDhcpDiscover.setHostName(discoverEvent.getHostname());
-                }
-
-                LOG.debug("Cloud DhcpDiscoverEvent {}", cloudDhcpDiscover);
-
-                dhcpEventsList.add(cloudDhcpDiscover);
-
-            }
-        }
-
-        if (dhcpEventsList.size() > 0) {
-            LOG.info("Publishing DhcpEvents {}", dhcpEventsList);
-            cloudEventDispatcherInterface.publishEventsBulk(dhcpEventsList);
-        }
-    }
-
-    BaseDhcpEvent getDhcpCommonDataForEvent(BaseDhcpEvent cloudDhcpEvent, DhcpCommonData dhcpCommonData) {
-        if (dhcpCommonData.hasXId()) {
-            cloudDhcpEvent.setxId(dhcpCommonData.getXId());
-        }
-
-        if (dhcpCommonData.hasVlanId()) {
-            cloudDhcpEvent.setVlanId(dhcpCommonData.getVlanId());
-        }
-
-        if (dhcpCommonData.hasDeviceMacAddress()) {
-
-            try {
-                cloudDhcpEvent.setClientMacAddress(MacAddress.valueOf(dhcpCommonData.getDeviceMacAddress()));
-            } catch (Exception e) {
-                LOG.error("Could not parse device_mac_address from DhcpCommonData ", dhcpCommonData, e);
-            }
-        }
-
-        if (dhcpCommonData.hasDhcpServerIp()) {
-            try {
-                cloudDhcpEvent
-                        .setDhcpServerIp(InetAddress.getByAddress(dhcpCommonData.getDhcpServerIp().toByteArray()));
-            } catch (UnknownHostException e) {
-                LOG.error("Invalid Dhcp Server IP", e);
-            }
-        }
-
-        if (dhcpCommonData.hasClientIp()) {
-            try {
-                cloudDhcpEvent.setClientIp(InetAddress.getByAddress(dhcpCommonData.getClientIp().toByteArray()));
-            } catch (UnknownHostException e) {
-                LOG.error("Invalid Client IP", e);
-            }
-        }
-
-        if (dhcpCommonData.hasRelayIp()) {
-            try {
-                cloudDhcpEvent.setRelayIp(InetAddress.getByAddress(dhcpCommonData.getRelayIp().toByteArray()));
-            } catch (UnknownHostException e) {
-                LOG.error("Invalid Relay IP", e);
-            }
-        }
-
-        cloudDhcpEvent.setEventTimestamp(dhcpCommonData.getTimestampMs());
-
-        return cloudDhcpEvent;
-    }
-
-    @Async
     void publishSipCallEvents(int customerId, long equipmentId, long locationId, List<VideoVoiceReport> sipCallReportList) {
         // only in case it is not there, we will just use the time when we
         // received the report/event

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.get(8L)).thenReturn(location);
+        Mockito.when(locationServiceInterface.getOrNull(Mockito.anyLong())).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).get(8L);
+        Mockito.verify(locationServiceInterface).getOrNull(ArgumentMatchers.anyLong());
 
     }
 
@@ -246,7 +246,7 @@ public class OpensyncExternalIntegrationCloudTest {
         location.setDetails(details);
         location.setName("Location-UT");
         location.setLocationType(LocationType.BUILDING);
-        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
+        Mockito.when(locationServiceInterface.getOrNull(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)).get(ArgumentMatchers.anyLong());
+        Mockito.verify(locationServiceInterface, Mockito.times(2)).getOrNull(ArgumentMatchers.anyLong());
 
     }
 

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

@@ -159,130 +159,6 @@ public class RealtimeEventPublisherTest {
         // TODO: implement
     }
 
-    @Test
-    public void testPublishDhcpTransactionEvents() throws Exception {
-        
-        long timestamp = System.currentTimeMillis();
-        List<DhcpTransaction> dhcpTransactionList = new ArrayList<>();
-        DhcpAckEvent ackEvent = DhcpAckEvent.newBuilder()
-                .setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
-                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                        .setDeviceMacAddress("c0:9a:d0:76:a9:69")
-                        .setXId(123456789)
-                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build())
-                .setGatewayIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setPrimaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.204").getAddress()))
-                .setSecondaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.198").getAddress()))
-                .setSubnetMask(ByteString.copyFrom(InetAddress.getByName("255.255.255.0").getAddress()))
-                .setLeaseTime(172800).setTimeOffset(10).build();
-        
-        DhcpAckEvent ackEvent2 = DhcpAckEvent.newBuilder()
-                .setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
-                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                        .setDeviceMacAddress("f6:f0:65:99:e2:33")
-                        .setXId(123456789)
-                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build())
-                .setGatewayIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setPrimaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.204").getAddress()))
-                .setSecondaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.198").getAddress()))
-                .setSubnetMask(ByteString.copyFrom(InetAddress.getByName("255.255.255.0").getAddress()))
-                .setLeaseTime(172800).setTimeOffset(10).build();
-        
-        List<DhcpAckEvent> ackEventList = List.of(ackEvent, ackEvent2);
-        
-        DhcpNakEvent nakEvent1 = DhcpNakEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                        .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.129").getAddress()))
-                        .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                        .setDeviceMacAddress("24:f5:a2:ef:2e:53")
-                        .setXId(123456789)
-                        .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
-        
-        List<DhcpNakEvent> nakEventList = List.of(nakEvent1);
-        
-        DhcpOfferEvent offerEvent1 = DhcpOfferEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
-                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
-                .setXId(123456789)
-                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
-        
-        DhcpOfferEvent offerEvent2 = DhcpOfferEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
-                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setDeviceMacAddress("f6:f0:65:99:e2:33")
-                .setXId(123456789)
-                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
-
-        List<DhcpOfferEvent> offerEventList = List.of(offerEvent1,offerEvent2);
-        
-        DhcpDiscoverEvent discoverEvent1 = DhcpDiscoverEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
-                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
-                .setXId(123456789)
-                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPhone").build();
-        
-        DhcpDiscoverEvent discoverEvent2 = DhcpDiscoverEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
-                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setDeviceMacAddress("f6:f0:65:99:e2:33")
-                .setXId(123456789)
-                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPad").build();
-
-        List<DhcpDiscoverEvent> discoverEventList = List.of(discoverEvent1,discoverEvent2);
-        
-        DhcpRequestEvent requestEvent1 = DhcpRequestEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
-                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
-                .setXId(123456789)
-                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPhone").build();
-        
-        DhcpRequestEvent requestEvent2 = DhcpRequestEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
-                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setDeviceMacAddress("f6:f0:65:99:e2:33")
-                .setXId(123456789)
-                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPad").build();
-
-        List<DhcpRequestEvent> requestEventList = List.of(requestEvent1,requestEvent2);
-        
-        DhcpInformEvent informEvent = DhcpInformEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
-                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setDeviceMacAddress("c0:9a:d0:76:a9:69")
-                .setXId(123456789)
-                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).build();
-        
-        List<DhcpInformEvent> informEventList = List.of(informEvent);
-
-        
-        DhcpDeclineEvent declineEvent = DhcpDeclineEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
-                .setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.129").getAddress()))
-                .setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
-                .setDeviceMacAddress("24:f5:a2:ef:2e:53")
-                .setXId(123456789)
-                .setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).build();
-
-        List<DhcpDeclineEvent> declineEventList = List.of(declineEvent);
-        
-        
-        DhcpTransaction dhcpTransaction = DhcpTransaction.newBuilder(DhcpTransaction.getDefaultInstance())
-                .addAllDhcpAckEvent(ackEventList).addAllDhcpNakEvent(nakEventList).addAllDhcpOfferEvent(offerEventList)
-                .addAllDhcpInformEvent(informEventList).addAllDhcpDeclineEvent(declineEventList)
-                .addAllDhcpDiscoverEvent(discoverEventList).addAllDhcpRequestEvent(requestEventList).setXId(123456789)
-                .build();
-
-        dhcpTransactionList.add(dhcpTransaction);
-        
-        realtimeEventPublisher.publishDhcpTransactionEvents(2, 1L, 0L, dhcpTransactionList);
-
-        Mockito.verify(cloudEventDispatcherInterface,Mockito.times(1)).publishEventsBulk(Mockito.anyList());
-
-    }
-
     @Test
     public void testPublishSipCallEvents() throws Exception {
 

opensync-ext-interface/pom.xml

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

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

@@ -54,4 +54,6 @@ 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,7 +1,5 @@
 package com.telecominfraproject.wlan.opensync.external.integration;
 
-import java.util.Objects;
-
 import com.vmware.ovsdb.service.OvsdbClient;
 
 public class OvsdbSession {
@@ -9,7 +7,6 @@ public class OvsdbSession {
     private String apId;
     private long routingId;
     private long equipmentId;
-    private long mostRecentStatsTimestamp;
     
     public OvsdbClient getOvsdbClient() {
         return ovsdbClient;
@@ -35,34 +32,5 @@ 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-ext-static/pom.xml

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

opensync-gateway-build/pom.xml

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

opensync-gateway-cloud-docker/pom.xml

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

opensync-gateway-cloud-process/pom.xml

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

opensync-gateway-static-docker/pom.xml

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

opensync-gateway-static-process/pom.xml

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

opensync-gateway/pom.xml

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

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

@@ -11,10 +11,6 @@ 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;
@@ -36,8 +32,7 @@ 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.OvsdbSession;
+import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface;
-import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
 import com.telecominfraproject.wlan.opensync.external.integration.utils.StatsPublisherInterface;
 import com.telecominfraproject.wlan.opensync.util.ZlibUtil;
 
@@ -63,10 +58,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
     private final Timer timerMessageProcess = new BasicTimer(MonitorConfig.builder("osgw-mqtt-messageProcessTimer").withTags(tags).build());
 
     @Autowired
-    private StatsPublisherInterface statsPublisher;
+    private OpensyncExternalIntegrationInterface opensyncExternalIntegrationInterface;
-    
-    @Autowired
-    private OvsdbSessionMapInterface ovsdbSessionMapInterface;
 
     // dtop: use anonymous constructor to ensure that the following code always
     // get executed,
@@ -193,18 +185,8 @@ 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));
-                                statsPublisher.processMqttMessage(mqttMsg.getTopic(), statsReport);                           
+                                opensyncExternalIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), statsReport);                           
                                 LOG.debug("Dispatched report for topic {} to backend for processing", mqttMsg.getTopic());
 
                             } catch (Exception e) {
@@ -244,26 +226,5 @@ 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/ovsdb/TipWlanOvsdbClient.java

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

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

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

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

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

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

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

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

@@ -13,6 +13,7 @@ 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