commit 54dc352569638aa4c34dff9d03cddf8d92db3cab
author Thomas Vachuska <tom@onlab.us> Wed Sep 09 00:11:45 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Wed Sep 09 00:11:45 2015 -0700
tree 866469e2b66180e00a882bea0486fbc7e7c45178
parent d6c965dc65a04f99d68afe57172c9150091e0eaf

Modifying packaging to make the DHCP GUI work from WAR bundle-style packaging.

Change-Id: I1b9685fa1eebcac63ad41bc60db1f98b30aba656

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 8084654..854cc79 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
@@ -38,6 +38,7 @@
 import org.onosproject.core.CoreService;
 import org.onosproject.dhcp.DHCPService;
 import org.onosproject.dhcp.DHCPStore;
+import org.onosproject.dhcp.IPAssignment;
 import org.onosproject.net.config.ConfigFactory;
 import org.onosproject.net.config.NetworkConfigEvent;
 import org.onosproject.net.config.NetworkConfigListener;
@@ -213,8 +214,7 @@
     }
 
     @Override
-    public Map<MacAddress, Ip4Address> listMapping() {
-
+    public Map<MacAddress, IPAssignment> listMapping() {
         return dhcpStore.listMapping();
     }