Updating to released API version and test fixes
Change-Id: I2d4f54489b7208cc65df8c0b22a0586a9fb50a1b
diff --git a/src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java b/src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java
index f726b22..fe45d40 100644
--- a/src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java
+++ b/src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java
@@ -70,7 +70,7 @@
DHCP.MsgType.DHCPREQUEST, ONU_SERIAL, OLT_MAC,
LOCAL_IP);
DhcpL2RelayEvent event = new DhcpL2RelayEvent(DhcpL2RelayEvent.Type.STATS_UPDATE,
- allocationInfo, OLT_CONNECT_POINT, entryCounter, DHCP_COUNTER_TOPIC, null);
+ allocationInfo, OLT_CONNECT_POINT, entryCounter, null);
dhcpL2RelayListener.event(event);
assertEquals(MockEventBusService.dhcpStats, 1);
assertEquals(MockEventBusService.otherCounter, 0);
@@ -88,7 +88,7 @@
DHCP.MsgType.DHCPREQUEST, ONU_SERIAL, OLT_MAC,
LOCAL_IP);
DhcpL2RelayEvent event = new DhcpL2RelayEvent(DhcpL2RelayEvent.Type.STATS_UPDATE,
- allocationInfo, OLT_CONNECT_POINT, entryCounter, DHCP_COUNTER_TOPIC, ONU_SERIAL);
+ allocationInfo, OLT_CONNECT_POINT, entryCounter, ONU_SERIAL);
dhcpL2RelayListener.event(event);
assertEquals(MockEventBusService.dhcpStats, 1);
assertEquals(MockEventBusService.otherCounter, 0);
@@ -106,7 +106,7 @@
DHCP.MsgType.DHCPREQUEST, ONU_SERIAL, OLT_MAC,
LOCAL_IP);
DhcpL2RelayEvent event = new DhcpL2RelayEvent(DhcpL2RelayEvent.Type.UPDATED,
- allocationInfo, cp, entryCounter, DHCP_COUNTER_TOPIC, null);
+ allocationInfo, cp, entryCounter, null);
dhcpL2RelayListener.event(event);
assertEquals(MockEventBusService.dhcpEvents, 1);
assertEquals(MockEventBusService.otherCounter, 0);
@@ -149,5 +149,20 @@
public void removeListener(DhcpL2RelayListener listener) {
dhcpL2RelayListener = null;
}
+
+ @Override
+ public Map<String, DhcpAllocationInfo> getAllocationInfo() {
+ return null;
+ }
+
+ @Override
+ public void clearAllocations() {
+
+ }
+
+ @Override
+ public boolean removeAllocationByConnectPoint(ConnectPoint connectPoint) {
+ return false;
+ }
}
}
\ No newline at end of file
diff --git a/src/test/java/org/opencord/kafka/integrations/KafkaIntegrationTestBase.java b/src/test/java/org/opencord/kafka/integrations/KafkaIntegrationTestBase.java
index e66e8e5..81fe499 100644
--- a/src/test/java/org/opencord/kafka/integrations/KafkaIntegrationTestBase.java
+++ b/src/test/java/org/opencord/kafka/integrations/KafkaIntegrationTestBase.java
@@ -131,9 +131,9 @@
protected CordMcastStatisticsEvent getCordMcastStatisticsEvent() {
List<CordMcastStatistics> statsList = Lists.newArrayList(
new CordMcastStatistics(IpAddress.valueOf("172.16.34.34"),
- "192.168.0.21", VlanId.vlanId("100")),
+ "192.168.0.21", VlanId.vlanId("100"), VlanId.vlanId("200")),
new CordMcastStatistics(IpAddress.valueOf("172.16.35.35"),
- "192.168.0.22", VlanId.vlanId("101"))
+ "192.168.0.22", VlanId.vlanId("101"), VlanId.vlanId("201"))
);
return new CordMcastStatisticsEvent(
CordMcastStatisticsEvent.Type.STATUS_UPDATE, statsList);
diff --git a/src/test/java/org/opencord/kafka/integrations/McastKafkaIntegrationTest.java b/src/test/java/org/opencord/kafka/integrations/McastKafkaIntegrationTest.java
index 135239a..86dc91e 100644
--- a/src/test/java/org/opencord/kafka/integrations/McastKafkaIntegrationTest.java
+++ b/src/test/java/org/opencord/kafka/integrations/McastKafkaIntegrationTest.java
@@ -84,6 +84,11 @@
}
@Override
+ public void setInnerVlanValue(VlanId vlanId) {
+
+ }
+
+ @Override
public void addListener(CordMcastStatisticsEventListener listener) {
mcastStatsListerner = listener;
}