diff --git a/src/main/java/net/floodlightcontroller/topology/TopologyManager.java b/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
index 0ea778f8d5f3f441d1e55dc4a1828aa316002dfc..8eea1748ae5a3ba1c9054001267d0928af2a10e3 100644
--- a/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
+++ b/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
@@ -230,14 +230,12 @@ public class TopologyManager implements
     
     @Override
     public Set<NodePortTuple> getBroadcastDomainLinks() {
-        // TODO Auto-generated method stub
-        return null;
+        return portBroadcastDomainLinks.keySet();
     }
 
     @Override
     public Set<NodePortTuple> getTunnelLinks() {
-        // TODO Auto-generated method stub
-        return null;
+        return tunnelLinks.keySet();
     }
 
     // ***************