DeviceManager update to take into account that previous attachment belongs to...

DeviceManager update to take into account that previous attachment belongs to non-broadcast domain attachment point.
Adding an interface to ITopologyService that indicates if tunnels are enabled for traffic between two hosts.

src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java

@@ -262,8 +262,8 @@ public class Device implements IDevice {
                 !deviceManager.isValidAttachmentPoint(dpid, port) ||
                 ///*||
                 (prev != null && 
-                //topology.isBroadcastDomainPort(prev.getSwitchDPID().longValue(), 
-                //                               prev.getSwitchPort().shortValue()) == false &&
+                topology.isBroadcastDomainPort(prev.getSwitchDPID().longValue(), 
+                                               prev.getSwitchPort().shortValue()) == false &&
                 topology.isBroadcastDomainPort(dpid.longValue(), port.shortValue()) &&
                 topology.isConsistent(prev.getSwitchDPID().longValue(),
                                                        prev.getSwitchPort().shortValue(),

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

@@ -168,4 +168,10 @@ public interface ITopologyService extends IFloodlightService  {
      */
     public Set<NodePortTuple> getBroadcastDomainPorts();
     public Set<NodePortTuple> getTunnelPorts();
+    
+    /**
+     * Indicates if tunnels are allowed between a given source
+     * destination pair.
+     */
+    public boolean isTunnelEnabled(long srcMac, long dstMac);
 }

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

@@ -1005,5 +1005,10 @@ public class TopologyManager implements
     public TopologyInstance getCurrentInstance() {
         return this.getCurrentInstance(true);
     }
+
+    @Override
+    public boolean isTunnelEnabled(long srcMac, long dstMac) {
+        return false;
+    }
 }
 

src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java

@@ -505,6 +505,7 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
         		1L, (short)2)).andReturn(true).anyTimes();
         expect(mockTopology.isInSameBroadcastDomain(1L, (short)2,
         		1L, (short)1)).andReturn(true).anyTimes();
+        expect(mockTopology.isConsistent(anyLong(), anyShort(), anyLong(), anyShort())).andReturn(false).anyTimes();
         
         replay(mockTopology);