commit 4de98c3d3fb26dc63caa6ad1ea69a4f85cfbd9e4
author Jonathan Hart <jono@onlab.us> Mon Aug 11 17:03:25 2014 -0700
committer Gerrit Code Review <gerrit2@localhost> Fri Aug 15 09:40:40 2014 -0700
tree ece68e47c0a4e50e724f74d7b32e4c781e4e0710
parent 448bca02e5bf9c1a00450733203ae1251433daed

Removed the Pavlin FlowPath abstraction.

(sorry Pavlin)

Change-Id: Ia99db095994d5ecdf63d9ab10856e69487f9c0dc

src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java

diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index d88a296..7c229b6 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -36,7 +36,6 @@
 import net.onrc.onos.core.topology.Port;
 import net.onrc.onos.core.topology.Switch;
 import net.onrc.onos.core.topology.Topology;
-import net.onrc.onos.core.util.FlowPath;
 import net.onrc.onos.core.util.PortNumber;
 import net.onrc.onos.core.util.SwitchPort;
 
@@ -48,7 +47,7 @@
 import com.google.common.collect.ListMultimap;
 
 public class Forwarding implements /*IOFMessageListener,*/ IFloodlightModule,
-        IForwardingService, IPacketListener, ChangedListener {
+        IPacketListener, ChangedListener {
     private static final Logger log = LoggerFactory.getLogger(Forwarding.class);
 
     private static final int SLEEP_TIME_FOR_DB_HOST_INSTALLED = 100; // milliseconds
@@ -60,8 +59,6 @@
     private static final ScheduledExecutorService EXECUTOR_SERVICE =
             Executors.newScheduledThreadPool(NUMBER_OF_THREAD_FOR_EXECUTOR);
 
-    private final String callerId = "Forwarding";
-
     private final HighLevelIntentChangedHandler highLevelIntentChangedHandler =
             new HighLevelIntentChangedHandler();
 
@@ -171,18 +168,12 @@
 
     @Override
     public Collection<Class<? extends IFloodlightService>> getModuleServices() {
-        List<Class<? extends IFloodlightService>> services =
-                new ArrayList<Class<? extends IFloodlightService>>(1);
-        services.add(IForwardingService.class);
-        return services;
+        return null;
     }
 
     @Override
     public Map<Class<? extends IFloodlightService>, IFloodlightService> getServiceImpls() {
-        Map<Class<? extends IFloodlightService>, IFloodlightService> impls =
-                new HashMap<Class<? extends IFloodlightService>, IFloodlightService>(1);
-        impls.put(IForwardingService.class, this);
-        return impls;
+        return null;
     }
 
     @Override
@@ -471,14 +462,6 @@
         pathRuntime.executeIntentOperations(operations);
     }
 
-    @Override
-    public void flowsInstalled(Collection<FlowPath> installedFlowPaths) {
-    }
-
-    @Override
-    public void flowRemoved(FlowPath removedFlowPath) {
-    }
-
     public void flowRemoved(ShortestPathIntent spfIntent) {
         if (log.isTraceEnabled()) {
             log.trace("ShortestPathIntent {} was removed", spfIntent.getId());