commit 0a4846ee6aa727cf25b2f0b34c526f715f6a6fa9
author Jonathan Hart <jono@onlab.us> Tue Feb 18 11:03:40 2014 -0800
committer Jonathan Hart <jono@onlab.us> Tue Feb 18 11:07:07 2014 -0800
tree aef7def3a81993653309f3a03edeb3536650384b
parent dab9469932dfed3ac5ee1330d1f63f14e5e7f8b0

Log dropped events

Change-Id: I12f0a76ff3b7ad7fd5d75a1b7148e6a3402067c7

src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java

diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
index c65136b..101f628 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
@@ -400,6 +400,8 @@
 	private boolean prepareForAddPortEvent(PortEvent portEvt) {
 		// Parent Switch must exist
 		if ( getSwitch(portEvt.getDpid()) == null) {
+			log.warn("Dropping add port event because switch doesn't exist: {}",
+					portEvt);
 		    return false;
 		}
 		// Prep: None
@@ -456,12 +458,16 @@
 	    Switch srcSw = getSwitch(linkEvt.getSrc().dpid);
 	    Switch dstSw = getSwitch(linkEvt.getDst().dpid);
 	    if ( srcSw == null || dstSw == null ) {
+	    log.warn("Dropping add link event because switch doesn't exist: {}",
+	    		linkEvt);
 		return false;
 	    }
 	    // Src/Dst Port must exist
 	    Port srcPort = srcSw.getPort(linkEvt.getSrc().number);
 	    Port dstPort = dstSw.getPort(linkEvt.getDst().number);
 	    if ( srcPort == null || dstPort == null ) {
+	    log.warn("Dropping add link event because port doesn't exist: {}",
+	    		linkEvt);
 		return false;
 	    }
 
@@ -490,14 +496,14 @@
 	    Switch srcSw = getSwitch(linkEvt.getSrc().dpid);
 	    Switch dstSw = getSwitch(linkEvt.getDst().dpid);
 	    if ( srcSw == null || dstSw == null ) {
-		log.warn("Rejecting removeLink {} because switch doesn't exist", linkEvt);
+		log.warn("Dropping remove link event because switch doesn't exist: {}", linkEvt);
 		return false;
 	    }
 	    // Src/Dst Port must exist
 	    Port srcPort = srcSw.getPort(linkEvt.getSrc().number);
 	    Port dstPort = dstSw.getPort(linkEvt.getDst().number);
 	    if ( srcPort == null || dstPort == null ) {
-		log.warn("Rejecting removeLink {} because port doesn't exist", linkEvt);
+		log.warn("Dropping remove link event because port doesn't exist {}", linkEvt);
 		return false;
 	    }
 
@@ -509,7 +515,7 @@
 	    if (link == null ||
 		    !link.getDestinationPortNumber().equals(linkEvt.getDst().number)
 		    || !link.getDestinationSwitchDpid().equals(linkEvt.getDst().dpid)) {
-		log.warn("Rejecting removeLink {} because link doesn't exist", linkEvt);
+		log.warn("Dropping remove link event because link doesn't exist: {}", linkEvt);
 		return false;
 	    }
 	    // Prep: None