Device manager will learn new attachment points only if the switch ports do...

Device manager will learn new attachment points only if the switch ports do not belong to the same broadcast domain.

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

@@ -1069,7 +1069,11 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
             // If two ports are in the same port-channel, we don't treat it
             // as conflict, but will forward based on the last seen switch-port
             if (!devMgrMaps.inSamePortChannel(swPort,
-                    curAttachmentPoint.getSwitchPort())) {
+                    curAttachmentPoint.getSwitchPort()) && 
+                    !topology.isInSameBroadcastDomain(swPort.getSw().getId(),
+                                                      swPort.getPort(),
+                                                      curAttachmentPoint.getSwitchPort().getSw().getId(),
+                                                      curAttachmentPoint.getSwitchPort().getPort())) {
                 curAttachmentPoint.setConflict(currentDate);
                 if (curAttachmentPoint.isFlapping()) {
                     curAttachmentPoint.setBlocked(true);

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

@@ -40,4 +40,6 @@ public interface ITopologyService extends IFloodlightService  {
     public void addListener(ITopologyListener listener);
     
     public boolean isIncomingBroadcastAllowedOnSwitchPort(long sw, short portId);
+
+    public boolean isInSameBroadcastDomain(long s1, short p1, long s2, short p2);
 }

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

@@ -384,5 +384,11 @@ IRoutingService, ILinkDiscoveryListener {
     public BroadcastTree getBroadcastTreeForCluster(long clusterId) {
         return currentInstance.getBroadcastTreeForCluster(clusterId);
     }
+
+    @Override
+    public boolean isInSameBroadcastDomain(long s1, short p1, long s2, short p2) {
+        // TODO Auto-generated method stub
+        return false;
+    }
 }
 

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

@@ -450,6 +450,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
         deviceManager.setTopology(mockTopology);
 
         // Start recording the replay on the mocks
+        expect(mockTopology.isInSameBroadcastDomain((long)1, (short)2, (long)1, (short)1)).andReturn(false).anyTimes();
+        expect(mockTopology.isInSameBroadcastDomain((long)1, (short)1, (long)1, (short)2)).andReturn(false).anyTimes();
         replay(mockSwitch, mockTopology);
 
         // Get the listener and trigger the packet in