commit 67b6cba8764bf4af422ff6523dd4207c2510e3e7
author Jonathan Hart <jono@onlab.us> Fri May 30 22:36:37 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Mon Jun 02 10:29:02 2014 -0700
tree 467fbf22c4b6a026dcdb4930ca90b94acfd5b63e
parent 8447c361ad6b00d3d025b1e54fb458c2bc0ee337

Don't send port events to the TopologyManager for switches we're not in control of.

Change-Id: I092115bf0fdf0c9f6a22fa6a8308c74ec13dafc1

src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java

diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
index 6c90003..904ca3f 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
@@ -152,15 +152,19 @@
 
     @Override
     public void switchPortAdded(Long switchId, OFPhysicalPort port) {
-        PortEvent portEvent = new PortEvent(switchId, (long) port.getPortNumber());
-        topologyDiscoveryInterface.putPortDiscoveryEvent(portEvent);
-        linkDiscovery.removeFromSuppressLLDPs(switchId, port.getPortNumber());
+        if (registryService.hasControl(switchId)) {
+            PortEvent portEvent = new PortEvent(switchId, (long) port.getPortNumber());
+            topologyDiscoveryInterface.putPortDiscoveryEvent(portEvent);
+            linkDiscovery.removeFromSuppressLLDPs(switchId, port.getPortNumber());
+        }
     }
 
     @Override
     public void switchPortRemoved(Long switchId, OFPhysicalPort port) {
-        PortEvent portEvent = new PortEvent(switchId, (long) port.getPortNumber());
-        topologyDiscoveryInterface.removePortDiscoveryEvent(portEvent);
+        if (registryService.hasControl(switchId)) {
+            PortEvent portEvent = new PortEvent(switchId, (long) port.getPortNumber());
+            topologyDiscoveryInterface.removePortDiscoveryEvent(portEvent);
+        }
     }
 
     @Override