홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
samanwita pal
Committed by Gerrit Code Review
8969cbe4 1 parent d57cdc45

Removing DHCPMessageType as DHCPPacketType Class was already defined 

Change-Id: I01e6f8cb5a1eedba11f1f24cc19a27ef2d815b38
Inline Side-by-side
Showing 3 changed files with 19 additions and 33 deletions
......@@ -25,6 +25,7 @@ import org.apache.felix.scr.annotations.Service;
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 @@ public class DHCPManager implements DHCPService {
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 @@ public class DHCPManager implements DHCPService {
}
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 @@ public class DHCPManager implements DHCPService {
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 @@ public class DHCPManager implements DHCPService {
// 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 @@ public class DHCPManager implements DHCPService {
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 @@ public class DHCPManager implements DHCPService {
}
if ((cfg.startIP() != null) && (cfg.endIP() != null)) {
dhcpStore.populateIPPoolfromRange(Ip4Address.valueOf(cfg.startIP()),
Ip4Address.valueOf(cfg.endIP()));
Ip4Address.valueOf(cfg.endIP()));
}
}
......
......@@ -21,6 +21,7 @@ import org.junit.Before;
import org.junit.Test;
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;
......@@ -102,7 +103,7 @@ public class DHCPManagerTest {
*/
@Test
public void testDiscover() {
Ethernet reply = constructDHCPPacket(DHCP.DHCPMessageType.MessageType_Discover);
Ethernet reply = constructDHCPPacket(DHCPPacketType.DHCPDISCOVER);
sendPacket(reply);
}
......@@ -111,7 +112,7 @@ public class DHCPManagerTest {
*/
@Test
public void testRequest() {
Ethernet reply = constructDHCPPacket(DHCP.DHCPMessageType.MessageType_Request);
Ethernet reply = constructDHCPPacket(DHCPPacketType.DHCPREQUEST);
sendPacket(reply);
}
......@@ -131,10 +132,10 @@ public class DHCPManagerTest {
/**
* Constructs an Ethernet packet containing a DHCP Payload.
* @param messageType DHCP Message Type
* @param packetType DHCP Message Type
* @return Ethernet packet
*/
private Ethernet constructDHCPPacket(DHCP.DHCPMessageType messageType) {
private Ethernet constructDHCPPacket(DHCPPacketType packetType) {
// Ethernet Frame.
Ethernet ethReply = new Ethernet();
......@@ -173,7 +174,7 @@ public class DHCPManagerTest {
// DHCP Message Type.
option.setCode(DHCP.DHCPOptionCode.OptionCode_MessageType.getValue());
option.setLength((byte) 1);
byte[] optionData = {messageType.getValue()};
byte[] optionData = {(byte) packetType.getValue()};
option.setData(optionData);
optionList.add(option);
......
......@@ -73,22 +73,6 @@ public class DHCP extends BasePacket {
}
}
public enum DHCPMessageType {
MessageType_Discover((byte) 1), MessageType_Offer((byte) 2), MessageType_Request((byte) 3),
MessageType_Decline((byte) 4), MessageType_ACK((byte) 5), MessageType_Nak((byte) 6),
MessageType_Release((byte) 7), MessageType_Inform((byte) 8);
protected byte value;
private DHCPMessageType(final byte value) {
this.value = value;
}
public byte getValue() {
return this.value;
}
}
protected byte opCode;
protected byte hardwareType;
protected byte hardwareAddressLength;
......