[WIFI-2670] Change log for debugging

Merge pull request #48 from Telecominfraproject/hotfix/netexp-2342
fix bug for cannot find alarm to be deleted exception
2025-11-03 12:08:07 +00:00 · 2021-06-28 23:17:47 -04:00 · 2021-06-28 19:43:34 -04:00 · 2021-06-28 19:05:01 -04:00 · 2021-06-25 13:55:13 -04:00 · 2021-06-25 13:51:00 -04:00
16 changed files with 457 additions and 440 deletions
--- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java
+++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java
@@ -25,6 +25,10 @@ import org.springframework.stereotype.Component;

 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.telecominfraproject.wlan.alarm.AlarmServiceInterface;
+import com.telecominfraproject.wlan.alarm.models.Alarm;
+import com.telecominfraproject.wlan.alarm.models.AlarmCode;
+import com.telecominfraproject.wlan.alarm.models.AlarmDetails;
 import com.telecominfraproject.wlan.client.ClientServiceInterface;
 import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
 import com.telecominfraproject.wlan.client.models.Client;
@@ -144,6 +148,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
    private FirmwareServiceInterface firmwareServiceInterface;
    @Autowired
    private MqttStatsPublisher mqttMessageProcessor;
+    @Autowired
+    private AlarmServiceInterface alarmServiceInterface;

    @Autowired
    private OpensyncCloudGatewayController gatewayController;
@@ -176,7 +182,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra

    @Override
    public void apConnected(String apId, ConnectNodeInfo connectNodeInfo) {
-
+    	
        Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);

        try {
@@ -288,6 +294,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                // equipment already exists
                boolean needToUpdateEquipment = false;
                MacAddress reportedMacAddress = null;
+                alarmServiceInterface.delete(ce.getCustomerId(), ce.getId());
                try {
                    reportedMacAddress = MacAddress.valueOf(connectNodeInfo.macAddress);
                } catch (RuntimeException e) {
@@ -543,8 +550,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
            protocolStatusData.setBaseMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
            protocolStatusData.setCloudCfgDataVersion(42L);
            protocolStatusData.setReportedCfgDataVersion(42L);
-            protocolStatusData.setCountryCode("CA");
-            protocolStatusData.setReportedCC(CountryCode.CA);
+            CountryCode countryCode = Location.getCountryCode(locationServiceInterface.get(ce.getLocationId()));
+            protocolStatusData.setCountryCode(countryCode.getName());
+            if (connectNodeInfo.country != null) {
+                protocolStatusData.setReportedCC(CountryCode.getByName(connectNodeInfo.country));
+            }
            protocolStatusData.setReportedHwVersion(connectNodeInfo.platformVersion);
            if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY)) {
                protocolStatusData.setReportedSwVersion(connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY));
@@ -881,6 +891,20 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
    private void updateApDisconnectedStatus(String apId, Equipment ce) {
        LOG.info("updateApDisconnectedStatus disconnected AP {}", apId);
        try {
+        	Alarm disconnectedAlarm = new Alarm();
+            disconnectedAlarm.setCustomerId(ce.getCustomerId());
+            disconnectedAlarm.setEquipmentId(ce.getId());
+            disconnectedAlarm.setAlarmCode(AlarmCode.Disconnected);
+            
+            AlarmDetails alarmDetails = new AlarmDetails();
+    		alarmDetails.setMessage(AlarmCode.Disconnected.getDescription());
+    		alarmDetails.setAffectedEquipmentIds(List.of(ce.getId()));
+    		alarmDetails.setGeneratedBy(apId);
+    		
+    		disconnectedAlarm.setDetails(alarmDetails);
+            
+    		alarmServiceInterface.create(disconnectedAlarm);
+            
            Status statusRecord = new Status();
            statusRecord.setCustomerId(ce.getCustomerId());
            statusRecord.setEquipmentId(ce.getId());
@@ -1043,16 +1067,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
        mqttMessageProcessor.processMqttMessage(topic, report);
    }

-    @Override
-    public void processMqttMessage(String topic, FlowReport flowReport) {
-        mqttMessageProcessor.processMqttMessage(topic, flowReport);
-    }
-
-    @Override
-    public void processMqttMessage(String topic, WCStatsReport wcStatsReport) {
-        mqttMessageProcessor.processMqttMessage(topic, wcStatsReport);
-    }
-
    @Override
    public void wifiVIFStateDbTableUpdate(List<OpensyncAPVIFState> vifStateTables, String apId) {
        LOG.debug("Received Wifi_VIF_State table update for AP {}", apId);
@@ -1288,6 +1302,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
                LOG.debug("Protocol Status reportedCC {} radioStatus.getCountry {} radioStatus CountryCode fromName {}", protocolStatusData.getReportedCC(),
                        radioState.getCountry(), CountryCode.getByName((radioState.getCountry())));
                protocolStatusData.setReportedCC(CountryCode.getByName((radioState.getCountry())));
+                protocolStatusData.setCountryCode(radioState.getCountry());
                protocolStatus.setDetails(protocolStatusData);

            } else {
@@ -1308,6 +1323,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
            channelStatus.setDetails(channelStatusData);
        }
        ((EquipmentChannelStatusData) channelStatus.getDetails()).getChannelNumberStatusDataMap().put(radioState.getFreqBand(), radioState.getChannel());
+        ((EquipmentChannelStatusData) channelStatus.getDetails()).getTxPowerDataMap().put(radioState.getFreqBand(), radioState.getTxPower());
        return channelStatus;
    }

--- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java
+++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java
@@ -1,3 +1,4 @@
+
 package com.telecominfraproject.wlan.opensync.external.integration.controller;

 import java.util.ArrayList;
@@ -149,19 +150,16 @@ public class OpensyncCloudGatewayController {
                String inventoryId = command.getInventoryId();

                if (com.telecominfraproject.wlan.core.model.json.BaseJsonModel.hasUnsupportedValue(command)) {
-                    LOG.error("[{}] Failed to deliver command {}, command contains unsupported value", inventoryId,
-                            command);
-                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
-                            "Unsupported value in command for " + inventoryId, command, registeredGateway.getHostname(),
-                            registeredGateway.getPort()));
+                    LOG.error("[{}] Failed to deliver command {}, command contains unsupported value", inventoryId, command);
+                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand, "Unsupported value in command for " + inventoryId, command,
+                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort()));
                    return;
                }
                OvsdbSession session = ovsdbSessionMapInterface.getSession(inventoryId);
                if (session == null) {
                    LOG.warn("[{}] Failed to deliver command {}, equipment session not found", inventoryId, command);
-                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE,
-                            "No session found for " + inventoryId, command, registeredGateway.getHostname(),
-                            registeredGateway.getPort()));
+                    ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "No session found for " + inventoryId, command,
+                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort()));
                    return;
                }

@@ -201,8 +199,7 @@ public class OpensyncCloudGatewayController {
                        ret.add(processRadioReboot(session, (CEGWRebootRequest) command));
                        break;
                    case ClientBlocklistChangeNotification:
-                        ret.add(sendClientBlocklistChangeNotification(session,
-                                (CEGWClientBlocklistChangeNotification) command));
+                        ret.add(sendClientBlocklistChangeNotification(session, (CEGWClientBlocklistChangeNotification) command));
                        break;
                    case NewChannelRequest:
                        ret.add(sendNewChannelRequest(session, (CEGWNewChannelRequest) command));
@@ -212,22 +209,20 @@ public class OpensyncCloudGatewayController {
                        break;
                    default:
                        LOG.warn("[{}] Failed to deliver command {}, unsupported command type", inventoryId, command);
-                        ret.add(new EquipmentCommandResponse(
-                                CEGWCommandResultCode.UnsupportedCommand, "Invalid command type ("
-                                        + command.getCommandType() + ") for equipment (" + inventoryId + ")",
-                                command, registeredGateway.getHostname(), registeredGateway.getPort()));
+                        ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
+                                "Invalid command type (" + command.getCommandType() + ") for equipment (" + inventoryId + ")", command,
+                                registeredGateway == null ? null : registeredGateway.getHostname(),
+                                registeredGateway == null ? -1 : registeredGateway.getPort()));
                }

            }

-
        });

        return ret;
    }

-    private EquipmentCommandResponse processFirmwareDownload(OvsdbSession session,
-            CEGWFirmwareDownloadRequest command) {
+    private EquipmentCommandResponse processFirmwareDownload(OvsdbSession session, CEGWFirmwareDownloadRequest command) {
        return sendMessage(session, command.getInventoryId(), command);
    }

@@ -259,19 +254,18 @@ public class OpensyncCloudGatewayController {
        if (null != command.getRoutingId()) {
            if (!command.getRoutingId().equals(session.getRoutingId())) {

-                LOG.info("[C:{} E:{} R:{}] Stale routing entry ({}) detected", session.getCustomerId(),
-                        command.getInventoryId(), session.getRoutingId(), command.getRoutingId());
+                LOG.info("[C:{} E:{} R:{}] Stale routing entry ({}) detected", session.getCustomerId(), command.getInventoryId(), session.getRoutingId(),
+                        command.getRoutingId());

-                return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "Inactive Route Identifer",
-                        command, registeredGateway.getHostname(), registeredGateway.getPort());
+                return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE, "Inactive Route Identifer", command,
+                        registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
            }
        }
        return new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Route active", command,
-                registeredGateway.getHostname(), registeredGateway.getPort());
+                registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
    }

-    private EquipmentCommandResponse sendConfigChangeNotification(OvsdbSession session,
-            CEGWConfigChangeNotification command) {
+    private EquipmentCommandResponse sendConfigChangeNotification(OvsdbSession session, CEGWConfigChangeNotification command) {

        return sendMessage(session, command.getInventoryId(), command);
    }
@@ -281,27 +275,24 @@ public class OpensyncCloudGatewayController {
            session.getOvsdbClient().shutdown();
        } catch (Exception e) {
            LOG.error("[{}] Failed to close session on CE: {}", command.getInventoryId(), e.getLocalizedMessage());
-            return new EquipmentCommandResponse(
-                    CEGWCommandResultCode.FailedToSend, "Failed to send command " + command.getCommandType() + " to "
-                            + command.getInventoryId() + ": " + e.getMessage(),
-                    command, registeredGateway.getHostname(), registeredGateway.getPort());
+            return new EquipmentCommandResponse(CEGWCommandResultCode.FailedToSend,
+                    "Failed to send command " + command.getCommandType() + " to " + command.getInventoryId() + ": " + e.getMessage(), command,
+                    registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
        }
        LOG.debug("[{}] Closed session to CE", command.getInventoryId());
-        return new EquipmentCommandResponse(CEGWCommandResultCode.Success,
-                "Closed session to " + command.getInventoryId(), command, registeredGateway.getHostname(),
-                registeredGateway.getPort());
+        return new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Closed session to " + command.getInventoryId(), command,
+                registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());

    }

