Telecominfraproject/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2026-01-27 10:22:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

APs running into Backoff shows as connected.

Browse Source 
Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>
This commit is contained in:
Mike Hansen
2021-07-22 13:38:06 -04:00
parent cbd27b37bf
commit 11f0aa8856
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -120,6 +120,8 @@ import com.telecominfraproject.wlan.systemevent.equipment.realtime.ApcElectionEv
import com.telecominfraproject.wlan.systemevent.equipment.realtime.ApcElectionEvent.ApcMode;
import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
import sts.OpensyncStats.Report;
@org.springframework.context.annotation.Profile("opensync_cloud_config")
@Component
public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegrationInterface {
@@ -145,7 +147,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
@Autowired
private FirmwareServiceInterface firmwareServiceInterface;
@Autowired
private StatsPublisherInterface mqttMessageProcessor;
private StatsPublisherInterface statsPublisherInterface;
@Autowired
private AlarmServiceInterface alarmServiceInterface;
@@ -2392,7 +2394,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
ApcElectionEvent electionEvent =
new ApcElectionEvent(drIpAddr, bdrIpAddr, localIpV4Addr, drIpAddr, mode, Boolean.valueOf(apcStateAttributes.get("enabled")),
RealTimeEventType.APC_Election_event, customerId, ce.getLocationId(), equipmentId, System.currentTimeMillis());
mqttMessageProcessor.publishSystemEventFromTableStateMonitor(electionEvent);
statsPublisherInterface.publishSystemEventFromTableStateMonitor(electionEvent);
}
@Override
@@ -2449,4 +2451,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
LOG.debug("finished nodeStateDbTableUpdate for {}", apId);
}
@Override
public void processMqttMessage(String topic, Report report) {
statsPublisherInterface.processMqttMessage(topic, report);
}
}

2
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java vendored
View File

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

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

@@ -32,6 +32,7 @@ import com.netflix.servo.monitor.Stopwatch;
import com.netflix.servo.monitor.Timer;
import com.netflix.servo.tag.TagList;
import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface;
import com.telecominfraproject.wlan.opensync.external.integration.utils.StatsPublisherInterface;
import com.telecominfraproject.wlan.opensync.util.ZlibUtil;
@@ -57,7 +58,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
private final Timer timerMessageProcess = new BasicTimer(MonitorConfig.builder("osgw-mqtt-messageProcessTimer").withTags(tags).build());
@Autowired
private StatsPublisherInterface statsPublisher;
private OpensyncExternalIntegrationInterface opensyncExternalIntegrationInterface;
// dtop: use anonymous constructor to ensure that the following code always
// get executed,
@@ -185,7 +186,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
Report statsReport = Report.parseFrom(payload);
mqttMsg.ack();
MQTT_LOG.info("Topic {}\n{}", mqttMsg.getTopic(), jsonPrinter.print(statsReport));
statsPublisher.processMqttMessage(mqttMsg.getTopic(), statsReport);
opensyncExternalIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), statsReport);
LOG.debug("Dispatched report for topic {} to backend for processing", mqttMsg.getTopic());
} catch (Exception e) {