[WIFI-2670] Change log for debugging

fix bug for cannot find alarm to be deleted exception

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

@@ -550,8 +550,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             protocolStatusData.setBaseMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
             protocolStatusData.setCloudCfgDataVersion(42L);
             protocolStatusData.setReportedCfgDataVersion(42L);
-            protocolStatusData.setCountryCode("CA");
+            CountryCode countryCode = Location.getCountryCode(locationServiceInterface.get(ce.getLocationId()));
-            protocolStatusData.setReportedCC(CountryCode.CA);
+            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));
@@ -1064,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);
@@ -1309,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 {
@@ -1329,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;
     }
 

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) {
+    @Value("${tip.wlan.mqttStatsPublisher.temperatureThresholdInC:80}")
-        LOG.info("Received WCStatsReport {}", wcStatsReport.toString());
+    private int temperatureThresholdInC;
 
-        LOG.debug("Received report on topic {}", topic);
+    @Value("${tip.wlan.mqttStatsPublisher.cpuUtilThresholdPct:80}")
-        int customerId = extractCustomerIdFromTopic(topic);
+    private int cpuUtilThresholdPct;
 
-        long equipmentId = extractEquipmentIdFromTopic(topic);
+    @Value("${tip.wlan.mqttStatsPublisher.memoryUtilThresholdPct:70}")
-        if ((equipmentId <= 0) || (customerId <= 0)) {
+    private int memoryUtilThresholdPct;
-            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);
-            }
-        }
-
-    }
 
     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.getLocationId() == 0)
-                    if(smr.getCustomerId() == 0) smr.setCustomerId(customerId);
+                        smr.setLocationId(locationId);
-                    if (smr.getEquipmentId() == 0L) smr.setEquipmentId(equipmentId);
+                    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());
 
@@ -969,7 +918,6 @@ public class MqttStatsPublisher {
             if (apNodeMetrics.getSourceTimestampMs() < deviceReport.getTimestampMs())
                 apNodeMetrics.setSourceTimestampMs(deviceReport.getTimestampMs());
             updateDeviceStatusForReport(customerId, equipmentId, deviceReport, avgRadioTemp);
-
         }
 
         // statusList.add(status);
@@ -1067,11 +1015,11 @@ public class MqttStatsPublisher {
             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);
 
             apNodeMetrics.setRxBytes(radioType, rxBytes);
