VOL-2710: Add unit test cases for kafka-onos
Change-Id: Ieff0a32b3552eb8843fa933e57fa4148cb54853b
diff --git a/src/main/java/org/opencord/kafka/impl/KafkaIntegration.java b/src/main/java/org/opencord/kafka/impl/KafkaIntegration.java
index 6e34ceb..896a514 100644
--- a/src/main/java/org/opencord/kafka/impl/KafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/impl/KafkaIntegration.java
@@ -59,7 +59,7 @@
private static final Class<KafkaConfig>
KAFKA_CONFIG_CLASS = KafkaConfig.class;
- private static final String APP_NAME = "org.opencord.kafka";
+ protected static final String APP_NAME = "org.opencord.kafka";
private ApplicationId appId;
@Reference(cardinality = ReferenceCardinality.MANDATORY)
diff --git a/src/main/java/org/opencord/kafka/integrations/AaaKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/AaaKafkaIntegration.java
index 4d3a443..34699cb 100644
--- a/src/main/java/org/opencord/kafka/integrations/AaaKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/AaaKafkaIntegration.java
@@ -94,9 +94,9 @@
new InternalAaaMachineStatisticsListener();
// topics
- private static final String TOPIC = "authentication.events";
- private static final String AUTHENTICATION_STATISTICS_TOPIC = "onos.aaa.stats.kpis";
- private static final String RADIUS_OPERATION_STATUS_TOPIC = "radiusOperationalStatus.events";
+ protected static final String TOPIC = "authentication.events";
+ protected static final String AUTHENTICATION_STATISTICS_TOPIC = "onos.aaa.stats.kpis";
+ protected static final String RADIUS_OPERATION_STATUS_TOPIC = "radiusOperationalStatus.events";
// auth event params
private static final String TIMESTAMP = "timestamp";
private static final String DEVICE_ID = "deviceId";
diff --git a/src/main/java/org/opencord/kafka/integrations/AccessDeviceKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/AccessDeviceKafkaIntegration.java
index 9090f66..8ee6f22 100644
--- a/src/main/java/org/opencord/kafka/integrations/AccessDeviceKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/AccessDeviceKafkaIntegration.java
@@ -22,8 +22,8 @@
import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
-import org.onosproject.net.device.DeviceService;
import org.onosproject.net.Port;
+import org.onosproject.net.device.DeviceService;
import org.opencord.kafka.EventBusService;
import org.opencord.olt.AccessDeviceEvent;
import org.opencord.olt.AccessDeviceListener;
@@ -63,7 +63,7 @@
private final AccessDeviceListener listener = new InternalAccessDeviceListener();
- private static final String TOPIC = "onu.events";
+ protected static final String TOPIC = "onu.events";
// event fields
private static final String STATUS = "status";
diff --git a/src/main/java/org/opencord/kafka/integrations/BngPppoeKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/BngPppoeKafkaIntegration.java
index 17b7088..0cf49af 100644
--- a/src/main/java/org/opencord/kafka/integrations/BngPppoeKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/BngPppoeKafkaIntegration.java
@@ -50,7 +50,7 @@
protected volatile PppoeBngControlHandler ignore;
private final AtomicReference<PppoeBngControlHandler> pppoeBngControlRef = new AtomicReference<>();
- private static final String TOPIC_PPPOE = "bng.pppoe";
+ protected static final String TOPIC_PPPOE = "bng.pppoe";
private static final String TIMESTAMP = "timestamp";
private static final String EVENT_TYPE = "eventType";
private static final String OLT_DEVICE_ID = "deviceId";
diff --git a/src/main/java/org/opencord/kafka/integrations/BngStatsKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/BngStatsKafkaIntegration.java
index e20ecbb..32f901b 100644
--- a/src/main/java/org/opencord/kafka/integrations/BngStatsKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/BngStatsKafkaIntegration.java
@@ -56,7 +56,7 @@
protected volatile BngStatsService ignore;
private final AtomicReference<BngStatsService> bngStatsServiceRef = new AtomicReference<>();
- private static final String TOPIC_STATS = "bng.stats";
+ protected static final String TOPIC_STATS = "bng.stats";
private static final String SUBSCRIBER_S_TAG = "sTag";
private static final String SUBSCRIBER_C_TAG = "cTag";
diff --git a/src/main/java/org/opencord/kafka/integrations/DeviceKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/DeviceKafkaIntegration.java
index 68450d1..9b97ba5 100644
--- a/src/main/java/org/opencord/kafka/integrations/DeviceKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/DeviceKafkaIntegration.java
@@ -54,10 +54,10 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceService deviceService;
- private final DeviceListener listener = new InternalDeviceListener();
+ protected final DeviceListener listener = new InternalDeviceListener();
- private static final String TOPIC = "onos.kpis";
- private static final String PORT_EVENT_TOPIC = "onos.events.port";
+ protected static final String TOPIC = "onos.kpis";
+ protected static final String PORT_EVENT_TOPIC = "onos.events.port";
// event fields
private static final String TIMESTAMP = "timestamp";
diff --git a/src/main/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegration.java
index 494635f..43153c3 100644
--- a/src/main/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegration.java
@@ -62,8 +62,8 @@
private final DhcpL2RelayListener listener = new InternalDhcpL2RelayListener();
// topics
- private static final String TOPIC = "dhcp.events";
- private static final String DHCP_STATS_TOPIC = "onos.dhcp.stats.kpis";
+ protected static final String TOPIC = "dhcp.events";
+ protected static final String DHCP_STATS_TOPIC = "onos.dhcp.stats.kpis";
private static final String TIMESTAMP = "timestamp";
private static final String DEVICE_ID = "deviceId";
diff --git a/src/main/java/org/opencord/kafka/integrations/IgmpKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/IgmpKafkaIntegration.java
index 4da7e43..c424d67 100644
--- a/src/main/java/org/opencord/kafka/integrations/IgmpKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/IgmpKafkaIntegration.java
@@ -58,7 +58,7 @@
new InternalIgmpStatisticsListener();
//TOPIC
- private static final String IGMP_STATISTICS_TOPIC = "onos.igmp.stats.kpis";
+ protected static final String IGMP_STATISTICS_TOPIC = "onos.igmp.stats.kpis";
// IGMP stats event params
private static final String IGMP_JOIN_REQ = "igmpJoinReq";
diff --git a/src/main/java/org/opencord/kafka/integrations/McastKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/McastKafkaIntegration.java
index 8712333..1574c7f 100644
--- a/src/main/java/org/opencord/kafka/integrations/McastKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/McastKafkaIntegration.java
@@ -55,7 +55,7 @@
private final CordMcastStatisticsEventListener cordMcastStatisticsEventListener =
new InternalCorcMcastStatisticsListener();
- private static final String MCAST_OPERATIONAL_STATUS_TOPIC = "mcastOperationalStatus.events";
+ protected static final String MCAST_OPERATIONAL_STATUS_TOPIC = "mcastOperationalStatus.events";
//cord mcast stats event params
private static final String TIMESTAMP = "timestamp";