commit c7403c2a2f28969aa6f82469d134a0653beb57bd
author Yi Tseng <a86487817@gmail.com> Mon Jun 19 16:23:22 2017 -0700
committer Charles Chan <charles@opennetworking.org> Fri Jun 30 20:52:25 2017 +0000
tree 2850109ac769b753191e95f04a7d54f956ad30d5
parent 91ccbf74b89221ba76cdce399eef47b0f5a7005f

DHCP util refactor

Move options to packet.dhcp package
Deprecated DHCPPacketType, add MsgType to DHCP class

Change-Id: I85ce7fa5e6f3fdc916fbbeba9a4e10e75064a054

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java
index 40003eb..778f778 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java
@@ -28,8 +28,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onlab.packet.ARP;
 import org.onlab.packet.DHCP;
-import org.onlab.packet.DHCPOption;
-import org.onlab.packet.DHCPPacketType;
+import org.onlab.packet.dhcp.DhcpOption;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.Ip4Address;
@@ -421,11 +420,11 @@
             }
 
             Ethernet packet = context.inPacket().parsed();
-            DHCPPacketType incomingPacketType = null;
-            for (DHCPOption option : dhcpPayload.getOptions()) {
+            DHCP.MsgType incomingPacketType = null;
+            for (DhcpOption option : dhcpPayload.getOptions()) {
                 if (option.getCode() == OptionCode_MessageType.getValue()) {
                     byte[] data = option.getData();
-                    incomingPacketType = DHCPPacketType.getType(data[0]);
+                    incomingPacketType = DHCP.MsgType.getType(data[0]);
                 }
             }