DHCP util refactor
Move options to packet.dhcp package
Deprecated DHCPPacketType, add MsgType to DHCP class
Change-Id: I85ce7fa5e6f3fdc916fbbeba9a4e10e75064a054
diff --git a/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java b/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
index b642458..b28ec17 100644
--- a/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
+++ b/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
@@ -25,8 +25,7 @@
import org.onlab.packet.ARP;
import org.onlab.packet.ChassisId;
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.ICMP6;
import org.onlab.packet.IPv4;
@@ -614,9 +613,9 @@
@Override
public InboundPacket inPacket() {
byte[] dhcpMsgType = new byte[1];
- dhcpMsgType[0] = (byte) DHCPPacketType.DHCPREQUEST.getValue();
+ dhcpMsgType[0] = (byte) DHCP.MsgType.DHCPREQUEST.getValue();
- DHCPOption dhcpOption = new DHCPOption();
+ DhcpOption dhcpOption = new DhcpOption();
dhcpOption.setCode(DHCP.DHCPOptionCode.OptionCode_MessageType.getValue());
dhcpOption.setData(dhcpMsgType);
dhcpOption.setLength((byte) 1);
@@ -658,9 +657,9 @@
@Override
public InboundPacket inPacket() {
byte[] dhcpMsgType = new byte[1];
- dhcpMsgType[0] = (byte) DHCPPacketType.DHCPACK.getValue();
+ dhcpMsgType[0] = (byte) DHCP.MsgType.DHCPACK.getValue();
- DHCPOption dhcpOption = new DHCPOption();
+ DhcpOption dhcpOption = new DhcpOption();
dhcpOption.setCode(DHCP.DHCPOptionCode.OptionCode_MessageType.getValue());
dhcpOption.setData(dhcpMsgType);
dhcpOption.setLength((byte) 1);