From 11f0aa885664cdbb6b620c8917b97a5ba9ceb4dc Mon Sep 17 00:00:00 2001
From: Mike Hansen <mike.hansen@connectus.ai>
Date: Thu, 22 Jul 2021 13:38:06 -0400
Subject: [PATCH] APs running into Backoff shows as connected.

Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>
---
 .../integration/OpensyncExternalIntegrationCloud.java | 11 +++++++++--
 .../OpensyncExternalIntegrationInterface.java         |  2 ++
 .../wlan/opensync/mqtt/OpensyncMqttClient.java        |  5 +++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git 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
index 6099318..613fae0 100644
--- 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
@@ -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);		
+	}
 }
diff --git 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
index 4135cb8..aaf2307 100644
--- 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
@@ -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);
 }
diff --git 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
index a09559d..fe111fa 100644
--- 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
@@ -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) {