Merge into master from pull request #62:

device manager attachment points on broadcast domains (https://github.com/floodlight/floodlight/pull/62)

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

@@ -979,9 +979,15 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
                     // An exception is thrown if the attachmentPoint is blocked.
                     if (newAttachmentPoint) {
                         attachmentPoint = getNewAttachmentPoint(nd, switchPort);
-                        nd.addAttachmentPoint(attachmentPoint);
-                        evHistAttachmtPt(nd, attachmentPoint.getSwitchPort(),
-                                         EvAction.ADDED, "New AP from pkt-in");
+                        if (attachmentPoint == null) {
+                            newAttachmentPoint = false;
+                        } else {
+                            nd.addAttachmentPoint(attachmentPoint);
+                            evHistAttachmtPt(nd, 
+                                             attachmentPoint.getSwitchPort(),
+                                             EvAction.ADDED, 
+                                             "New AP from pkt-in");
+                        }
                     }
 
                     if (clearAttachmentPoints) {
@@ -1079,6 +1085,16 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
             }
         }
 
+        if (curAttachmentPoint != null) {
+            Long curDPID = curAttachmentPoint.getSwitchPort().getSw().getId();
+            Short curPort = curAttachmentPoint.getSwitchPort().getPort();
+            boolean sameBD = 
+                    topology.isInSameBroadcastDomain(swPort.getSw().getId(),
+                                                     swPort.getPort(),
+                                                     curDPID, curPort);
+            if (sameBD) return null;
+        }
+        
         // Do we have an old attachment point?
         DeviceAttachmentPoint attachmentPoint = 
                                     device.getOldAttachmentPoint(swPort);
@@ -1116,11 +1132,7 @@ 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()) && 
-                    !topology.isInSameBroadcastDomain(swPort.getSw().getId(),
-                                                      swPort.getPort(),
-                                                      curAttachmentPoint.getSwitchPort().getSw().getId(),
-                                                      curAttachmentPoint.getSwitchPort().getPort())) {
+                    curAttachmentPoint.getSwitchPort())) {
                 curAttachmentPoint.setConflict(currentDate);
                 if (curAttachmentPoint.isFlapping()) {
                     curAttachmentPoint.setBlocked(true);

src/main/java/net/floodlightcontroller/routing/ForwardingBase.java

@@ -223,9 +223,6 @@ public abstract class ForwardingBase implements IOFMessageListener, IDeviceManag
             log.debug("pushRoute flowmod sw={} inPort={} outPort={}",
                       new Object[] { sw, fm.getMatch().getInputPort(), 
                                     ((OFActionOutput)fm.getActions().get(0)).getPort() });
-            log.info("Flow mod sent: Wildcard={} match={}",
-                    Integer.toHexString(fm.getMatch().getWildcards()),
-                    fm.getMatch().toString());
             sw.write(fm, cntx);
             if (doFlush) {
                 sw.flush();

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

@@ -544,6 +544,11 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
                            .andReturn(false).atLeastOnce();
         expect(mockTopology.isBroadcastDomainPort(1L, (short)2))
                            .andReturn(false).atLeastOnce();
+        expect(mockTopology.isInSameBroadcastDomain((long)1, (short)1, 
+                                                    (long)1, (short)2)).andReturn(false).anyTimes();
+        expect(mockTopology.isInSameBroadcastDomain((long)1, (short)2, 
+                                                    (long)1, (short)1)).andReturn(false).anyTimes();
+
         deviceManager.setTopology(mockTopology);
 
         // Start recording the replay on the mocks