From d7b77258cf945ba8dc0e576e5040a523fb45324f Mon Sep 17 00:00:00 2001
From: Sovietaced <Sovietaced@gmail.com>
Date: Wed, 30 Oct 2013 14:52:51 -0700
Subject: [PATCH] Fix packet tracer API
---
.../core/IOFMessageFilterManagerService.java | 5 +++++
.../floodlightcontroller/core/OFMessageFilterManager.java | 1 +
.../core/web/PacketTraceResource.java | 8 ++++----
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/IOFMessageFilterManagerService.java b/src/main/java/net/floodlightcontroller/core/IOFMessageFilterManagerService.java
index 2d5cafb73..b0d5890e6 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 fe6be9540..c5adf4470 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 89192204e..e6d598872 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;
--
GitLab