commit bd1d3f7eb192465a91c4aa3db4deda1e5a1542be
author Matteo Scandolo <teo@opennetworking.org> Fri Sep 11 13:26:53 2020 -0700
committer Matteo Scandolo <teo@opennetworking.org> Fri Sep 11 13:51:31 2020 -0700
tree c5c04709cff2eeff510e5c8c7c2ffb5c1e1e3cc9
parent 66d7f0e1e8c9e4d89728bb395a4846db2f351359

Moving app to depend on stable versions of olt and dhcpl2relay

Change-Id: Iedaf1e7da5fcd15c6401d2df01aa664c9c8cd17a

pom.xml

diff --git a/pom.xml b/pom.xml
index c6f2497..5563598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
         <onos.app.url>http://opencord.org</onos.app.url>
         <onos.app.readme>Integration with Kafka event bus</onos.app.readme>
         <aaa.api.version>2.1.0</aaa.api.version>
-        <olt.api.version>4.2.0-SNAPSHOT</olt.api.version>
-        <dhcpl2relay.api.version>2.2.0-SNAPSHOT</dhcpl2relay.api.version>
+        <olt.api.version>4.2.0</olt.api.version>
+        <dhcpl2relay.api.version>2.2.0</dhcpl2relay.api.version>
         <bng.api.version>1.0.0</bng.api.version>
         <sadis.api.version>5.1.0</sadis.api.version>
         <igmp.api.version>2.1.1</igmp.api.version>

src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java

diff --git a/src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java b/src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java
index 3a4ed77..29a77fe 100644
--- a/src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java
+++ b/src/test/java/org/opencord/kafka/integrations/DhcpL2RelayKafkaIntegrationTest.java
@@ -68,7 +68,7 @@
         DhcpAllocationInfo allocationInfo = new DhcpAllocationInfo(
                 OLT_CONNECT_POINT,
                 DHCP.MsgType.DHCPREQUEST, ONU_SERIAL, OLT_MAC,
-                LOCAL_IP, SUBSCRIBER_ID);
+                LOCAL_IP, C_TAG, SUBSCRIBER_ID);
         DhcpL2RelayEvent event = new DhcpL2RelayEvent(DhcpL2RelayEvent.Type.STATS_UPDATE,
                 allocationInfo, OLT_CONNECT_POINT, entryCounter, null);
         dhcpL2RelayListener.event(event);
@@ -86,7 +86,7 @@
         DhcpAllocationInfo allocationInfo = new DhcpAllocationInfo(
                 OLT_CONNECT_POINT,
                 DHCP.MsgType.DHCPREQUEST, ONU_SERIAL, OLT_MAC,
-                LOCAL_IP, SUBSCRIBER_ID);
+                LOCAL_IP, C_TAG, SUBSCRIBER_ID);
         DhcpL2RelayEvent event = new DhcpL2RelayEvent(DhcpL2RelayEvent.Type.STATS_UPDATE,
                 allocationInfo, OLT_CONNECT_POINT, entryCounter, ONU_SERIAL);
         dhcpL2RelayListener.event(event);
@@ -104,7 +104,7 @@
         DhcpAllocationInfo allocationInfo = new DhcpAllocationInfo(
                 new ConnectPoint(DEVICE_ID_1, PORT.number()),
                 DHCP.MsgType.DHCPREQUEST, ONU_SERIAL, OLT_MAC,
-                LOCAL_IP, SUBSCRIBER_ID);
+                LOCAL_IP, C_TAG, SUBSCRIBER_ID);
         DhcpL2RelayEvent event = new DhcpL2RelayEvent(DhcpL2RelayEvent.Type.UPDATED,
                 allocationInfo, cp, entryCounter, null);
         dhcpL2RelayListener.event(event);