diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java
index c40eac0daa905d8203fb7258027c92e9beacf1da..48c00f343eaf20a354035f841eab600496ad7a2a 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java
@@ -78,6 +78,15 @@ public interface ILinkDiscovery {
public UpdateOperation getOperation() {
return operation;
}
+
+ @Override
+ public String toString() {
+ return "LDUpdate [src=" + src + ", srcPort=" + srcPort
+ + ", srcPortState=" + srcPortState + ", dst=" + dst
+ + ", dstPort=" + dstPort + ", dstPortState=" + dstPortState
+ + ", srcType=" + srcType + ", type=" + type + ", operation="
+ + operation + "]";
+ }
}
public enum SwitchType {
diff --git a/src/main/java/net/floodlightcontroller/topology/TopologyManager.java b/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
index e404767d3bdc3eee19d42a73b44add9fb078dae2..e195f0bd6dfce5183ae501b6201b55becd021091 100644
--- a/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
+++ b/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
@@ -6,11 +6,17 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
import net.floodlightcontroller.core.module.FloodlightModuleException;
import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.module.IFloodlightService;
+import net.floodlightcontroller.core.util.SingletonTask;
import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryListener;
import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
import net.floodlightcontroller.routing.BroadcastTree;
@@ -40,12 +46,50 @@ IRoutingService, ILinkDiscoveryListener {
protected Map<NodePortTuple, Set<Link>> tunnelLinks; // set of tunnel links
protected ILinkDiscoveryService linkDiscovery;
protected ArrayList<ITopologyListener> topologyAware;
+ protected IFloodlightProviderService floodlightProvider;
+ protected BlockingQueue<LDUpdate> ldUpdates;
protected TopologyInstance currentInstance;
+ protected SingletonTask newInstanceTask;
- public void recompute() {
- createNewInstance();
- informListeners();
+ /**
+ * Thread for recomputing topology. The thread is always running,
+ * however the function applyUpdates() has a blocking call.
+ */
+ protected class NewInstanceWorker implements Runnable {
+ @Override
+ public void run() {
+ applyUpdates();
+ createNewInstance();
+ informListeners();
+ }
+ }
+
+ public void applyUpdates() {
+ LDUpdate update = null;
+ while (ldUpdates.peek() != null) {
+ try {
+ update = ldUpdates.take();
+ } catch (Exception e) {
+ log.error("Error reading link discovery update. {}", e);
+ }
+ if (log.isTraceEnabled()) {
+ log.info("Applying update: {}", update);
+ }
+ if (update.getOperation() == UpdateOperation.ADD_OR_UPDATE) {
+ boolean added = (((update.getSrcPortState() & OFPortState.OFPPS_STP_MASK.getValue()) != OFPortState.OFPPS_STP_BLOCK.getValue()) &&
+ ((update.getDstPortState() & OFPortState.OFPPS_STP_MASK.getValue()) != OFPortState.OFPPS_STP_BLOCK.getValue()));
+ if (added) {
+ addOrUpdateLink(update.getSrc(), update.getSrcPort(),
+ update.getDst(), update.getDstPort(),
+ update.getType());
+ } else {
+ removeLink(update.getSrc(), update.getSrcPort(), update.getDst(), update.getDstPort());
+ }
+ } else if (update.getOperation() == UpdateOperation.REMOVE) {
+ removeLink(update.getSrc(), update.getSrcPort(), update.getDst(), update.getDstPort());
+ }
+ }
}
/**
@@ -141,8 +185,6 @@ IRoutingService, ILinkDiscoveryListener {
addLinkToStructure(tunnelLinks, link);
removeLinkFromStructure(portBroadcastDomainLinks, link);
}
-
- this.createNewInstance();
}
public void removeLink(Link link) {
@@ -172,7 +214,6 @@ IRoutingService, ILinkDiscoveryListener {
switchPorts.get(link.getDst()).isEmpty()) {
switchPorts.remove(link.getDst());
}
- this.createNewInstance();
}
public void removeLink(long srcId, short srcPort, long dstId, short dstPort) {
@@ -216,18 +257,19 @@ IRoutingService, ILinkDiscoveryListener {
//
public void linkDiscoveryUpdate(LDUpdate update) {
- if (update.getOperation() == UpdateOperation.ADD_OR_UPDATE) {
- boolean added = (((update.getSrcPortState() & OFPortState.OFPPS_STP_MASK.getValue()) != OFPortState.OFPPS_STP_BLOCK.getValue()) &&
- ((update.getDstPortState() & OFPortState.OFPPS_STP_MASK.getValue()) != OFPortState.OFPPS_STP_BLOCK.getValue()));
- if (added) {
- addOrUpdateLink(update.getSrc(), update.getSrcPort(),
- update.getDst(), update.getDstPort(),
- update.getType());
- } else {
- removeLink(update.getSrc(), update.getSrcPort(), update.getDst(), update.getDstPort());
- }
- } else if (update.getOperation() == UpdateOperation.REMOVE) {
- removeLink(update.getSrc(), update.getSrcPort(), update.getDst(), update.getDstPort());
+ boolean scheduleFlag = false;
+ // if there's no udpates in the queue, then
+ // we need to schedule an update.
+ if (ldUpdates.peek() == null)
+ scheduleFlag = true;
+
+ if (log.isTraceEnabled()) {
+ log.trace("Queuing update: {}", update);
+ }
+ ldUpdates.add(update);
+
+ if (scheduleFlag) {
+ newInstanceTask.reschedule(1, TimeUnit.MICROSECONDS);
}
}
@@ -264,6 +306,7 @@ IRoutingService, ILinkDiscoveryListener {
getModuleDependencies() {
Collection<Class<? extends IFloodlightService>> l =
new ArrayList<Class<? extends IFloodlightService>>();
+ l.add(IFloodlightProviderService.class);
l.add(ILinkDiscoveryService.class);
return l;
}
@@ -271,19 +314,23 @@ IRoutingService, ILinkDiscoveryListener {
@Override
public void init(FloodlightModuleContext context)
throws FloodlightModuleException {
+ floodlightProvider = context.getServiceImpl(IFloodlightProviderService.class);
linkDiscovery = context.getServiceImpl(ILinkDiscoveryService.class);
switchPorts = new HashMap<Long,Set<Short>>();
switchPortLinks = new HashMap<NodePortTuple, Set<Link>>();
portBroadcastDomainLinks = new HashMap<NodePortTuple, Set<Link>>();
tunnelLinks = new HashMap<NodePortTuple, Set<Link>>();
topologyAware = new ArrayList<ITopologyListener>();
+ ldUpdates = new LinkedBlockingQueue<LDUpdate>();
+ ScheduledExecutorService ses = floodlightProvider.getScheduledExecutor();
+ newInstanceTask = new SingletonTask(ses, new NewInstanceWorker());
}
@Override
public void startUp(FloodlightModuleContext context) {
// TODO Auto-generated method stub
linkDiscovery.addListener(this);
- this.createNewInstance();
+ newInstanceTask.reschedule(1, TimeUnit.MILLISECONDS);
}
//
@@ -338,3 +385,4 @@ IRoutingService, ILinkDiscoveryListener {
return currentInstance.getBroadcastTreeForCluster(clusterId);
}
}
+
diff --git a/src/test/java/net/floodlightcontroller/linkdiscovery/internal/TopologyImplTest.java b/src/test/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManagerTest.java
similarity index 98%
rename from src/test/java/net/floodlightcontroller/linkdiscovery/internal/TopologyImplTest.java
rename to src/test/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManagerTest.java
index 02e342add375f188ccf39210275f7bc126565ed2..39fe013e726d6f22188485c349b4c5e946ebed9d 100644
--- a/src/test/java/net/floodlightcontroller/linkdiscovery/internal/TopologyImplTest.java
+++ b/src/test/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManagerTest.java
@@ -48,10 +48,10 @@ import net.floodlightcontroller.topology.TopologyManager;
*
* @author David Erickson (daviderickson@cs.stanford.edu)
*/
-public class TopologyImplTest extends FloodlightTestCase {
+public class LinkDiscoveryManagerTest extends FloodlightTestCase {
private LinkDiscoveryManager topology;
- protected static Logger log = LoggerFactory.getLogger(TopologyImplTest.class);
+ protected static Logger log = LoggerFactory.getLogger(LinkDiscoveryManagerTest.class);
public LinkDiscoveryManager getTopology() {
return topology;
diff --git a/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java b/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java
index 36dfb2ec15b3053eddb3c9a07387f44a7761fbcf..0092125d3117bac691dcbe33cd4b5016740b4b07 100644
--- a/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java
+++ b/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java
@@ -1,14 +1,15 @@
package net.floodlightcontroller.topology;
-import static org.junit.Assert.*;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import static org.junit.Assert.*;
+import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
+import net.floodlightcontroller.core.test.MockFloodlightProvider;
import net.floodlightcontroller.linkdiscovery.ILinkDiscovery;
import net.floodlightcontroller.topology.NodePortTuple;
import net.floodlightcontroller.topology.TopologyInstance;
@@ -23,6 +24,7 @@ public class TopologyInstanceTest {
protected static Logger log = LoggerFactory.getLogger(TopologyInstanceTest.class);
protected TopologyManager topologyManager;
protected FloodlightModuleContext fmc;
+ protected MockFloodlightProvider mockFloodlightProvider;
protected int DIRECT_LINK = 1;
protected int MULTIHOP_LINK = 2;
@@ -31,6 +33,8 @@ public class TopologyInstanceTest {
@Before
public void SetUp() throws Exception {
fmc = new FloodlightModuleContext();
+ mockFloodlightProvider = new MockFloodlightProvider();
+ fmc.addService(IFloodlightProviderService.class, mockFloodlightProvider);
topologyManager = new TopologyManager();
topologyManager.init(fmc);
}
@@ -103,6 +107,7 @@ public class TopologyInstanceTest {
topologyManager.addOrUpdateLink((long)r[0], (short)r[1], (long)r[2], (short)r[3], type);
}
+ topologyManager.createNewInstance();
}
public TopologyManager getTopologyManager() {
@@ -124,8 +129,8 @@ public class TopologyInstanceTest {
{1,2,3},
{4}
};
+ //tm.recompute();
createTopologyFromLinks(linkArray);
-
verifyClusters(expectedClusters);
}
@@ -219,6 +224,7 @@ public class TopologyInstanceTest {
int [][] expectedClusters = {
{1,2,3,4,5},
};
+ topologyManager.createNewInstance();
verifyClusters(expectedClusters);
}
@@ -228,6 +234,7 @@ public class TopologyInstanceTest {
int [][] expectedClusters = {
{1,2,3,5},
};
+ topologyManager.createNewInstance();
verifyClusters(expectedClusters);
}
}
@@ -260,6 +267,7 @@ public class TopologyInstanceTest {
};
createTopologyFromLinks(linkArray);
+ topologyManager.createNewInstance();
verifyClusters(expectedClusters);
verifyExpectedBroadcastPortsInClusters(expectedBroadcastPorts);
}
@@ -321,6 +329,7 @@ public class TopologyInstanceTest {
};
createTopologyFromLinks(linkArray);
+ topologyManager.createNewInstance();
verifyClusters(expectedClusters);
verifyExpectedBroadcastPortsInClusters(expectedBroadcastPorts);
}
@@ -367,6 +376,7 @@ public class TopologyInstanceTest {
};
createTopologyFromLinks(linkArray);
+ topologyManager.createNewInstance();
verifyClusters(expectedClusters);
verifyExpectedBroadcastPortsInClusters(expectedBroadcastPorts);
}
diff --git a/src/test/java/net/floodlightcontroller/topology/TopologyManagerTest.java b/src/test/java/net/floodlightcontroller/topology/TopologyManagerTest.java
index d354a6d3962b0a6dff38ba486bdeecbcc04c1968..2d367d3a8e46d3453ed9d90eb64b863a16bf9a56 100644
--- a/src/test/java/net/floodlightcontroller/topology/TopologyManagerTest.java
+++ b/src/test/java/net/floodlightcontroller/topology/TopologyManagerTest.java
@@ -1,8 +1,9 @@
package net.floodlightcontroller.topology;
import static org.junit.Assert.*;
-
+import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
+import net.floodlightcontroller.core.test.MockFloodlightProvider;
import net.floodlightcontroller.linkdiscovery.ILinkDiscovery;
import net.floodlightcontroller.topology.TopologyManager;
@@ -15,10 +16,13 @@ public class TopologyManagerTest {
protected static Logger log = LoggerFactory.getLogger(TopologyManagerTest.class);
TopologyManager topologyManager;
FloodlightModuleContext fmc;
-
+ protected MockFloodlightProvider mockFloodlightProvider;
+
@Before
public void SetUp() throws Exception {
+ mockFloodlightProvider = new MockFloodlightProvider();
fmc = new FloodlightModuleContext();
+ fmc.addService(IFloodlightProviderService.class, mockFloodlightProvider);
topologyManager = new TopologyManager();
topologyManager.init(fmc);
}