1 files changed, 15 insertions, 14 deletions

diff --git a/framework/src/onos/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java b/framework/src/onos/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
index 4093f2d2..a1707e0b 100644
--- a/framework/src/onos/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
+++ b/framework/src/onos/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
@@ -109,7 +109,7 @@ public class DhcpManager implements DhcpService {
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected PacketService packetService;
 
-    private DHCPPacketProcessor processor = new DHCPPacketProcessor();
+    private DhcpPacketProcessor processor = new DhcpPacketProcessor();
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected CoreService coreService;
@@ -241,12 +241,12 @@ public class DhcpManager implements DhcpService {
     }
 
     @Override
-    public boolean setStaticMapping(MacAddress macID, Ip4Address ipAddress, boolean fromOpenStack,
+    public boolean setStaticMapping(MacAddress macID, Ip4Address ipAddress, boolean rangeNotEnforced,
                                     List<Ip4Address> addressList) {
         log.debug("setStaticMapping is called with Mac: {}, Ip: {} addressList: {}",
                 macID.toString(), ipAddress.toString(), addressList.toString());
 
-        return dhcpStore.assignStaticIP(macID, ipAddress, fromOpenStack, addressList);
+        return dhcpStore.assignStaticIP(macID, ipAddress, rangeNotEnforced, addressList);
     }
 
     @Override
@@ -259,7 +259,7 @@ public class DhcpManager implements DhcpService {
         return dhcpStore.getAvailableIPs();
     }
 
-    private class DHCPPacketProcessor implements PacketProcessor {
+    private class DhcpPacketProcessor implements PacketProcessor {
 
         /**
          * Builds the DHCP Reply packet.
@@ -279,7 +279,7 @@ public class DhcpManager implements DhcpService {
 
             ipAssignment = dhcpStore.getIpAssignmentFromAllocationMap(HostId.hostId(packet.getSourceMAC()));
 
-            if (ipAssignment != null && ipAssignment.fromOpenStack()) {
+            if (ipAssignment != null && ipAssignment.rangeNotEnforced()) {
                 subnetMaskReply = ipAssignment.subnetMask();
                 dhcpServerReply = ipAssignment.dhcpServer();
                 domainServerReply = ipAssignment.domainServer();
@@ -437,7 +437,7 @@ public class DhcpManager implements DhcpService {
          * @param context context of the incoming message
          * @param dhcpPayload the extracted DHCP payload
          */
-        private void processDHCPPacket(PacketContext context, DHCP dhcpPayload) {
+        private void processDhcpPacket(PacketContext context, DHCP dhcpPayload) {
             Ethernet packet = context.inPacket().parsed();
             boolean flagIfRequestedIP = false;
             boolean flagIfServerIP = false;
@@ -464,9 +464,9 @@ public class DhcpManager implements DhcpService {
                     }
                 }
                 DHCPPacketType outgoingPacketType;
-                MacAddress clientMAC = new MacAddress(dhcpPayload.getClientHardwareAddress());
+                MacAddress clientMac = new MacAddress(dhcpPayload.getClientHardwareAddress());
                 VlanId vlanId = VlanId.vlanId(packet.getVlanID());
-                HostId hostId = HostId.hostId(clientMAC, vlanId);
+                HostId hostId = HostId.hostId(clientMac, vlanId);
 
                 if (incomingPacketType.getValue() == DHCPPacketType.DHCPDISCOVER.getValue()) {
 
@@ -484,8 +484,9 @@ public class DhcpManager implements DhcpService {
                     if (flagIfServerIP && flagIfRequestedIP) {
                         // SELECTING state
 
-                        if (dhcpStore.getIpAssignmentFromAllocationMap(HostId.hostId(clientMAC))
-                                .fromOpenStack()) {
+
+                        if (dhcpStore.getIpAssignmentFromAllocationMap(HostId.hostId(clientMac))
+                                .rangeNotEnforced()) {
                             outgoingPacketType = DHCPPacketType.DHCPACK;
                             Ethernet ethReply = buildReply(packet, requestedIP, (byte) outgoingPacketType.getValue());
                             sendReply(context, ethReply);
@@ -544,7 +545,7 @@ public class DhcpManager implements DhcpService {
          * @param context context of the incoming message
          * @param packet the ethernet payload
          */
-        private void processARPPacket(PacketContext context, Ethernet packet) {
+        private void processArpPacket(PacketContext context, Ethernet packet) {
 
             ARP arpPacket = (ARP) packet.getPayload();
 
@@ -605,7 +606,7 @@ public class DhcpManager implements DhcpService {
                         // This is meant for the dhcp server so process the packet here.
 
                         DHCP dhcpPayload = (DHCP) udpPacket.getPayload();
-                        processDHCPPacket(context, dhcpPayload);
+                        processDhcpPacket(context, dhcpPayload);
                     }
                 }
             } else if (packet.getEtherType() == Ethernet.TYPE_ARP) {
@@ -614,7 +615,7 @@ public class DhcpManager implements DhcpService {
                 if ((arpPacket.getOpCode() == ARP.OP_REQUEST) &&
                         Objects.equals(myIP, Ip4Address.valueOf(arpPacket.getTargetProtocolAddress()))) {
 
-                    processARPPacket(context, packet);
+                    processArpPacket(context, packet);
 
                 }
             }
@@ -727,4 +728,4 @@ public class DhcpManager implements DhcpService {
             timeout = Timer.getTimer().newTimeout(new PurgeListTask(), timerDelay, TimeUnit.MINUTES);
         }
     }
-}
\ No newline at end of file
+}