LogFix: TopologyPublisher logging.
LDUpdate event logged here could potentially be any of below:
LINK_ADDED("Link Added"), // Operation Added by ONOS
LINK_UPDATED("Link Updated"),
LINK_REMOVED("Link Removed"),
SWITCH_UPDATED("Switch Updated"),
SWITCH_REMOVED("Switch Removed"),
PORT_UP("Port Up"),
PORT_DOWN("Port Down");
Moved the ZK check and logging to apoint after
LDUpdate has been confirmed to be a LinkEvent that we care.
Change-Id: I8baf7945b30b978319c665ab5c625aae724a1bb0
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 97f5812..36399bc 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
@@ -137,22 +137,28 @@
(long) update.getSrcPort(), update.getDst(),
(long) update.getDstPort());
- if (!registryService.hasControl(update.getDst())) {
- // Don't process or send a link event if we're not master for the
- // destination switch
- log.debug("Not the master for dst switch {}. Suppressed link event {}.",
- update.getDst(), linkEvent);
- return;
- }
-
switch (update.getOperation()) {
case LINK_ADDED:
+ if (!registryService.hasControl(update.getDst())) {
+ // Don't process or send a link event if we're not master for the
+ // destination switch
+ log.debug("Not the master for dst switch {}. Suppressed link add event {}.",
+ update.getDst(), linkEvent);
+ return;
+ }
topologyDiscoveryInterface.putLinkDiscoveryEvent(linkEvent);
break;
case LINK_UPDATED:
// We don't use the LINK_UPDATED event (unsure what it means)
break;
case LINK_REMOVED:
+ if (!registryService.hasControl(update.getDst())) {
+ // Don't process or send a link event if we're not master for the
+ // destination switch
+ log.debug("Not the master for dst switch {}. Suppressed link remove event {}.",
+ update.getDst(), linkEvent);
+ return;
+ }
topologyDiscoveryInterface.removeLinkDiscoveryEvent(linkEvent);
break;
default: