Removed the Pavlin FlowPath abstraction.
(sorry Pavlin)
Change-Id: Ia99db095994d5ecdf63d9ab10856e69487f9c0dc
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());
diff --git a/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java b/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java
deleted file mode 100644
index e8a8d7a..0000000
--- a/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package net.onrc.onos.apps.forwarding;
-
-import java.util.Collection;
-
-import net.floodlightcontroller.core.module.IFloodlightService;
-import net.onrc.onos.core.util.FlowPath;
-
-/**
- * Temporary interface that allows the Forwarding module to be
- * notified when a flow has been installed.
- * <p/>
- * This should be refactored to a listener framework in the future.
- */
-public interface IForwardingService extends IFloodlightService {
- /**
- * Notify the Forwarding module that a collection of flows has been
- * installed in the network.
- *
- * @param installedFlowPaths the collection of FlowPaths that have
- * been installed in the network.
- */
- public void flowsInstalled(Collection<FlowPath> installedFlowPaths);
-
- /**
- * Notify the Forwarding module that a flow has expired and been
- * removed from the network.
- *
- * @param removedFlowPath The FlowPath that was removed
- */
- public void flowRemoved(FlowPath removedFlowPath);
-}