diff --git a/src/main/java/net/floodlightcontroller/core/IOFMessageFilterManagerService.java b/src/main/java/net/floodlightcontroller/core/IOFMessageFilterManagerService.java index 2d5cafb73a175ffdffd06059a7e7caae5ca0a574..b0d5890e688059e2cc2acf2b1d633ccd0010960b 100644 --- a/src/main/java/net/floodlightcontroller/core/IOFMessageFilterManagerService.java +++ b/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 } diff --git a/src/main/java/net/floodlightcontroller/core/OFMessageFilterManager.java b/src/main/java/net/floodlightcontroller/core/OFMessageFilterManager.java index fe6be954075533f069481576f8e561e900c0b2c0..c5adf4470355476526cfe896c92195760d5e8d0f 100644 --- a/src/main/java/net/floodlightcontroller/core/OFMessageFilterManager.java +++ b/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) { diff --git a/src/main/java/net/floodlightcontroller/core/web/PacketTraceResource.java b/src/main/java/net/floodlightcontroller/core/web/PacketTraceResource.java index 89192204e285e17121143dbd0647e63518696a07..e6d598872dff27c47c6c124502706550e88adf7e 100644 --- a/src/main/java/net/floodlightcontroller/core/web/PacketTraceResource.java +++ b/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;