-    private EquipmentCommandResponse sendClientBlocklistChangeNotification(OvsdbSession session,
-            CEGWClientBlocklistChangeNotification command) {
+    private EquipmentCommandResponse sendClientBlocklistChangeNotification(OvsdbSession session, CEGWClientBlocklistChangeNotification command) {
        return sendMessage(session, command.getInventoryId(), command);
    }

    private EquipmentCommandResponse sendNewChannelRequest(OvsdbSession session, CEGWNewChannelRequest command) {
        return sendMessage(session, command.getInventoryId(), command);
    }
-    
+
    private EquipmentCommandResponse sendCellSizeRequest(OvsdbSession session, CEGWCellSizeAttributesRequest command) {
        return sendMessage(session, command.getInventoryId(), command);
    }
@@ -317,15 +308,17 @@ public class OpensyncCloudGatewayController {
    private EquipmentCommandResponse sendMessage(OvsdbSession session, String inventoryId, EquipmentCommand command) {

        LOG.debug("Received command {} for {}", command.getCommandType(), inventoryId);
-        EquipmentCommandResponse response = new EquipmentCommandResponse(CEGWCommandResultCode.Success,
-                "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                registeredGateway.getHostname(), registeredGateway.getPort());
+        EquipmentCommandResponse response =
+                new EquipmentCommandResponse(CEGWCommandResultCode.Success, "Received Command " + command.getCommandType() + " for " + inventoryId, command,
+                        registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());

-        if (command instanceof CEGWConfigChangeNotification) {
+        if (command instanceof CEGWBlinkRequest) {
+            String resultDetails = tipwlanOvsdbClient.processBlinkRequest(inventoryId, ((CEGWBlinkRequest)command).getBlinkAllLEDs()); 
+            response.setResultDetail(resultDetails);
+        } else if (command instanceof CEGWConfigChangeNotification) {
            tipwlanOvsdbClient.processConfigChanged(inventoryId);
        } else if (command instanceof CEGWClientBlocklistChangeNotification) {
-            tipwlanOvsdbClient.processClientBlocklistChange(inventoryId,
-                    ((CEGWClientBlocklistChangeNotification) command).getBlockList());
+            tipwlanOvsdbClient.processClientBlocklistChange(inventoryId, ((CEGWClientBlocklistChangeNotification) command).getBlockList());
        } else if (command instanceof CEGWChangeRedirectorHost) {
            String newRedirectorAddress = ((CEGWChangeRedirectorHost) command).getRedirectorHost();
            tipwlanOvsdbClient.changeRedirectorHost(inventoryId, newRedirectorAddress);
@@ -340,7 +333,7 @@ public class OpensyncCloudGatewayController {
            Map<RadioType, Integer> newBackupChannels = request.getNewBackupChannels();
            Map<RadioType, Integer> newPrimaryChannels = request.getNewPrimaryChannels();

-            String resultDetails = tipwlanOvsdbClient.processNewChannelsRequest(inventoryId, newBackupChannels,newPrimaryChannels);
+            String resultDetails = tipwlanOvsdbClient.processNewChannelsRequest(inventoryId, newBackupChannels, newPrimaryChannels);
            response.setResultDetail(resultDetails);
        } else if (command instanceof CEGWCellSizeAttributesRequest) {
            CEGWCellSizeAttributesRequest request = (CEGWCellSizeAttributesRequest) command;
@@ -357,8 +350,7 @@ public class OpensyncCloudGatewayController {
            String firmwareVersion = dlRequest.getFirmwareVersion();
            String username = dlRequest.getUsername();

-            String resultDetails = tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion,
-                    username);
+            String resultDetails = tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion, username);

            response.setResultDetail(resultDetails);

@@ -370,15 +362,15 @@ public class OpensyncCloudGatewayController {
            flashRequest.getInventoryId();
            flashRequest.getUsername();

-            String resultDetails = tipwlanOvsdbClient.processFirmwareFlash(flashRequest.getInventoryId(),
-                    flashRequest.getFirmwareVersion(), flashRequest.getUsername());
+            String resultDetails =
+                    tipwlanOvsdbClient.processFirmwareFlash(flashRequest.getInventoryId(), flashRequest.getFirmwareVersion(), flashRequest.getUsername());

            response.setResultDetail(resultDetails);

        } else if (command instanceof CEGWRadioResetRequest) {
            response = new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
                    "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                    registeredGateway.getHostname(), registeredGateway.getPort());
+                    registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
        } else if (command instanceof CEGWRebootRequest) {

            CEGWRebootRequest rebootRequest = (CEGWRebootRequest) command;
@@ -402,10 +394,9 @@ public class OpensyncCloudGatewayController {
                default:
                    response = new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
                            "Received Command " + command.getCommandType() + " for " + inventoryId, command,
-                            registeredGateway.getHostname(), registeredGateway.getPort());
+                            registeredGateway == null ? null : registeredGateway.getHostname(), registeredGateway == null ? -1 : registeredGateway.getPort());
            }

-
        }

        return response;
@@ -423,15 +414,14 @@ public class OpensyncCloudGatewayController {
        return sendMessage(session, command.getInventoryId(), command);
    }

-
    private EquipmentCommandResponse processBlinkRequest(OvsdbSession session, CEGWBlinkRequest command) {

        return sendMessage(session, command.getInventoryId(), command);
    }

    @RequestMapping(value = "/commandWithUser", method = RequestMethod.POST)
-    public EquipmentCommandResponse sendCommandWithAuthUser(@RequestBody EquipmentCommand command,
-            @AuthenticationPrincipal Object requestUser, HttpServletRequest httpServletRequest) {
+    public EquipmentCommandResponse sendCommandWithAuthUser(@RequestBody EquipmentCommand command, @AuthenticationPrincipal Object requestUser,
+            HttpServletRequest httpServletRequest) {

        // use these properties to get address and port where request has
        // arrived
@@ -464,8 +454,7 @@ public class OpensyncCloudGatewayController {
            }

            if (eqRoutingSvc == null) {
-                throw new ConfigurationException(
-                        "Unable to register gateway with routing service: routing service interface not initialized");
+                throw new ConfigurationException("Unable to register gateway with routing service: routing service interface not initialized");
            }

            cleanupStaleGwRecord();
@@ -481,13 +470,11 @@ public class OpensyncCloudGatewayController {
                EquipmentGatewayRecord result = eqRoutingSvc.registerGateway(gwRecord);
                registeredGwId = result.getId();
                registeredGateway = result;
-                LOG.info("Successfully registered (name={}, id={}) with Routing Service", result.getHostname(),
-                        registeredGwId);
+                LOG.info("Successfully registered (name={}, id={}) with Routing Service", result.getHostname(), registeredGwId);
                registeredWithRoutingService = true;
            } catch (RuntimeException e) {
                // failed
-                LOG.error("Failed to register Customer Equipment Gateway (name={}) with Routing Service : {}",
-                        getGatewayName(), e.getLocalizedMessage());
+                LOG.error("Failed to register Customer Equipment Gateway (name={}) with Routing Service : {}", getGatewayName(), e.getLocalizedMessage());
            }
        }
    }
@@ -512,8 +499,7 @@ public class OpensyncCloudGatewayController {
                            eqRoutingSvc.deleteGateway(eqpRec.getId());
                        } catch (RuntimeException e) {
                            // failed
-                            LOG.error("Failed to delete Equipment Gateway (name={}) from Routing Service: {}",
-                                    eqpRec.getHostname(), e.getLocalizedMessage());
+                            LOG.error("Failed to delete Equipment Gateway (name={}) from Routing Service: {}", eqpRec.getHostname(), e.getLocalizedMessage());
                        }
                    } else {
                        LOG.debug("Gateway {} is reachable.", eqpRec.getHostname());
@@ -524,9 +510,8 @@ public class OpensyncCloudGatewayController {
            }
        } catch (Exception ex) { // Catching Exception to prevent crashing the
                                 // register thread
-            LOG.debug("Generic Exception encountered when trying to cleanup "
-                    + "the stale not-reachable GateWays. Continuing to register the new Gateway." + " Error: {} ",
-                    ex.getMessage());
+            LOG.debug("Generic Exception encountered when trying to cleanup " + "the stale not-reachable GateWays. Continuing to register the new Gateway."
+                    + " Error: {} ", ex.getMessage());
        }
    }

@@ -550,14 +535,13 @@ public class OpensyncCloudGatewayController {
        if (registeredWithRoutingService) {
            try {
                eqRoutingSvc.deleteGateway(registeredGwId);
-                LOG.info("Deregistered Customer Equipment Gateway (name={},id={}) with Routing Service",
-                        getGatewayName(), registeredGwId);
+                LOG.info("Deregistered Customer Equipment Gateway (name={},id={}) with Routing Service", getGatewayName(), registeredGwId);
                registeredGwId = -1;
                registeredGateway = null;
            } catch (Exception e) {
                // failed
-                LOG.error("Failed to deregister Customer Equipment Gateway (name={},id={}) with Routing Service: {}",
-                        getGatewayName(), registeredGwId, e.getLocalizedMessage());
+                LOG.error("Failed to deregister Customer Equipment Gateway (name={},id={}) with Routing Service: {}", getGatewayName(), registeredGwId,
+                        e.getLocalizedMessage());
            }
            registeredWithRoutingService = false;
        }
@@ -575,12 +559,10 @@ public class OpensyncCloudGatewayController {
     * @param equipmentId
     * @return associationId
     */
-    public EquipmentRoutingRecord registerCustomerEquipment(String equipmentName, Integer customerId,
-            Long equipmentId) {
+    public EquipmentRoutingRecord registerCustomerEquipment(String equipmentName, Integer customerId, Long equipmentId) {
        registerWithRoutingService();
        if (!registeredWithRoutingService) {
-            LOG.error("Unable to register customer equipement (name={},id={}): gateway not registered.", equipmentName,
-                    equipmentId);
+            LOG.error("Unable to register customer equipement (name={},id={}): gateway not registered.", equipmentName, equipmentId);
            return null;
        }
        // Clean up stale records
@@ -592,13 +574,11 @@ public class OpensyncCloudGatewayController {
        try {
            routingRecord = eqRoutingSvc.create(routingRecord);

-            LOG.debug("Registered customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId,
-                    routingRecord.getId());
+            LOG.debug("Registered customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId, routingRecord.getId());
            return routingRecord;

        } catch (Exception e) {
-            LOG.error("Failed to register customer equipement (name={},id={}): {}", equipmentName, equipmentId,
-                    e.getLocalizedMessage());
+            LOG.error("Failed to register customer equipement (name={},id={}): {}", equipmentName, equipmentId, e.getLocalizedMessage());
        }
        return null;
    }
@@ -611,7 +591,7 @@ public class OpensyncCloudGatewayController {
     * Gateway does not exist, delete the equipmentRouting entry.
     * 
     * @param equipmentId:
-     *            Equipment's ID
+     *        Equipment's ID
     */
    protected void cleanupStaleEqptRoutingRecord(Long equipmentId) {
        LOG.debug("In Clean Up stale Equipment Routing record for Equipment ID {}", equipmentId);
@@ -624,20 +604,17 @@ public class OpensyncCloudGatewayController {
                        if (gwRec != null) {
                            if (!isGwReachable(gwRec.getIpAddr(), gwRec.getPort())) {
                                // GW isn't reachable --> invoke unregister
-                                LOG.debug("Gateway {} is not-reachable... Deleting the equipment routing entry",
-                                        gwRec.getHostname());
+                                LOG.debug("Gateway {} is not-reachable... Deleting the equipment routing entry", gwRec.getHostname());
                                deleteUnresponiveGwRoutingRecord(eqRouting.getId(), equipmentId);
                            } else {
                                LOG.debug("Gateway {} is reachable.", gwRec.getHostname());
                            }
                        } else {
-                            LOG.debug("Gateway with ID {} not found. Deleting the equipment routing entry ",
-                                    eqRouting.getGatewayId());
+                            LOG.debug("Gateway with ID {} not found. Deleting the equipment routing entry ", eqRouting.getGatewayId());
                            deleteUnresponiveGwRoutingRecord(eqRouting.getId(), equipmentId);
                        }
                    } catch (DsEntityNotFoundException entityNotFoundException) {
-                        LOG.debug("Gateway ID: {} not found... Deleting the equipment routing entry",
-                                eqRouting.getGatewayId());
+                        LOG.debug("Gateway ID: {} not found... Deleting the equipment routing entry", eqRouting.getGatewayId());
                        deleteUnresponiveGwRoutingRecord(eqRouting.getId(), equipmentId);
                    }
                }
@@ -646,9 +623,10 @@ public class OpensyncCloudGatewayController {
            }
        } catch (Exception genericException) { // Catching Exception to prevent
                                               // crashing the register thread
-            LOG.debug("Generic Exception encountered when trying to cleanup "
-                    + "the stale routing records for equipment ID: {}. Continuing to register the new RoutingRecord."
-                    + " Error: {} ", equipmentId, genericException.getMessage());
+            LOG.debug(
+                    "Generic Exception encountered when trying to cleanup "
+                            + "the stale routing records for equipment ID: {}. Continuing to register the new RoutingRecord." + " Error: {} ",
+                    equipmentId, genericException.getMessage());
        }
    }

@@ -657,8 +635,7 @@ public class OpensyncCloudGatewayController {
            eqRoutingSvc.delete(routingId);
        } catch (RuntimeException e) {
            // failed
-            LOG.error("Failed to delete Equipment routing record (ID={}) from Routing Service: {}", eqptId,
-                    e.getLocalizedMessage());
+            LOG.error("Failed to delete Equipment routing record (ID={}) from Routing Service: {}", eqptId, e.getLocalizedMessage());
            return false;
        }
        return true;
@@ -666,18 +643,16 @@ public class OpensyncCloudGatewayController {

    public void deregisterCustomerEquipment(Long routingId, String equipmentName, Long equipmentId) {
        if (!registeredWithRoutingService) {
-            LOG.error("Unable to deregister customer equipement (name={},id={}): gateway not registered", equipmentName,
-                    equipmentId);
+            LOG.error("Unable to deregister customer equipement (name={},id={}): gateway not registered", equipmentName, equipmentId);
            return;
        }
        try {
-            LOG.debug("Deregistering customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId,
-                    routingId);
+            LOG.debug("Deregistering customer equipment (name={},id={}) with route id={}", equipmentName, equipmentId, routingId);

            eqRoutingSvc.delete(routingId);
        } catch (Exception e) {
-            LOG.error("Failed to deregister customer equipement (name={},id={}) with route id={}: {}", equipmentName,
-                    equipmentId, routingId, e.getLocalizedMessage());
+            LOG.error("Failed to deregister customer equipement (name={},id={}) with route id={}: {}", equipmentName, equipmentId, routingId,
+                    e.getLocalizedMessage());
        }
    }

--- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java
+++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java
@@ -6,6 +6,7 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -16,6 +17,7 @@ import java.util.Set;
 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.stereotype.Component;

 import com.google.protobuf.ByteString;
@@ -23,6 +25,12 @@ import com.google.protobuf.Descriptors;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
 import com.google.protobuf.util.JsonFormat.TypeRegistry;
+import com.telecominfraproject.wlan.alarm.AlarmServiceInterface;
+import com.telecominfraproject.wlan.alarm.models.Alarm;
+import com.telecominfraproject.wlan.alarm.models.AlarmCode;
+import com.telecominfraproject.wlan.alarm.models.AlarmDetails;
+import com.telecominfraproject.wlan.alarm.models.AlarmScopeType;
+import com.telecominfraproject.wlan.alarm.models.OriginatorType;
 import com.telecominfraproject.wlan.client.ClientServiceInterface;
 import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
 import com.telecominfraproject.wlan.client.session.models.AssociationState;
@@ -68,6 +76,7 @@ import com.telecominfraproject.wlan.servicemetric.models.ServiceMetric;
 import com.telecominfraproject.wlan.servicemetric.neighbourscan.models.NeighbourReport;
 import com.telecominfraproject.wlan.servicemetric.neighbourscan.models.NeighbourScanReports;
 import com.telecominfraproject.wlan.status.StatusServiceInterface;
+import com.telecominfraproject.wlan.status.equipment.models.EquipmentAdminStatusData;
 import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSID;
 import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSIDs;
 import com.telecominfraproject.wlan.status.equipment.report.models.EquipmentCapacityDetails;
@@ -133,43 +142,17 @@ public class MqttStatsPublisher {
    private CloudEventDispatcherInterface cloudEventDispatcherInterface;
    @Autowired
    private RealtimeEventPublisher realtimeEventPublisher;
+    @Autowired
+    private AlarmServiceInterface alarmServiceInterface;

-    public void processMqttMessage(String topic, WCStatsReport wcStatsReport) {
-        LOG.info("Received WCStatsReport {}", wcStatsReport.toString());
+    @Value("${tip.wlan.mqttStatsPublisher.temperatureThresholdInC:80}")
+    private int temperatureThresholdInC;

-        LOG.debug("Received report on topic {}", topic);
-        int customerId = extractCustomerIdFromTopic(topic);
+    @Value("${tip.wlan.mqttStatsPublisher.cpuUtilThresholdPct:80}")
+    private int cpuUtilThresholdPct;

-        long equipmentId = extractEquipmentIdFromTopic(topic);
-        if ((equipmentId <= 0) || (customerId <= 0)) {
-            LOG.warn("Cannot determine equipment ids from topic {} - customerId {} equipmentId {}", topic, customerId, equipmentId);
-            return;
-        }
-
-        String apId = extractApIdFromTopic(topic);
-
-        if (apId == null) {
-            LOG.warn("Cannot determine AP id from topic {} - customerId {} equipmentId {} apId {}", topic, customerId, equipmentId, apId);
-            return;
-        }
-
-        if (LOG.isTraceEnabled()) {
-            // prepare a JSONPrinter to format protobuf messages as
-            // json
-            List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
-            protobufDescriptors.addAll(IpDnsTelemetry.getDescriptor().getMessageTypes());
-            TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
-            JsonFormat.Printer jsonPrinter = JsonFormat.printer().preservingProtoFieldNames().includingDefaultValueFields().usingTypeRegistry(oldRegistry);
-
-            try {
-                LOG.trace("MQTT IpDnsTelemetry.wcStatsReport = {}", jsonPrinter.print(wcStatsReport));
-
-            } catch (InvalidProtocolBufferException e1) {
-                LOG.error("Couldn't parse IpDnsTelemetry.wcStatsReport.", e1);
-            }
-        }
-
-    }
+    @Value("${tip.wlan.mqttStatsPublisher.memoryUtilThresholdPct:70}")
+    private int memoryUtilThresholdPct;

    public void processMqttMessage(String topic, Report report) {
        LOG.info("Received report on topic {} for ap {}", topic, report.getNodeID());
@@ -180,9 +163,6 @@ public class MqttStatsPublisher {
            LOG.warn("Cannot determine equipment ids from topic {} - customerId {} equipmentId {}", topic, customerId, equipmentId);
            return;
        }
-
-        // gatewayController.updateActiveCustomer(customerId);
-
        Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
        if (ce == null) {
            LOG.warn("Cannot read equipment {}", apId);
@@ -192,21 +172,6 @@ public class MqttStatsPublisher {
        long locationId = ce.getLocationId();
        long profileId = ce.getProfileId();

-        // prepare a JSONPrinter to format protobuf messages as
-        // json
-        // List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
-        // protobufDescriptors.addAll(OpensyncStats.getDescriptor().getMessageTypes());
-        // TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
-        // JsonFormat.Printer jsonPrinter =
-        // JsonFormat.printer().preservingProtoFieldNames().includingDefaultValueFields().usingTypeRegistry(oldRegistry);
-        //
-        // try {
-        // LOG.trace(jsonPrinter.print(report));
-        //
-        // } catch (InvalidProtocolBufferException e1) {
-        // LOG.error("Couldn't parse OpensyncStats.report.", e1);
-        // }
-
        List<ServiceMetric> metricRecordList = new ArrayList<>();

        try {
@@ -222,62 +187,25 @@ public class MqttStatsPublisher {
                LOG.debug("Current timestamp for service metrics is {}", serviceMetricTimestamp);
                metricRecordList.stream().forEach(smr -> {
                    smr.setCreatedTimestamp(serviceMetricTimestamp);
-                    if (smr.getLocationId() == 0) smr.setLocationId(locationId);
-                    if(smr.getCustomerId() == 0) smr.setCustomerId(customerId);
-                    if (smr.getEquipmentId() == 0L) smr.setEquipmentId(equipmentId);
+                    if (smr.getLocationId() == 0)
+                        smr.setLocationId(locationId);
+                    if (smr.getCustomerId() == 0)
+                        smr.setCustomerId(customerId);
+                    if (smr.getEquipmentId() == 0L)
+                        smr.setEquipmentId(equipmentId);
                });
                metricRecordList.stream().forEach(smr -> {
                    LOG.debug("ServiceMetric {}", smr);
                });
                cloudEventDispatcherInterface.publishMetrics(metricRecordList);
            }
-            
            publishEvents(report, customerId, equipmentId, apId, locationId);
-            // handleRssiMetrics(metricRecordList, report, customerId,
-            // equipmentId, locationId);
-
        } catch (Exception e) {
            LOG.error("Exception when processing stats messages from AP", e);
        }

    }

-    public void processMqttMessage(String topic, FlowReport flowReport) {
-
-        LOG.info("Received report on topic {}", topic);
-        int customerId = extractCustomerIdFromTopic(topic);
-
-        long equipmentId = extractEquipmentIdFromTopic(topic);
-        if ((equipmentId <= 0) || (customerId <= 0)) {
-            LOG.warn("Cannot determine equipment ids from topic {} - customerId {} equipmentId {}", topic, customerId, equipmentId);
-            return;
-        }
-
-        String apId = extractApIdFromTopic(topic);
-
-        if (apId == null) {
-            LOG.warn("Cannot determine AP id from topic {} - customerId {} equipmentId {} apId {}", topic, customerId, equipmentId, apId);
-            return;
-        }
-
-        if (LOG.isTraceEnabled()) {
-            // prepare a JSONPrinter to format protobuf messages as
-            // json
-            List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
-            protobufDescriptors.addAll(NetworkMetadata.getDescriptor().getMessageTypes());
-            TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
-            JsonFormat.Printer jsonPrinter = JsonFormat.printer().preservingProtoFieldNames().includingDefaultValueFields().usingTypeRegistry(oldRegistry);
-
-            try {
-                LOG.trace("MQTT NetworkMetadata.flowReport = {}", jsonPrinter.print(flowReport));
-
-            } catch (InvalidProtocolBufferException e1) {
-                LOG.error("Couldn't parse NetworkMetadata.flowReport.", e1);
-            }
-        }
-
-    }
-
    public void publishSystemEventFromTableStateMonitor(SystemEvent event) {
        LOG.info("Publishing SystemEvent received by TableStateMonitor {}", event);
        cloudEventDispatcherInterface.publishEvent(event);
@@ -938,22 +866,43 @@ public class MqttStatsPublisher {
                        numSamples++;
                    }
                }
-
                if (numSamples > 0) {
                    avgRadioTemp = Math.round((cpuTemperature / numSamples));
                    apPerformance.setCpuTemperature(avgRadioTemp);
                }
+                if (avgRadioTemp > temperatureThresholdInC) {
+                    raiseDeviceThresholdAlarm(customerId, equipmentId, AlarmCode.CPUTemperature, deviceReport.getTimestampMs());
+                } else {
+                    // Clear any existing temperature alarms for this ap
+                    clearDeviceThresholdAlarm(customerId, equipmentId, AlarmCode.CPUTemperature);
+                }
            }

            if (deviceReport.hasCpuUtil() && deviceReport.getCpuUtil().hasCpuUtil()) {
                Integer cpuUtilization = deviceReport.getCpuUtil().getCpuUtil();
                apPerformance.setCpuUtilized(new int[] {cpuUtilization});
+                if (cpuUtilization > cpuUtilThresholdPct) {
+                    raiseDeviceThresholdAlarm(customerId, equipmentId, AlarmCode.CPUUtilization, deviceReport.getTimestampMs());
+                } else {
+                    // Clear any existing cpuUtilization alarms
+                    clearDeviceThresholdAlarm(customerId, equipmentId, AlarmCode.CPUUtilization);
+                }
            }

            apPerformance.setEthLinkState(EthernetLinkState.UP1000_FULL_DUPLEX);

            if (deviceReport.hasMemUtil() && deviceReport.getMemUtil().hasMemTotal() && deviceReport.getMemUtil().hasMemUsed()) {
                apPerformance.setFreeMemory(deviceReport.getMemUtil().getMemTotal() - deviceReport.getMemUtil().getMemUsed());
+
+                double usedMemory = deviceReport.getMemUtil().getMemUsed();
+                double totalMemory = deviceReport.getMemUtil().getMemTotal();
+                if (usedMemory/totalMemory * 100 > memoryUtilThresholdPct) {
+                    raiseDeviceThresholdAlarm(customerId, equipmentId, AlarmCode.MemoryUtilization, deviceReport.getTimestampMs());
+                } else {
+                    // Clear any existing cpuUtilization alarms
+                    clearDeviceThresholdAlarm(customerId, equipmentId, AlarmCode.MemoryUtilization);
+                }
+
            }
            apPerformance.setUpTime((long) deviceReport.getUptime());

@@ -964,9 +913,11 @@ public class MqttStatsPublisher {
            List<PerProcessUtilization> memPerProcess = new ArrayList<>();
            deviceReport.getPsMemUtilList().stream().forEach(c -> memPerProcess.add(new PerProcessUtilization(c.getPid(), c.getCmd(), c.getUtil())));
            apPerformance.setPsMemUtil(memPerProcess);
-
+            apPerformance.setSourceTimestampMs(deviceReport.getTimestampMs());
+            // The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats
+            if (apNodeMetrics.getSourceTimestampMs() < deviceReport.getTimestampMs())
+                apNodeMetrics.setSourceTimestampMs(deviceReport.getTimestampMs());
            updateDeviceStatusForReport(customerId, equipmentId, deviceReport, avgRadioTemp);
-
        }

        // statusList.add(status);
@@ -1063,6 +1014,11 @@ public class MqttStatsPublisher {
            radioStats.setNumRxDataFrames(rxFrames);
            radioStats.setNumRxErr(rxErrors);
            radioStats.setNumRxRetry(rxRetries);
+            radioStats.setSourceTimestampMs(clReport.getTimestampMs());
+
+            // The service metric report's sourceTimestamp will be the most recent timestamp from its contributing stats
+            if (apNodeMetrics.getSourceTimestampMs() < clReport.getTimestampMs())
+                apNodeMetrics.setSourceTimestampMs(clReport.getTimestampMs());

            apNodeMetrics.setRadioStats(radioType, radioStats);

@@ -1123,6 +1079,13 @@ public class MqttStatsPublisher {
                if (totalDurationMs > 0) {
                    RadioUtilization radioUtil = new RadioUtilization();
                    radioUtil.setTimestampSeconds((int) ((survey.getTimestampMs()) / 1000));
+                    radioUtil.setSourceTimestampMs(survey.getTimestampMs());
+
+                    // The service metric report's sourceTimestamp will be the most recent timestamp from its
+                    // contributing stats
+                    if (apNodeMetrics.getSourceTimestampMs() < survey.getTimestampMs())
+                        apNodeMetrics.setSourceTimestampMs(survey.getTimestampMs());
+
                    int pctBusyTx = busyTx / totalDurationMs;
                    checkIfOutOfBound("pctBusyTx", pctBusyTx, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);

@@ -1136,7 +1099,7 @@ public class MqttStatsPublisher {
                    int nonWifi = (busy - (busyTx + busyRx)) / totalDurationMs;
                    checkIfOutOfBound("nonWifi", nonWifi, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
                    radioUtil.setNonWifi(nonWifi);
-                    
+
                    int pctOBSSAndSelfErrors = (busyRx - busySelf) / totalDurationMs;
                    checkIfOutOfBound("OBSSAndSelfErrors", pctOBSSAndSelfErrors, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
                    radioUtil.setUnassocClientRx(pctOBSSAndSelfErrors);
@@ -1183,6 +1146,35 @@ public class MqttStatsPublisher {
        updateDeviceStatusRadioUtilizationReport(customerId, equipmentId, radioUtilizationReport);
    }

+    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());
+            LOG.info("Cleared device threshold alarm {}", alarm);
+        });
+    }
+
+    void raiseDeviceThresholdAlarm(int customerId, long equipmentId, AlarmCode alarmCode, long timestampMs) {
+        // Raise an alarm for temperature
+        Alarm alarm = new Alarm();
+        alarm.setCustomerId(customerId);
+        alarm.setEquipmentId(equipmentId);
+        alarm.setAlarmCode(alarmCode);
+        alarm.setOriginatorType(OriginatorType.AP);
+        alarm.setSeverity(alarmCode.getSeverity());
+        alarm.setScopeType(AlarmScopeType.EQUIPMENT);
+        alarm.setScopeId("" + equipmentId);
+        alarm.setCreatedTimestamp(timestampMs);
+        AlarmDetails alarmDetails = new AlarmDetails();
+        alarmDetails.setMessage(alarmCode.getDescription());
+        alarmDetails.setAffectedEquipmentIds(Collections.singletonList(equipmentId));
+        alarm.setDetails(alarmDetails);
+        List<Alarm> alarms = alarmServiceInterface.get(customerId, Set.of(equipmentId), Set.of(alarmCode));
+        if (alarms.isEmpty()) {
+            alarm.setCreatedTimestamp(timestampMs);
+            alarm = alarmServiceInterface.create(alarm);
+        } 
+    }
+    
    private void checkIfOutOfBound(String checkedType, int checkedValue, Survey survey, int totalDurationMs, int busyTx, int busyRx, int busy, int busySelf) {
        if (checkedValue > 100 || checkedValue < 0) {
            LOG.warn(
@@ -1284,6 +1276,8 @@ public class MqttStatsPublisher {

            NetworkProbeMetrics networkProbeMetrics = new NetworkProbeMetrics();

+            networkProbeMetrics.setSourceTimestampMs(networkProbe.getTimestampMs());
+
            List<DnsProbeMetric> dnsProbeResults = new ArrayList<>();
            if (networkProbe.hasDnsProbe()) {

@@ -1375,6 +1369,8 @@ public class MqttStatsPublisher {
        LOG.debug("updated status {}", status);
    }

+
+
    void populateApClientMetrics(List<ServiceMetric> metricRecordList, Report report, int customerId, long equipmentId, long locationId) {
        LOG.info("populateApClientMetrics for Customer {} Equipment {}", customerId, equipmentId);

@@ -1397,6 +1393,7 @@ public class MqttStatsPublisher {
                // clReport.getChannel();
                ClientMetrics cMetrics = new ClientMetrics();
                smr.setDetails(cMetrics);
+                cMetrics.setSourceTimestampMs(clReport.getTimestampMs());

                Integer periodLengthSec = 60; // matches what's configured by
                // OvsdbDao.configureStats(OvsdbClient)
@@ -1455,7 +1452,7 @@ public class MqttStatsPublisher {
                        cMetrics.setNumTxDropped((int) cl.getStats().getTxErrors());
                    }

-                    if (cl.getStats().hasRxFrames()) {
+                    if (cl.getStats().hasTxFrames()) {
                        cMetrics.setNumTxFramesTransmitted(cl.getStats().getTxFrames());
                    }

@@ -1479,10 +1476,10 @@ public class MqttStatsPublisher {

            ServiceMetric smr = new ServiceMetric(customerId, equipmentId);
            smr.setLocationId(locationId);
-
            metricRecordList.add(smr);
            NeighbourScanReports neighbourScanReports = new NeighbourScanReports();
            smr.setDetails(neighbourScanReports);
+            neighbourScanReports.setSourceTimestampMs(neighbor.getTimestampMs());

            List<NeighbourReport> neighbourReports = new ArrayList<>();
            neighbourScanReports.setNeighbourReports(neighbourReports);
@@ -1598,7 +1595,7 @@ public class MqttStatsPublisher {

            float rxBytesFv = Long.valueOf(client.getStats().getRxBytes()).floatValue();
            float rxBytesToMb = rxBytesFv / 125000F;
-            float txBytesFv = Long.valueOf(client.getStats().getRxBytes()).floatValue();
+            float txBytesFv = Long.valueOf(client.getStats().getTxBytes()).floatValue();
            float txBytesToMb = txBytesFv / 125000F;

            if (LOG.isDebugEnabled())
@@ -1631,6 +1628,10 @@ public class MqttStatsPublisher {

            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;
@@ -1651,7 +1652,7 @@ public class MqttStatsPublisher {

            SsidStatistics ssidStatistics = new SsidStatistics();
            // GET the Radio IF MAC (BSSID) from the activeBSSIDs
-
+            ssidStatistics.setSourceTimestampMs(clientReport.getTimestampMs());
            Status activeBssidsStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.ACTIVE_BSSIDS);
            if (activeBssidsStatus != null && activeBssidsStatus.getDetails() != null
                    && ((ActiveBSSIDs) activeBssidsStatus.getDetails()).getActiveBSSIDs() != null) {
@@ -1679,58 +1680,17 @@ public class MqttStatsPublisher {

                    rxBytes += client.getStats().getRxBytes();
                    txBytes += client.getStats().getTxBytes();
-                    txFrames += client.getStats().getRxFrames();
-                    rxFrames += client.getStats().getTxFrames();
+                    rxFrames += client.getStats().getRxFrames();
+                    txFrames += client.getStats().getTxFrames();
                    rxRetries += client.getStats().getRxRetries();
                    txRetries += client.getStats().getTxRetries();
                    rxErrors += client.getStats().getRxErrors();
                    txErrors += client.getStats().getTxErrors();
                    lastRssi = client.getStats().getRssi();

-                    try {
-
-                        if (client.hasConnected() && client.getConnected() && client.hasMacAddress()) {
-                            // update service_metrics_collection_config for
-                            // connected client
-                            ClientSession session =
-                                    handleClientSessionMetricsUpdate(customerId, equipmentId, locationId, radioType, clientReport.getTimestampMs(), client);
-                            if (session != null) {
-                                numConnectedClients += 1;
-                            }
-                        } else {
-                            // Make sure, if we have a session for this client,
-                            // it
-                            // shows disconnected.
-                            // update any service_metrics_collection_config that
-                            // need update if the
-                            // disconnect occured during this window
-                            if (client.hasMacAddress()) {
-                                ClientSession session =
-                                        clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(client.getMacAddress()));
-
-                                if (session != null) {
-
-                                    ClientSessionDetails latestSessionDetails = new ClientSessionDetails();
-
-                                    // could still be values from before
-                                    // disconnect occured.
-                                    latestSessionDetails.setMetricDetails(calculateClientSessionMetricDetails(client, clientReport.getTimestampMs()));
-
-                                    session.getDetails().mergeSession(latestSessionDetails);
-
-                                    clientServiceInterface.updateSession(session);
-
-                                }
-
-                            }
-
-                            continue; // not connected
-                        }
-
-                    } catch (Exception e) {
-                        LOG.error("Unabled to update client {}", client, e);
+                    if (client.hasConnected() && client.getConnected() && client.hasMacAddress()) {
+                        numConnectedClients += 1;
                    }
-
                }

            }
@@ -1818,8 +1778,9 @@ public class MqttStatsPublisher {
            smr.setCustomerId(customerId);
            smr.setEquipmentId(equipmentId);
            smr.setLocationId(locationId);
-
            ChannelInfoReports channelInfoReports = new ChannelInfoReports();
+            channelInfoReports.setSourceTimestampMs(survey.getTimestampMs());
+
            Map<RadioType, List<ChannelInfo>> channelInfoMap = channelInfoReports.getChannelInformationReportsPerRadio();

            RadioType radioType = null;
--- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/RealtimeEventPublisher.java
+++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/RealtimeEventPublisher.java
@@ -84,7 +84,7 @@ public class RealtimeEventPublisher {

    @Autowired
    private EquipmentServiceInterface equipmentServiceInterface;
-    
+
    @Autowired
    private ProfileServiceInterface  profileServiceInterface;

@@ -262,7 +262,7 @@ public class RealtimeEventPublisher {
        clientEvent.setEquipmentId(equipmentId);
        clientEvent.setLocationId(locationId);

-        LOG.info("publishing client event {} to cloud", clientEvent);
+        LOG.info("Publishing client event {} to cloud", clientEvent);
        cloudEventDispatcherInterface.publishEvent(clientEvent);

    }
@@ -380,7 +380,7 @@ public class RealtimeEventPublisher {
        if (clientAssocEvent.hasUsing11V()) {
            clientEvent.setUsing11v(clientAssocEvent.getUsing11V());
        }
-        
+
        clientEvent.setEventTimestamp(clientAssocEvent.getTimestampMs());
        clientEvent.setCustomerId(customerId);
        clientEvent.setEquipmentId(equipmentId);
--- a/opensync-ext-cloud/src/test/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloudTest.java
+++ b/opensync-ext-cloud/src/test/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloudTest.java
@@ -170,10 +170,12 @@ public class OpensyncExternalIntegrationCloudTest {
        Location location = new Location();
        location.setId(8L);
        location.setCustomerId(2);
-        location.setDetails(LocationDetails.createWithDefaults());
+        LocationDetails details = LocationDetails.createWithDefaults();
+        details.setCountryCode(CountryCode.CA);
+        location.setDetails(details);
        location.setName("Location-UT");
        location.setLocationType(LocationType.BUILDING);
-
+        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
        Customer customer = new Customer();
        customer.setId(2);
        CustomerDetails customerDetails = new CustomerDetails();
@@ -239,7 +241,7 @@ public class OpensyncExternalIntegrationCloudTest {


        Mockito.verify(firmwareServiceInterface).getDefaultCustomerTrackSetting();
-        Mockito.verifyNoInteractions(locationServiceInterface);
+        Mockito.verify(locationServiceInterface).get(8L);

    }

@@ -248,10 +250,11 @@ public class OpensyncExternalIntegrationCloudTest {
        Location location = new Location();
        location.setId(8L);
        location.setCustomerId(2);
-        location.setDetails(LocationDetails.createWithDefaults());
+        LocationDetails details = LocationDetails.createWithDefaults();
+        details.setCountryCode(CountryCode.CA);
+        location.setDetails(details);
        location.setName("Location-UT");
        location.setLocationType(LocationType.BUILDING);
-
        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);

        Customer customer = new Customer();
@@ -339,7 +342,7 @@ public class OpensyncExternalIntegrationCloudTest {
        Mockito.verify(customerServiceInterface).getOrNull(ArgumentMatchers.anyInt());
        Mockito.verify(equipmentServiceInterface).getByInventoryIdOrNull("Test_Client_21P10C68818122");
        Mockito.verify(firmwareServiceInterface).getDefaultCustomerTrackSetting();
-        Mockito.verify(locationServiceInterface).get(ArgumentMatchers.anyLong());
+        Mockito.verify(locationServiceInterface,  Mockito.times(2)).get(ArgumentMatchers.anyLong());

    }

@@ -361,9 +364,12 @@ public class OpensyncExternalIntegrationCloudTest {
        Location location = new Location();
        location.setId(8L);
        location.setCustomerId(2);
-        location.setDetails(LocationDetails.createWithDefaults());
+        LocationDetails details = LocationDetails.createWithDefaults();
+        details.setCountryCode(CountryCode.CA);
+        location.setDetails(details);
        location.setName("Location-UT");
        location.setLocationType(LocationType.BUILDING);
+        Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);

        Equipment equipment = new Equipment();
        equipment.setCustomerId(2);
--- a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java
+++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java
@@ -38,10 +38,6 @@ public interface OpensyncExternalIntegrationInterface {

    void processMqttMessage(String topic, Report report);

-    void processMqttMessage(String topic, FlowReport flowReport);
-
-    void processMqttMessage(String topic, WCStatsReport wcStatsReport);
-
    void wifiAssociatedClientsDbTableUpdate(List<OpensyncWifiAssociatedClients> wifiAssociatedClients, String apId);

    void wifiAssociatedClientsDbTableDelete(String deletedClientMac, String apId);
--- a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbClientInterface.java
+++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbClientInterface.java
@@ -17,6 +17,8 @@ public interface OvsdbClientInterface {
    String startDebugEngine(String apId, String gatewayHostname, Integer gatewayPort);

    String stopDebugEngine(String apId);
+    
+    String processBlinkRequest(String apId, boolean blinkAllLEDs);

    void processConfigChanged(String apId);

--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
@@ -1,3 +1,4 @@
+
 package com.telecominfraproject.wlan.opensync.mqtt;

 import java.nio.charset.Charset;
@@ -5,11 +6,15 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

-import org.fusesource.mqtt.client.FutureConnection;
+import org.fusesource.mqtt.client.BlockingConnection;
 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;
@@ -37,10 +42,6 @@ import com.telecominfraproject.wlan.opensync.util.ZlibUtil;

 import sts.OpensyncStats;
 import sts.OpensyncStats.Report;
-import traffic.NetworkMetadata;
-import traffic.NetworkMetadata.FlowReport;
-import wc.stats.IpDnsTelemetry;
-import wc.stats.IpDnsTelemetry.WCStatsReport;

@Profile("mqtt_receiver")
@Component
@@ -54,15 +55,11 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven

    private final TagList tags = CloudMetricsTags.commonTags;

-    private final Counter messagesReceived = new BasicCounter(
-            MonitorConfig.builder("osgw-mqtt-messagesReceived").withTags(tags).build());
+    private final Counter messagesReceived = new BasicCounter(MonitorConfig.builder("osgw-mqtt-messagesReceived").withTags(tags).build());

-    private final Counter messageBytesReceived = new BasicCounter(
-            MonitorConfig.builder("osgw-mqtt-messageBytesReceived").withTags(tags).build());
-    
-    private final Timer timerMessageProcess = new BasicTimer(
-            MonitorConfig.builder("osgw-mqtt-messageProcessTimer").withTags(tags).build());
+    private final Counter messageBytesReceived = new BasicCounter(MonitorConfig.builder("osgw-mqtt-messageBytesReceived").withTags(tags).build());

+    private final Timer timerMessageProcess = new BasicTimer(MonitorConfig.builder("osgw-mqtt-messageProcessTimer").withTags(tags).build());

    @Autowired
    private OpensyncExternalIntegrationInterface extIntegrationInterface;
@@ -85,8 +82,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven

    public OpensyncMqttClient(@Autowired io.netty.handler.ssl.SslContext sslContext,
            @Value("${tip.wlan.mqttBroker.address.internal:testportal.123wlan.com}") String mqttBrokerAddress,
-            @Value("${tip.wlan.mqttBroker.listenPort:1883}") int mqttBrokerListenPort,
-            @Value("${tip.wlan.mqttBroker.user:admin}") String username,
+            @Value("${tip.wlan.mqttBroker.listenPort:1883}") int mqttBrokerListenPort, @Value("${tip.wlan.mqttBroker.user:admin}") String username,
            @Value("${tip.wlan.mqttBroker.password:admin}") String password,
            @Value("${mqtt.javax.net.ssl.keyStore:/opt/tip-wlan/certs/client_keystore.jks}") String jdkKeyStoreLocation,
            @Value("${mqtt.javax.net.ssl.keyStorePassword:mypassword}") String jdkKeyStorePassword,
@@ -114,7 +110,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
            @Override
            public void run() {
                while (keepReconnecting) {
-                    FutureConnection futureConnection = null;
+                    BlockingConnection blockingConnection = null;
                    try {
                        Thread.sleep(5000);

@@ -144,24 +140,46 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
                         */

                        MQTT mqtt = new MQTT();
-                        // mqtt.setHost("tcp://192.168.0.137:61616");
                        mqtt.setHost("tls://" + mqttBrokerAddress + ":" + mqttBrokerListenPort);
                        LOG.info("Connecting to MQTT broker at {}", mqtt.getHost());
                        mqtt.setClientId("opensync_mqtt");
                        mqtt.setUserName(username);
                        mqtt.setPassword(password);
-                        // Note: the following does not work with the
-                        // serverContext,
-                        // it has to be the
-                        // clientContext
-                        // mqtt.setSslContext(((JdkSslContext)
-                        // sslContext).context());
-                        // For now we'll rely on regular SSLContext from the JDK
+                        mqtt.setTracer(new Tracer() {
+                            @Override
+                            public void onReceive(MQTTFrame frame) {
+                                switch (frame.messageType()) {
+                                    case PINGREQ.TYPE:
+                                    case PINGRESP.TYPE:
+                                        // PINGs don't want to fill log
+                                        LOG.trace("MQTT Client Received: {}", frame);
+                                        break;
+                                    default:
+                                        LOG.debug("MQTT Client Received: {}", frame);
+                                }
+                            }

-                        // TODO: revisit this blocking connection, change it to
-                        // futureConnection
-                        futureConnection = mqtt.futureConnection();
-                        futureConnection.connect();
+                            @Override
+                            public void onSend(MQTTFrame frame) {
+                                switch (frame.messageType()) {
+                                    case PINGREQ.TYPE:
+                                    case PINGRESP.TYPE:
+                                        // PINGs don't want to fill log
+                                        LOG.trace("MQTT Client Sent: {}", frame);
+                                        break;
+                                    default:
+                                        LOG.debug("MQTT Client Sent: {}", frame);
+                                }
+                            }
+
+                            @Override
+                            public void debug(String message, Object... args) {
+                                LOG.debug("MQTT Client debugging messages: {}", String.format(message, args));
+                            }
+                        });
+
+                        blockingConnection = mqtt.blockingConnection();
+                        blockingConnection.connect();

                        LOG.info("Connected to MQTT broker at {}", mqtt.getHost());

@@ -171,24 +189,22 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
                        // new Topic("#", QoS.AT_LEAST_ONCE),
                        // new Topic("test/#", QoS.EXACTLY_ONCE),
                        // new Topic("foo/+/bar", QoS.AT_LEAST_ONCE)
-                        Topic[] topics = { new Topic("#", QoS.AT_LEAST_ONCE), };
+                        Topic[] topics = {new Topic("#", QoS.AT_LEAST_ONCE),};

-                        futureConnection.subscribe(topics);
+                        blockingConnection.subscribe(topics);
                        LOG.info("Subscribed to mqtt topics {}", Arrays.asList(topics));

                        // prepare a JSONPrinter to format protobuf messages as
                        // json
                        List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
                        protobufDescriptors.addAll(OpensyncStats.getDescriptor().getMessageTypes());
-                        protobufDescriptors.addAll(IpDnsTelemetry.getDescriptor().getMessageTypes());
-                        protobufDescriptors.addAll(NetworkMetadata.getDescriptor().getMessageTypes());
                        TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
-                        JsonFormat.Printer jsonPrinter = JsonFormat.printer().includingDefaultValueFields()
-                                .omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry);
+                        JsonFormat.Printer jsonPrinter =
+                                JsonFormat.printer().includingDefaultValueFields().omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry);

                        // main loop - receive messages
                        while (true) {
-                            Message mqttMsg = futureConnection.receive().await();
+                            Message mqttMsg = blockingConnection.receive();

                            if (mqttMsg == null) {
                                continue;
@@ -197,23 +213,11 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
                            LOG.debug("MQTT Topic {}", mqttMsg.getTopic());

                            byte payload[] = mqttMsg.getPayload();
-                            // we acknowledge right after receive because:
-                            // a. none of the stats messages are so important
-                            // that
-                            // we cannot skip one
-                            // b. if there's some kind of problem with the
-                            // message
-                            // (decoding or processing)
-                            // - we want to move on as quickly as possible and
-                            // not
-                            // let it get stuck in the
-                            // queue
-                            mqttMsg.ack();

                            messagesReceived.increment();
                            messageBytesReceived.increment(payload.length);
                            Stopwatch stopwatchTimerMessageProcess = timerMessageProcess.start();
-                            
+
                            LOG.trace("received message on topic {} size {}", mqttMsg.getTopic(), payload.length);

                            if (payload[0] == 0x78) {
@@ -223,60 +227,27 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
                                payload = ZlibUtil.decompress(payload);
                            }

-
                            // attempt to parse the message as protobuf
                            MessageOrBuilder encodedMsg = null;
                            try {
-
+                                // Only supported protobuf on the TIP opensync APs is Report
                                encodedMsg = Report.parseFrom(payload);
-
-                                MQTT_LOG.info("topic = {} Report = {}", mqttMsg.getTopic(),
-                                        jsonPrinter.print(encodedMsg));
-
+                                mqttMsg.ack();
+                                MQTT_LOG.info("topic = {}\nReport = {}", mqttMsg.getTopic(), jsonPrinter.print(encodedMsg));
                                extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), (Report) encodedMsg);
-
                            } catch (Exception e) {
-                                try {
-                                    // not a opensync_stats report, attempt to
-                                    // deserialize as network_metadata
-                                    encodedMsg = FlowReport.parseFrom(payload);
-
-                                    MQTT_LOG.info("topic = {} FlowReport = {}", mqttMsg.getTopic(),
-                                            jsonPrinter.print(encodedMsg));
-
-                                    extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(),
-                                            (FlowReport) encodedMsg);
-                                } catch (Exception e1) {
-
-                                    try {
-                                        // not a opensync_stats report and not
-                                        // network_metadata report, attempt to
-                                        // deserialize as WCStatsReport
-                                        encodedMsg = WCStatsReport.parseFrom(payload);
-
-                                        MQTT_LOG.info("topic = {} IpDnsTelemetry = {}", mqttMsg.getTopic(),
-                                                jsonPrinter.print(encodedMsg));
-
-
-                                        extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(),
-                                                (WCStatsReport) encodedMsg);
-                                    } catch (Exception e2) {
-                                        String msgStr = new String(mqttMsg.getPayload(), utf8);
-                                        MQTT_LOG.info("topic = {} message = {}", mqttMsg.getTopic(), msgStr);
-                                    }
-                                }
+                                String msgStr = new String(mqttMsg.getPayload(), utf8);
+                                LOG.warn("Could not process message topic = {}\nmessage = {}", mqttMsg.getTopic(), msgStr);
                            } finally {
                                stopwatchTimerMessageProcess.stop();
                            }
-
                        }
-
                    } catch (Exception e) {
                        LOG.error("Exception in MQTT receiver", e);
                    } finally {
                        try {
-                            if (futureConnection != null) {
-                                futureConnection.disconnect();
+                            if (blockingConnection != null) {
+                                blockingConnection.disconnect();
                            }
                        } catch (Exception e1) {
                            // do nothing
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
@@ -287,6 +287,15 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {

        return ovsdbDao.changeRedirectorAddress(ovsdbSession.getOvsdbClient(), apId, newRedirectorAddress);
    }
+    
+    public String processBlinkRequest(String apId, boolean blinkAllLEDs) {
+        OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
+        if (ovsdbSession == null) {
+            throw new IllegalStateException("AP with id " + apId + " is not connected");
+        }
+
+        return ovsdbDao.processBlinkRequest(ovsdbSession.getOvsdbClient(), apId, blinkAllLEDs);
+    }

    @Override
    public void processConfigChanged(String apId) {
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
@@ -237,4 +237,8 @@ public class OvsdbDao extends OvsdbDaoBase {
        ovsdbStats.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
    }

+    public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
+        return ovsdbNodeConfig.processBlinkRequest(ovsdbClient,apId,blinkAllLEDs);
+    }
+
 }
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoBase.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoBase.java
@@ -265,7 +265,7 @@ public class OvsdbDaoBase {
        }
    }

-    void fillInRadioInterfaceNames(OvsdbClient ovsdbClient, ConnectNodeInfo ret) {
+    void fillInRadioInterfaceNamesAndCountry(OvsdbClient ovsdbClient, ConnectNodeInfo ret) {
        try {
            List<Operation> operations = new ArrayList<>();
            List<Condition> conditions = new ArrayList<>();
@@ -273,6 +273,7 @@ public class OvsdbDaoBase {

            columns.add("freq_band");
            columns.add("if_name");
+            columns.add("country");

            operations.add(new Select(wifiRadioStateDbTable, conditions, columns));
            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
@@ -292,6 +293,7 @@ public class OvsdbDaoBase {
                for (Row row : ((SelectResult) result[0]).getRows()) {
                    ret.wifiRadioStates.put(getSingleValueFromSet(row, "freq_band"),
                            getSingleValueFromSet(row, "if_name"));
+                    ret.country = getSingleValueFromSet(row, "country");

                }

--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNode.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNode.java
@@ -238,7 +238,7 @@ public class OvsdbNode extends OvsdbDaoBase {
            }
            fillInLanIpAddressAndMac(ovsdbClient, ret, defaultLanInterfaceType);

-            fillInRadioInterfaceNames(ovsdbClient, ret);
+            fillInRadioInterfaceNamesAndCountry(ovsdbClient, ret);

        } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
            throw new RuntimeException(e);
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNodeConfig.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNodeConfig.java
@@ -25,6 +25,7 @@ import com.vmware.ovsdb.protocol.operation.notation.Condition;
 import com.vmware.ovsdb.protocol.operation.notation.Function;
 import com.vmware.ovsdb.protocol.operation.notation.Row;
 import com.vmware.ovsdb.protocol.operation.notation.Value;
+import com.vmware.ovsdb.protocol.operation.result.InsertResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
 import com.vmware.ovsdb.service.OvsdbClient;
@@ -59,18 +60,17 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {

    public void configureSyslog(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
        // /usr/opensync/tools/ovsh insert Node_Config module:="syslog" key:="remote" value:="udp:192.168.178.9:1000:4"
-        // The format is a colon delimited list.  log_proto:log_ip:log_port:log_priority
+        // The format is a colon delimited list. log_proto:log_ip:log_port:log_priority
        try {
            ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile().getDetails();
-            if (apNetworkConfig.getSyslogRelay() == null ) {
+            if (apNetworkConfig.getSyslogRelay() == null) {
                LOG.info("Cannot configure syslog to null value. {}", apNetworkConfig);
                return;
            }
-            
+
            if (apNetworkConfig.getSyslogRelay().isEnabled()) {
-                
-                if (apNetworkConfig.getSyslogRelay().getSrvHostIp() == null
-                    || apNetworkConfig.getSyslogRelay().getSeverity() == null) {
+
+                if (apNetworkConfig.getSyslogRelay().getSrvHostIp() == null || apNetworkConfig.getSyslogRelay().getSeverity() == null) {
                    LOG.info("Cannot configure syslog remote_logging without SrvHostIp and Severity values. {}", apNetworkConfig);
                    return;
                }
@@ -78,8 +78,8 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
                Map<String, Value> columns = new HashMap<>();
                columns.put("key", new Atom<>("remote"));
                columns.put("module", new Atom<>("syslog"));
-                String delimitedValue = "udp:" + apNetworkConfig.getSyslogRelay().getSrvHostIp().getHostAddress() + ":" + String
-                        .valueOf(apNetworkConfig.getSyslogRelay().getSrvHostPort() + ":" +String.valueOf(apNetworkConfig.getSyslogRelay().getSeverity().getId()));
+                String delimitedValue = "udp:" + apNetworkConfig.getSyslogRelay().getSrvHostIp().getHostAddress() + ":" + String.valueOf(
+                        apNetworkConfig.getSyslogRelay().getSrvHostPort() + ":" + String.valueOf(apNetworkConfig.getSyslogRelay().getSeverity().getId()));
                columns.put("value", new Atom<>(delimitedValue));
                List<Operation> operations = new ArrayList<>();
                operations.add(new Update(nodeConfigTable, List.of(new Condition("module", Function.EQUALS, new Atom<>("syslog"))), new Row(columns)));
@@ -119,4 +119,52 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
        }

    }
+
+    public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
+
+        String ret = null;
+        try {
+
+            LOG.debug("processBlinkRequest set BlinkLEDs to {}", blinkAllLEDs);
+            Map<String, Value> columns = new HashMap<>();
+            if (blinkAllLEDs) {
+                columns.put("module", new Atom<>("led"));
+                columns.put("key", new Atom<>("led_blink"));
+                columns.put("value", new Atom<>("on"));
+            } else {
+                columns.put("module", new Atom<>("led"));
+                columns.put("key", new Atom<>("led_off"));
+                columns.put("value", new Atom<>("off"));
+            }
+            List<Operation> operations = new ArrayList<>();
+            operations.add(new Update(nodeConfigTable, List.of(new Condition("module", Function.EQUALS, new Atom<>("led"))), new Row(columns)));
+            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
+            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+            long numUpdates = 0;
+            for (OperationResult res : result) {
+                if (res instanceof UpdateResult) {
+                    numUpdates += ((UpdateResult) res).getCount();
+                    LOG.debug("processBlinkRequest update result {}", res);
+                    ret = "processBlinkRequest update result " + res;
+                }
+            }
+            if (numUpdates == 0) {
+                // no records existed, insert the row instead
+                operations.clear();
+                operations.add(new Insert(nodeConfigTable, new Row(columns)));
+                fResult = ovsdbClient.transact(ovsdbName, operations);
+                result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+                for (OperationResult res : result) {
+                    if (res instanceof InsertResult) {
+                        LOG.debug("processBlinkRequest insert result {}", res);
+                        ret = "processBlinkRequest insert result " + res;
+                    }
+                }
+            }
+            
+            return ret;
+        } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRadioConfig.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRadioConfig.java
@@ -218,10 +218,9 @@ public class OvsdbRadioConfig extends OvsdbDaoBase {
            case modeN:
                hwMode = "11n";
                break;
-            //     case auto:
-                // TODO: enable when AP supports
-                //                hwMode = "auto";
-                //                break;
+            case auto:
+                hwMode = "auto";
+                break;
            default:
        }
        return hwMode;
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRadiusProxyConfig.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRadiusProxyConfig.java
@@ -28,6 +28,7 @@ import com.vmware.ovsdb.protocol.operation.notation.Value;
 import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
+import com.vmware.ovsdb.protocol.schema.DatabaseSchema;
 import com.vmware.ovsdb.service.OvsdbClient;

@Component
@@ -66,52 +67,77 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
        }
    }

-    // _version "uuid"
-    // server "string"
-    // realm {"key":{"maxLength":256,"type":"string"},"max":16,"min":0}
-    // port "integer"
-    // client_cert {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
-    // radsec "boolean"
-    // acct_server {"key":"string","min":0}
-    // radius_config_name "string"
-    // passphrase {"key":{"maxLength":128,"type":"string"},"min":0}
-    // acct_secret {"key":"string","min":0}
-    // acct_port {"key":"integer","min":0}
-    // _uuid "uuid"
-    // secret "string"
-    // ca_cert {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
-    // client_key {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
+    /*
+     * root@OpenAp-ab1f4d:~# ovsdb-client list-columns Radius_Proxy_Config
+     * 
+     * Column Type
+     * ------------------ ---------------------------------------------------------------
+     * realm {"key":{"maxLength":256,"type":"string"},"max":16,"min":0}
+     * radius_config_name "string"
+     * _uuid "uuid"
+     * acct_port {"key":"integer","min":0}
+     * client_key {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
+     * server "string"
+     * _version "uuid"
+     * port "integer"
+     * radsec "boolean"
+     * client_cert {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
+     * acct_server {"key":"string","min":0}
+     * passphrase {"key":{"maxLength":128,"type":"string"},"min":0}
+     * acct_secret {"key":"string","min":0}
+     * ca_cert {"key":{"maxLength":256,"minLength":1,"type":"string"},"min":0}
+     * auto_discover "boolean"
+     * secret "string"
+     */
    private void configureRadiusServers(OvsdbClient ovsdbClient, OpensyncAPConfig apConfig, List<Operation> operations)
            throws OvsdbClientException, InterruptedException, ExecutionException, TimeoutException {

+        // TODO: remove the schema check when AP load available
+        DatabaseSchema databaseSchema = ovsdbClient.getSchema(ovsdbName).get();
+
        for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) apConfig.getApProfile().getDetails()).getRadiusProxyConfigurations()) {
            Map<String, Value> updateColumns = new HashMap<>();
-            updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
-            getCertificateUrls(rsc, updateColumns);
-            updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
-            updateColumns.put("passphrase", new Atom<>(rsc.getPassphrase()));
-            updateColumns.put("port", new Atom<>(rsc.getPort()));
-            updateColumns.put("realm", Set.of(rsc.getRealm()));
-            updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
-
-            java.util.Set<String> columnKeys = ovsdbClient.getSchema(ovsdbName).get().getTables().get(radiusConfigDbTable).getColumns().keySet();
-
-            if (columnKeys.contains("acct_server") && columnKeys.contains("acct_secret") && columnKeys.contains("acct_port") && columnKeys.contains("secret")) {
-                
-                if (rsc.getAcctServer() != null) {
-                    updateColumns.put("acct_server", new Atom<>(rsc.getAcctServer().getHostAddress()));
+            if (rsc.getServer() != null)
+                updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
+            if (rsc.getName() != null)
+                updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
+            if (rsc.getPort() != null)
+                updateColumns.put("port", new Atom<>(rsc.getPort()));
+            if (rsc.getRealm() != null)
+                updateColumns.put("realm", Set.of(rsc.getRealm()));
+            if (rsc.getUseRadSec() != null) {
+                updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
+                if (rsc.getUseRadSec()) {
+                    getCertificateUrls(rsc, updateColumns);
+                    updateColumns.put("passphrase", new Atom<>(rsc.getPassphrase()));
                }
-                
-                if (rsc.getSharedSecret() != null) {
-                    updateColumns.put("secret", new Atom<>(rsc.getSharedSecret()));
-                    updateColumns.put("acct_secret", new Atom<>(rsc.getSharedSecret()));
+            }
+            if (rsc.getSharedSecret() != null)
+                updateColumns.put("secret", new Atom<>(rsc.getSharedSecret()));
+            if (rsc.getAcctServer() != null) {
+                updateColumns.put("acct_server", new Atom<>(rsc.getAcctServer().getHostAddress()));
+            }
+            if (rsc.getSharedSecret() != null) {
+                updateColumns.put("acct_secret", new Atom<>(rsc.getSharedSecret()));
+            }
+            if (rsc.getAcctPort() != null) {
+                updateColumns.put("acct_port", new Atom<>(rsc.getAcctPort()));
+            }
+            if (databaseSchema.getTables().get(radiusConfigDbTable).getColumns().containsKey("auto_discover")) {
+                if (rsc.getUseRadSec() != null && rsc.getUseRadSec() && rsc.getDynamicDiscovery() != null &&  rsc.getDynamicDiscovery()) {
+                    // if useRadSec && dynamicDiscovery enabled, do not send server information
+                    updateColumns.put("auto_discover", new Atom<>(true));
+                    updateColumns.remove("acct_server");
+                    updateColumns.remove("acct_secret");
+                    updateColumns.remove("acct_port");
+                    updateColumns.remove("server");
+                    updateColumns.remove("port");
+                    updateColumns.remove("secret");
+                } else {
+                    // if !useRadSec, auto_discover is false regardless of it's desired setting
+                    // retain server information
+                    updateColumns.put("auto_discover", new Atom<>(false));
                }
-                
-                if (rsc.getAcctPort() != null) {
-                    updateColumns.put("acct_port", new Atom<>(rsc.getAcctPort()));
-                }
-                
-                
            }
            Row row = new Row(updateColumns);
            operations.add(new Insert(radiusConfigDbTable, row));
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java
@@ -445,7 +445,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                if (radioConfiguration != null) {
                    dtimPeriod = radioConfiguration.getDtimPeriod();
                    uapsdEnabled = radioConfiguration.getUapsdState() == StateSetting.enabled;
-                    apBridge = radioConfiguration.getStationIsolation() == StateSetting.disabled; // stationIsolation
+                    if (ssidConfig.getNoLocalSubnets()) apBridge = false; // no local access
                }

                String minHwMode = "11n"; // min_hw_mode is 11n
@@ -643,10 +643,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                if ((ssidConfig.getCaptivePortalId() == profileCaptive.getId()) && (profileCaptive.getDetails() != null)) {
                    CaptivePortalConfiguration captiveProfileDetails = ((CaptivePortalConfiguration) profileCaptive.getDetails());

-                    // +#define SCHEMA_CONSTS_PAGE_TITLE "page_title"
                    if (captiveProfileDetails.getBrowserTitle() != null) {
                        captiveMap.put("session_timeout", String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
-                        captiveMap.put("page_title", captiveProfileDetails.getBrowserTitle());
                    }
                    if (captiveProfileDetails.getAuthenticationType().equals(CaptivePortalAuthenticationType.radius)) {
                        Optional<Profile> optional =
@@ -763,6 +761,9 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
            case "wpa3MixedEAP":
                opensyncSecurityMode = "WPA3-EAP";
                break;
+            case "wpa3OnlyEAP192":
+                opensyncSecurityMode = "WPA3-EAP-192";
+                break;
        }
        return opensyncSecurityMode;
    }
@@ -781,15 +782,10 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
            RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
            RadiusServer rServer = profileDetails.getPrimaryRadiusAccountingServer();
            if (rServer != null) {
-                if (ssidConfig.getUseRadiusProxy()) {
-                    security.put("radius_acct_ip", "127.0.0.1");
-                    security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
-                    security.put("radius_acct_secret", "secret");
-                } else {
-                    security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
-                    security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
-                    security.put("radius_acct_secret", rServer.getSecret());
-                }
+                security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
+                security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
+                security.put("radius_acct_secret", rServer.getSecret());
+
                if (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) {
                    // if the value is present, use the
                    // radius_acct_interval
@@ -822,18 +818,11 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
            Profile profileRadius = radiusProfileList.get(0);
            RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
            RadiusServer radiusServer = profileDetails.getPrimaryRadiusAuthServer();
-            if (ssidConfig.getUseRadiusProxy()) {
-                security.put("radius_server_ip", "127.0.0.1");
-                security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
-                security.put("radius_server_secret", "secret");
-            } else {
-                security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
-                security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
-                security.put("radius_server_secret", radiusServer.getSecret());
-            }
+            security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
+            security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
+            security.put("radius_server_secret", radiusServer.getSecret());           
            LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
                    security.get("radius_server_port"), security.get("radius_server_secret"));
-
        } else {
            LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles());
        }
@@ -876,28 +865,41 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                case "wpa2OnlyEAP":
                case "wpa2OnlyRadius":
                    security.put("mode", "2");
-                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    if (!ssidConfig.getUseRadiusProxy()) {
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                    break;
                case "wpa3OnlyEAP":
                    security.put("mode", "3");
-                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-
+                    if (!ssidConfig.getUseRadiusProxy()) {
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
+                    break;
+                case "wpa3OnlyEAP192":
+                    security.put("mode", "3");
+                    if (!ssidConfig.getUseRadiusProxy()) {
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                    break;
                case "wpa2EAP":
                case "wpa2Radius":
                case "wpa3MixedEAP":
                    security.put("mode", "mixed");
-                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
-
+                    if (!ssidConfig.getUseRadiusProxy()) {
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                    break;
                case "wpaEAP":
                case "wpaRadius":
                    security.put("mode", "1");
-                    getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
-                    getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    if (!ssidConfig.getUseRadiusProxy()) {
+                        getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
+                        getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
+                    }
                    break;
            }
        }
Author	SHA1	Message	Date
Norm Traxler	4f462ecf70	[WIFI-2670] Change log for debugging	2021-06-28 23:17:47 -04:00
norm-traxler	fc61328fc4	Merge pull request #48 from Telecominfraproject/hotfix/netexp-2342 fix bug for cannot find alarm to be deleted exception	2021-06-28 19:43:34 -04:00
Thomas-Leung2021	18698fc188	fix bug for cannot find alarm to be deleted exception	2021-06-28 19:05:01 -04:00
Mike Hansen	34a6baf956	Merge branch 'master' of github.com:Telecominfraproject/wlan-cloud-opensync-controller	2021-06-25 13:55:13 -04:00
Mike Hansen	2e3b0c277a	WIFI-1489: AP: Disable local access not working as expected Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-25 13:51:00 -04:00
Thomas-Leung2021	4370753206	add tx_power status	2021-06-25 13:25:19 -04:00
Mike Hansen	aaa584ca3c	Merge pull request #46 from Telecominfraproject/mqtt_client_analysis_and_optimization MQTT Client analysis and optimization	2021-06-24 10:22:46 -04:00
Mike Hansen	210976887f	MQTT Client analysis and optimization Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-23 17:43:01 -04:00
Mike Hansen	43f53ee0be	Merge pull request #45 from Telecominfraproject/disable_eq_alarms_sp Move the raising and clearing of the threshold alarms into the gatewa…	2021-06-22 16:04:18 -04:00
Mike Hansen	1381451989	Move the raising and clearing of the threshold alarms into the gateway controller when the device information is received in the MQTT device report. Update EquipmentAdminState alarms or clear if required. Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-22 15:52:14 -04:00
Mike Hansen	6124309dbb	Move the raising and clearing of the threshold alarms into the gateway controller when the device information is received in the MQTT device report. Update EquipmentAdminState alarms or clear if required. Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-22 14:17:12 -04:00
Mike Hansen	f2e30505e5	Move the raising and clearing of the threshold alarms into the gateway controller when the device information is received in the MQTT device report. Update EquipmentAdminState alarms or clear if required. Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-22 12:46:10 -04:00
Mike Hansen	bda589e65e	Move the raising and clearing of the threshold alarms into the gateway controller when the device information is received in the MQTT device report. Update EquipmentAdminState alarms or clear if required. Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-22 12:31:30 -04:00
Mike Hansen	5a98d4bd83	Merge branch 'disable_eq_alarms_sp' of github.com:Telecominfraproject/wlan-cloud-opensync-controller into disable_eq_alarms_sp	2021-06-22 11:27:09 -04:00
Mike Hansen	a772cbe7fa	WIFI-2697: Remove old parameter from captive portal configuration on Gateway side Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-22 11:19:18 -04:00
Mike Hansen	11adb02fd2	Move the raising and clearing of the threshold alarms into the gateway controller when the device information is received in the MQTT device report. Update EquipmentAdminState alarms or clear if required. Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-22 11:12:59 -04:00
Mike Hansen	9aa4a102a5	Move the raising and clearing of the threshold alarms into the gateway controller when the device information is received in the MQTT device report. Update EquipmentAdminState alarms or clear if required. Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-22 10:23:21 -04:00
Mike Hansen	d482b4062f	WIFI-2686: RADSEC: APs are running into Backoff with AP Proxy config Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-21 17:01:37 -04:00
Mike Hansen	ee49415b0a	WIFI-2052: Country Code displayed in UI doesn't match AP Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-21 14:10:37 -04:00
Mike Hansen	cc035e7fe1	WIFI-2686: RADSEC: APs are running into Backoff with AP Proxy config Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-19 17:38:23 -04:00
Mike Hansen	d617efbcc1	Merge pull request #44 from Telecominfraproject/WPA3EAP192 [WIFI-2646] add support for WPA3-Enterprise 192-Bit	2021-06-17 14:28:16 -04:00
Thomas-Leung2021	53f19028dc	add support for WPA3-Enterprise 192-Bit	2021-06-17 12:03:22 -04:00
Mike Hansen	f2b4b616ad	Merge pull request #43 from Telecominfraproject/hotfix/NETEXP-2077 remove metrics from ClientSession	2021-06-15 10:20:57 -04:00
Thomas-Leung2021	9802ed2a3f	remove metrics from ClientSession	2021-06-14 16:40:26 -04:00
Mike Hansen	cfc5caee64	WIFI-2638: Gateway: Support blink or turn off of LEDs on AP from CloudSDK BlinkRequest Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-14 12:00:48 -04:00
Mike Hansen	b0abd3847a	WIFI-2625: CloudGateway: when using RadSec and dynamicDiscovery, do not populate server(s) in Radius_Proxy_Config Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-10 11:15:40 -04:00
Mike Hansen	71c947427b	WIFI-2608: CloudGateway: provision dynamicDiscovery attribute on AP Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-09 15:13:27 -04:00
Mike Hansen	0dc72a6fe4	Merge pull request #42 from Telecominfraproject/fixBugs fix wrong alarm timestamp	2021-06-09 14:40:18 -04:00
Thomas-Leung2021	5540d83dd3	fix the bug I create for wrong alarm timestamp	2021-06-09 14:11:05 -04:00
Mike Hansen	572f48445c	WIFI-2605: Fix NPE dereference in OSGW controller when used with simulated cloud backend Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-09 13:17:55 -04:00
Mike Hansen	4df8bda2b3	WIFI-2396: CloudGateway: Universal (Auto) Radio Mode For Configuration Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-08 10:15:06 -04:00
Mike Hansen	047ce7f07a	WIFI-2081: AP: ON_CHANNEL survey report sometimes has no information Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-07 15:28:05 -04:00
Mike Hansen	1264640c33	Merge pull request #41 from Telecominfraproject/hotfix/WIFI-2058 added Alarm when AP disconnected	2021-06-07 14:19:52 -04:00
Thomas-Leung2021	eef372cf0d	added Alarm when AP disconnected	2021-06-07 12:36:30 -04:00
Mike Hansen	fcccf418dd	Merge pull request #40 from Telecominfraproject/hotfix/NETEXP-1721 assigned rx/tx to the correct variables	2021-06-02 15:52:36 -04:00
Thomas-Leung2021	c098cd72b6	assigned rx/tx to the correct variables	2021-06-02 15:46:07 -04:00
Mike Hansen	42ecccee5e	WIFI-2441: RADSEC/PROXY config when done from UI Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-02 12:14:12 -04:00
Mike Hansen	663340e749	AP: ON_CHANNEL survey report sometimes has no information Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>	2021-06-02 09:08:08 -04:00
norm-traxler	01c7f270ad	Merge pull request #39 from Telecominfraproject/WIFI-2519-clientTxFrames WIFI-2519 Check client metrics has TxFrames before assigning it	2021-06-01 13:23:51 -04:00
Christie Unitt	91c17a6271	WIFI-2519 Check client metrics has TxFrames before assigning it	2021-06-01 13:17:02 -04:00
norm-traxler	92235affee	Merge pull request #38 from Telecominfraproject/WIFI-2434 WIFI 2434: Update SDK master to use image tag 1.2.0-SNAPSHOT	2021-05-26 21:18:30 -04:00