@@ -1132,11 +1080,12 @@ public class MqttStatsPublisher {
                     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
+                    // 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);
 
@@ -1150,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);
@@ -1197,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(
@@ -1297,7 +1275,7 @@ public class MqttStatsPublisher {
         for (NetworkProbe networkProbe : report.getNetworkProbeList()) {
 
             NetworkProbeMetrics networkProbeMetrics = new NetworkProbeMetrics();
-            
+
             networkProbeMetrics.setSourceTimestampMs(networkProbe.getTimestampMs());
 
             List<DnsProbeMetric> dnsProbeResults = new ArrayList<>();
@@ -1391,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);
 
@@ -1651,7 +1631,7 @@ public class MqttStatsPublisher {
             // 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;
@@ -1707,7 +1687,7 @@ public class MqttStatsPublisher {
                     rxErrors += client.getStats().getRxErrors();
                     txErrors += client.getStats().getTxErrors();
                     lastRssi = client.getStats().getRssi();
-                    
+
                     if (client.hasConnected() && client.getConnected() && client.hasMacAddress()) {
                         numConnectedClients += 1;
                     }

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);

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);

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);

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(
+    private final Counter messagesReceived = new BasicCounter(MonitorConfig.builder("osgw-mqtt-messagesReceived").withTags(tags).build());
-            MonitorConfig.builder("osgw-mqtt-messagesReceived").withTags(tags).build());
 
-    private final Counter messageBytesReceived = new BasicCounter(
+    private final Counter messageBytesReceived = new BasicCounter(MonitorConfig.builder("osgw-mqtt-messageBytesReceived").withTags(tags).build());
-            MonitorConfig.builder("osgw-mqtt-messageBytesReceived").withTags(tags).build());
-    
-    private final Timer timerMessageProcess = new BasicTimer(
-            MonitorConfig.builder("osgw-mqtt-messageProcessTimer").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.listenPort:1883}") int mqttBrokerListenPort, @Value("${tip.wlan.mqttBroker.user:admin}") String username,
-            @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
+                        mqtt.setTracer(new Tracer() {
-                        // serverContext,
+                            @Override
-                        // it has to be the
+                            public void onReceive(MQTTFrame frame) {
-                        // clientContext
+                                switch (frame.messageType()) {
-                        // mqtt.setSslContext(((JdkSslContext)
+                                    case PINGREQ.TYPE:
-                        // sslContext).context());
+                                    case PINGRESP.TYPE:
-                        // For now we'll rely on regular SSLContext from the JDK
+                                        // 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
+                            @Override
-                        // futureConnection
+                            public void onSend(MQTTFrame frame) {
-                        futureConnection = mqtt.futureConnection();
+                                switch (frame.messageType()) {
-                        futureConnection.connect();
+                                    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()
+                        JsonFormat.Printer jsonPrinter =
-                                .omittingInsignificantWhitespace().usingTypeRegistry(oldRegistry);
+                                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);
-
+                                mqttMsg.ack();
-                                MQTT_LOG.info("topic = {} Report = {}", mqttMsg.getTopic(),
+                                MQTT_LOG.info("topic = {}\nReport = {}", mqttMsg.getTopic(), jsonPrinter.print(encodedMsg));
-                                        jsonPrinter.print(encodedMsg));
-
                                 extIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), (Report) encodedMsg);
-
                             } catch (Exception e) {
-                                try {
+                                String msgStr = new String(mqttMsg.getPayload(), utf8);
-                                    // not a opensync_stats report, attempt to
+                                LOG.warn("Could not process message topic = {}\nmessage = {}", mqttMsg.getTopic(), msgStr);
-                                    // 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);
-                                    }
-                                }
                             } finally {
                                 stopwatchTimerMessageProcess.stop();
                             }
-
                         }
-
                     } catch (Exception e) {
                         LOG.error("Exception in MQTT receiver", e);
                     } finally {
                         try {
-                            if (futureConnection != null) {
+                            if (blockingConnection != null) {
-                                futureConnection.disconnect();
+                                blockingConnection.disconnect();
                             }
                         } catch (Exception e1) {
                             // do nothing

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");
 
                 }
 

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);

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

@@ -97,26 +97,34 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
 
         for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) apConfig.getApProfile().getDetails()).getRadiusProxyConfigurations()) {
             Map<String, Value> updateColumns = new HashMap<>();
-            updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
+            if (rsc.getServer() != null)
-            getCertificateUrls(rsc, updateColumns);
+                updateColumns.put("server", new Atom<>(rsc.getServer().getHostAddress()));
-            updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
+            if (rsc.getName() != null)
-            updateColumns.put("passphrase", new Atom<>(rsc.getPassphrase()));
+                updateColumns.put("radius_config_name", new Atom<>(rsc.getName()));
-            updateColumns.put("port", new Atom<>(rsc.getPort()));
+            if (rsc.getPort() != null)
-            updateColumns.put("realm", Set.of(rsc.getRealm()));
+                updateColumns.put("port", new Atom<>(rsc.getPort()));
-            updateColumns.put("radsec", new Atom<>(rsc.getUseRadSec()));
+            if (rsc.getRealm() != null)
-            updateColumns.put("secret", new Atom<>(rsc.getSharedSecret()));
+                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()));
             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( databaseSchema.getTables().get(radiusConfigDbTable).getColumns().containsKey("auto_discover") ){
+                if (rsc.getUseRadSec() != null && rsc.getUseRadSec() && rsc.getDynamicDiscovery() != null &&  rsc.getDynamicDiscovery()) {
-                if (rsc.getUseRadSec() && rsc.getDynamicDiscovery()) {
                     // if useRadSec && dynamicDiscovery enabled, do not send server information
                     updateColumns.put("auto_discover", new Atom<>(true));
                     updateColumns.remove("acct_server");
@@ -131,7 +139,6 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
                     updateColumns.put("auto_discover", new Atom<>(false));
                 }
             }
-
             Row row = new Row(updateColumns);
             operations.add(new Insert(radiusConfigDbTable, row));
         }

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;
     }
@@ -876,6 +877,13 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                         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":