commit 8969cbe4bc88d1590a9cf1ce34f96920c7775d87
author samanwita pal <sam@onlab.us> Fri Sep 04 13:31:30 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 04 23:01:32 2015 +0000
tree f3c9f6b2627656b143c4bfacd9b2c95a4da6375e
parent d57cdc45221bcca62e5311d3b6933a71245da9ff

Removing DHCPMessageType as DHCPPacketType Class was already defined

Change-Id: I01e6f8cb5a1eedba11f1f24cc19a27ef2d815b38

apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java

diff --git a/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java
index 04bba9c..8084654 100644
--- a/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java
+++ b/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java
@@ -25,6 +25,7 @@
 import org.onlab.packet.ARP;
 import org.onlab.packet.DHCP;
 import org.onlab.packet.DHCPOption;
+import org.onlab.packet.DHCPPacketType;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.Ip4Address;
@@ -395,7 +396,7 @@
                 builder.setOutput(sourcePoint.port());
 
                 packetService.emit(new DefaultOutboundPacket(sourcePoint.deviceId(),
-                                    builder.build(), ByteBuffer.wrap(reply.serialize())));
+                        builder.build(), ByteBuffer.wrap(reply.serialize())));
             }
         }
 
@@ -435,20 +436,20 @@
                 }
 
                 String ipOffered = "";
-                DHCP.DHCPMessageType outgoingPacketType;
+                DHCPPacketType outgoingPacketType;
                 MacAddress clientMAC = new MacAddress(dhcpPayload.getClientHardwareAddress());
 
-                if (incomingPacketType == DHCP.DHCPMessageType.MessageType_Discover.getValue()) {
+                if (incomingPacketType == DHCPPacketType.DHCPDISCOVER.getValue()) {
 
-                    outgoingPacketType = DHCP.DHCPMessageType.MessageType_Offer;
+                    outgoingPacketType = DHCPPacketType.DHCPOFFER;
                     ipOffered = dhcpStore.suggestIP(clientMAC, requestedIP).toString();
 
-                    Ethernet ethReply = buildReply(packet, ipOffered, outgoingPacketType.getValue());
+                    Ethernet ethReply = buildReply(packet, ipOffered, (byte) outgoingPacketType.getValue());
                     sendReply(context, ethReply);
 
-                } else if (incomingPacketType == DHCP.DHCPMessageType.MessageType_Request.getValue()) {
+                } else if (incomingPacketType == DHCPPacketType.DHCPREQUEST.getValue()) {
 
-                    outgoingPacketType = DHCP.DHCPMessageType.MessageType_ACK;
+                    outgoingPacketType = DHCPPacketType.DHCPACK;
 
                     if (flagIfServerIP && flagIfRequestedIP) {
                         // SELECTING state
@@ -456,7 +457,7 @@
                                 dhcpStore.assignIP(clientMAC, requestedIP, leaseTime)) {
 
                             Ethernet ethReply = buildReply(packet, requestedIP.toString(),
-                                    outgoingPacketType.getValue());
+                                    (byte) outgoingPacketType.getValue());
                             sendReply(context, ethReply);
                             discoverHost(context, requestedIP);
                         }
@@ -464,7 +465,7 @@
                         // INIT-REBOOT state
                         if (dhcpStore.assignIP(clientMAC, requestedIP, leaseTime)) {
                             Ethernet ethReply = buildReply(packet, requestedIP.toString(),
-                                    outgoingPacketType.getValue());
+                                    (byte) outgoingPacketType.getValue());
                             sendReply(context, ethReply);
                             discoverHost(context, requestedIP);
                         }
@@ -475,13 +476,13 @@
                             Ip4Address clientIaddr = Ip4Address.valueOf(ciaadr);
                             if (dhcpStore.assignIP(clientMAC, clientIaddr, leaseTime)) {
                                 Ethernet ethReply = buildReply(packet, clientIaddr.toString(),
-                                        outgoingPacketType.getValue());
+                                        (byte) outgoingPacketType.getValue());
                                 sendReply(context, ethReply);
                                 discoverHost(context, clientIaddr);
                             }
                         }
                     }
-                } else if (incomingPacketType == DHCP.DHCPMessageType.MessageType_Release.getValue()) {
+                } else if (incomingPacketType == DHCPPacketType.DHCPRELEASE.getValue()) {
 
                     dhcpStore.releaseIP(clientMAC);
                 }
@@ -628,7 +629,7 @@
             }
             if ((cfg.startIP() != null) && (cfg.endIP() != null)) {
                 dhcpStore.populateIPPoolfromRange(Ip4Address.valueOf(cfg.startIP()),
-                                                    Ip4Address.valueOf(cfg.endIP()));
+                        Ip4Address.valueOf(cfg.endIP()));
             }
         }