Merge pull request #152 from sriniram/master

Added method to get blocked ports as part of ITopologyService.

src/main/java/net/floodlightcontroller/topology/ITopologyService.java

@@ -174,4 +174,12 @@ public interface ITopologyService extends IFloodlightService  {
      * destination pair.
      */
     public boolean isTunnelEnabled(long srcMac, long dstMac);
+
+    /**
+     * Returns a set of blocked ports.  The set of blocked
+     * ports is the union of all the blocked ports across all
+     * instances.
+     * @return
+     */
+    public Set<NodePortTuple> getBlockedPorts();
 }

src/main/java/net/floodlightcontroller/topology/TopologyManager.java

@@ -409,6 +409,25 @@ public class TopologyManager implements
         return tunnelLinks.keySet();
     }
 
+    @Override
+    public Set<NodePortTuple> getBlockedPorts() {
+        Set<NodePortTuple> bp;
+        Set<NodePortTuple> blockedPorts =
+                new HashSet<NodePortTuple>();
+
+        // As we might have two topologies, simply get the union of
+        // both of them and send it.
+        bp = currentInstance.getBlockedPorts();
+        if (bp != null)
+            blockedPorts.addAll(bp);
+
+        bp = currentInstanceWithoutTunnels.getBlockedPorts();
+        if (bp != null)
+            blockedPorts.addAll(bp);
+
+        return blockedPorts;
+    }
+
     ////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////