Merge pull request #424 from Sovietaced/master

Fix packet tracer API

src/main/java/net/floodlightcontroller/core/IOFMessageFilterManagerService.java

@@ -16,8 +16,13 @@
 
 package net.floodlightcontroller.core;
 
+import java.util.concurrent.ConcurrentHashMap;
+
 import net.floodlightcontroller.core.module.IFloodlightService;
 
 public interface IOFMessageFilterManagerService extends IFloodlightService {
+
+	String setupFilter(String sid, ConcurrentHashMap<String, String> f,
+			int deltaInMilliSeconds);
     // empty for now
 }

src/main/java/net/floodlightcontroller/core/OFMessageFilterManager.java

@@ -140,6 +140,7 @@ public class OFMessageFilterManager
         return s;  // the return string is the session ID.
     }
 
+    @Override
     public String setupFilter(String sid, 
                               ConcurrentHashMap<String,String> f, 
                               int deltaInMilliSeconds) {

src/main/java/net/floodlightcontroller/core/web/PacketTraceResource.java

@@ -24,7 +24,7 @@ import org.restlet.resource.ServerResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.floodlightcontroller.core.OFMessageFilterManager;
+import net.floodlightcontroller.core.IOFMessageFilterManagerService;
 
 public class PacketTraceResource extends ServerResource {
     protected static Logger log = LoggerFactory.getLogger(PacketTraceResource.class);
@@ -95,10 +95,10 @@ public class PacketTraceResource extends ServerResource {
         ConcurrentHashMap <String,String> filter = new ConcurrentHashMap<String,String> ();
         String sid = null;
         PacketTraceOutput output = new PacketTraceOutput();
-        OFMessageFilterManager manager = 
-                (OFMessageFilterManager)getContext()
+        IOFMessageFilterManagerService manager = 
+                (IOFMessageFilterManagerService)getContext()
                     .getAttributes().
-                        get(OFMessageFilterManager.class.getCanonicalName());
+                        get(IOFMessageFilterManagerService.class.getCanonicalName());
 
         if (manager == null) {
             sid = null;