diff --git a/opensync-ext-cloud/pom.xml b/opensync-ext-cloud/pom.xml
index 17bdcdf..e213634 100644
--- a/opensync-ext-cloud/pom.xml
+++ b/opensync-ext-cloud/pom.xml
@@ -11,11 +11,11 @@
opensync-ext-cloud
Configuration interface that provides config from the cloud services.
-
-
-
-
-
+
+ com.telecominfraproject.wlan
+ opensync-ext-interface
+ 1.2.0-SNAPSHOT
+
com.telecominfraproject.wlan
opensync-gateway
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 07b0fe1..b65f0c4 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
@@ -76,7 +76,7 @@ import com.telecominfraproject.wlan.opensync.external.integration.models.Opensyn
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPVIFState;
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAWLANNode;
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncWifiAssociatedClients;
-import com.telecominfraproject.wlan.opensync.external.integration.utils.MqttStatsPublisher;
+import com.telecominfraproject.wlan.opensync.external.integration.utils.StatsPublisherInterface;
import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.enumerations.DhcpFpDeviceType;
import com.telecominfraproject.wlan.opensync.util.OvsdbStringConstants;
import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
@@ -147,7 +147,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
@Autowired
private FirmwareServiceInterface firmwareServiceInterface;
@Autowired
- private MqttStatsPublisher mqttMessageProcessor;
+ private StatsPublisherInterface mqttMessageProcessor;
@Autowired
private AlarmServiceInterface alarmServiceInterface;
@@ -1062,11 +1062,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
return ret;
}
- @Override
- public void processMqttMessage(String topic, Report report) {
- mqttMessageProcessor.processMqttMessage(topic, report);
- }
-
@Override
public void wifiVIFStateDbTableUpdate(List vifStateTables, String apId) {
LOG.debug("Received Wifi_VIF_State table update for AP {}", apId);
diff --git 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
index 4c5a431..68340f7 100644
--- 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
@@ -124,7 +124,7 @@ import wc.stats.IpDnsTelemetry.WCStatsReport;
@org.springframework.context.annotation.Profile("opensync_cloud_config")
@Component
-public class MqttStatsPublisher {
+public class MqttStatsPublisher implements StatsPublisherInterface {
private static final Logger LOG = LoggerFactory.getLogger(MqttStatsPublisher.class);
@@ -154,6 +154,7 @@ public class MqttStatsPublisher {
@Value("${tip.wlan.mqttStatsPublisher.memoryUtilThresholdPct:70}")
private int memoryUtilThresholdPct;
+ @Override
public void processMqttMessage(String topic, Report report) {
LOG.info("Received report on topic {} for ap {}", topic, report.getNodeID());
String apId = extractApIdFromTopic(topic);
@@ -202,6 +203,7 @@ public class MqttStatsPublisher {
}
+ @Override
public void publishSystemEventFromTableStateMonitor(SystemEvent event) {
LOG.info("Publishing SystemEvent received by TableStateMonitor {}", event);
cloudEventDispatcherInterface.publishEvent(event);
diff --git 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
index 5633c33..8be5714 100644
--- 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
@@ -515,11 +515,6 @@ public class OpensyncExternalIntegrationCloudTest {
Mockito.when(clientServiceInterface.updateSession(ArgumentMatchers.any(ClientSession.class)))
.thenReturn(clientSession).thenReturn(clientSession2);
-
- opensyncExternalIntegrationCloud.processMqttMessage(topic, report);
-
- Mockito.verify(opensyncExternalIntegrationMqttProcessor, Mockito.times(1)).processMqttMessage(topic, report);
-
}
@Ignore
diff --git a/opensync-ext-cloud/src/test/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisherTest.java b/opensync-ext-cloud/src/test/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisherTest.java
index de8ed9d..10d121e 100644
--- a/opensync-ext-cloud/src/test/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisherTest.java
+++ b/opensync-ext-cloud/src/test/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisherTest.java
@@ -116,7 +116,7 @@ public class MqttStatsPublisherTest {
static class Config {
@Bean
- public MqttStatsPublisher mqttStatsPublisher() {
+ public StatsPublisherInterface mqttStatsPublisher() {
return new MqttStatsPublisher();
}
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 f2525d9..9395770 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
@@ -36,8 +36,6 @@ public interface OpensyncExternalIntegrationInterface {
void wifiInetStateDbTableDelete(List inetStateTables, String apId);
- void processMqttMessage(String topic, Report report);
-
void wifiAssociatedClientsDbTableUpdate(List wifiAssociatedClients, String apId);
void wifiAssociatedClientsDbTableDelete(String deletedClientMac, String apId);
diff --git a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/StatsPublisherInterface.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/StatsPublisherInterface.java
new file mode 100644
index 0000000..a005863
--- /dev/null
+++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/StatsPublisherInterface.java
@@ -0,0 +1,14 @@
+
+package com.telecominfraproject.wlan.opensync.external.integration.utils;
+
+import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
+
+import sts.OpensyncStats.Report;
+
+public interface StatsPublisherInterface {
+
+ void processMqttMessage(String topic, Report report);
+
+ void publishSystemEventFromTableStateMonitor(SystemEvent event);
+
+}
diff --git a/opensync-gateway-cloud-docker/src/main/docker/app/opensync/logback.xml b/opensync-gateway-cloud-docker/src/main/docker/app/opensync/logback.xml
index 3337e9c..77fa39d 100644
--- a/opensync-gateway-cloud-docker/src/main/docker/app/opensync/logback.xml
+++ b/opensync-gateway-cloud-docker/src/main/docker/app/opensync/logback.xml
@@ -30,6 +30,22 @@
+
+ /app/logs/mqttMsgTracer.log
+ true
+
+ %date %msg%n
+
+
+ /app/logs/mqttMsgTracer.%i.log.gz
+ 1
+ 3
+
+
+ 20MB
+
+
+
/app/logs/opensyncgw.log
true
@@ -67,10 +83,14 @@
-
+
+
+
+
+
diff --git a/opensync-gateway-cloud-process/src/main/resources/logback.xml b/opensync-gateway-cloud-process/src/main/resources/logback.xml
index fe25f53..89c241e 100644
--- a/opensync-gateway-cloud-process/src/main/resources/logback.xml
+++ b/opensync-gateway-cloud-process/src/main/resources/logback.xml
@@ -63,7 +63,8 @@
-
+
+