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

providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java

diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
index 97b49a4..996bd43 100644
--- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
@@ -24,7 +24,6 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onlab.packet.ARP;
 import org.onlab.packet.DHCP;
-import org.onlab.packet.DHCPPacketType;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.ICMP6;
 import org.onlab.packet.IPacket;
@@ -489,7 +488,7 @@
                                     .anyMatch(dhcpOption -> dhcpOption.getCode() ==
                                             DHCP.DHCPOptionCode.OptionCode_MessageType.getValue() &&
                                             dhcpOption.getLength() == 1 &&
-                                            dhcpOption.getData()[0] == DHCPPacketType.DHCPACK.getValue())) {
+                                            dhcpOption.getData()[0] == DHCP.MsgType.DHCPACK.getValue())) {
                                 MacAddress hostMac = MacAddress.valueOf(dhcp.getClientHardwareAddress());
                                 VlanId hostVlan = VlanId.vlanId(eth.getVlanID());
                                 HostId hostId = HostId.hostId(hostMac, hostVlan);

providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java

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);