commit de1e6e3582a09d49f03d672f8e51be704eb3f39a
author Carmelo Cascone <carmelo@opennetworking.org> Mon Jul 15 19:39:08 2019 -0700
committer Matteo Scandolo <teo@opennetworking.org> Fri Nov 01 09:35:47 2019 -0700
tree befbc06b9a1575acd9b67787fc51c533d81d676c
parent 8c22d1fc2df8c9fd6abebbb5d5f4f57cd8d834e4

Bump ONOS to 2.2 and build with Java 11

Change-Id: I215f7ca5cbded3acd9c440fe723f6f21d77f9ed5

app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTestBase.java

diff --git a/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTestBase.java b/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTestBase.java
index 5318adc..a389ba4 100755
--- a/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTestBase.java
+++ b/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTestBase.java
@@ -16,17 +16,8 @@
 
 package org.opencord.dhcpl2relay.impl;
 
-import static org.junit.Assert.fail;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
 import org.onlab.packet.BasePacket;
 import org.onlab.packet.DHCP;
-import org.onlab.packet.DHCPPacketType;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.Ip4Address;
@@ -47,6 +38,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.fail;
+
 
 /**
  * Common methods for AAA app testing.
@@ -208,7 +207,7 @@
         UDP udpPacket = (UDP) ipv4Packet.getPayload();
         DHCP dhcpPacket = (DHCP) udpPacket.getPayload();
 
-        dhcpPacket.setOptions(constructDhcpOptions(DHCPPacketType.DHCPDISCOVER));
+        dhcpPacket.setOptions(constructDhcpOptions(DHCP.MsgType.DHCPDISCOVER));
 
         return pkt;
     }
@@ -228,7 +227,7 @@
         UDP udpPacket = (UDP) ipv4Packet.getPayload();
         DHCP dhcpPacket = (DHCP) udpPacket.getPayload();
 
-        dhcpPacket.setOptions(constructDhcpOptions(DHCPPacketType.DHCPREQUEST));
+        dhcpPacket.setOptions(constructDhcpOptions(DHCP.MsgType.DHCPREQUEST));
 
         return pkt;
     }
@@ -248,7 +247,7 @@
         UDP udpPacket = (UDP) ipv4Packet.getPayload();
         DHCP dhcpPacket = (DHCP) udpPacket.getPayload();
 
-        dhcpPacket.setOptions(constructDhcpOptions(DHCPPacketType.DHCPOFFER));
+        dhcpPacket.setOptions(constructDhcpOptions(DHCP.MsgType.DHCPOFFER));
 
         return pkt;
     }
@@ -268,7 +267,7 @@
         UDP udpPacket = (UDP) ipv4Packet.getPayload();
         DHCP dhcpPacket = (DHCP) udpPacket.getPayload();
 
-        dhcpPacket.setOptions(constructDhcpOptions(DHCPPacketType.DHCPACK));
+        dhcpPacket.setOptions(constructDhcpOptions(DHCP.MsgType.DHCPACK));
 
         return pkt;
     }
@@ -278,7 +277,7 @@
      *
      * @return Ethernet packet
      */
-    private List<DhcpOption> constructDhcpOptions(DHCPPacketType packetType) {
+    private List<DhcpOption> constructDhcpOptions(DHCP.MsgType packetType) {
 
         // DHCP Options.
         DhcpOption option = new DhcpOption();