Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS
Conflicts:
src/test/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImplTest.java
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index 9c0ee4e..0e9f32b 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -139,16 +139,16 @@
if (vportSrc != null && vportDst != null) {
for (Edge e : vportSrc.getEdges(Direction.OUT)) {
- log.debug("deleteLink(): {} {}", e.getLabel(), e.getVertex(Direction.IN));
- // if (e.getLabel().equals("link") && e.getVertex(Direction.OUT).equals(vportDst)) {
- if (e.getLabel().equals("link")) {
+ log.debug("deleteLink(): {} in {} out {}",
+ new Object[]{e.getLabel(), e.getVertex(Direction.IN), e.getVertex(Direction.OUT)});
+ if (e.getLabel().equals("link") && e.getVertex(Direction.IN).equals(vportDst)) {
graph.removeEdge(e);
count++;
}
}
graph.stopTransaction(Conclusion.SUCCESS);
- log.debug("deleteLink(): {} {} src {} dst {}", new Object[]{
- (count > 0) ? "deleted " + count : "failure", lt, vportSrc, vportDst});
+ log.debug("deleteLink(): deleted {} edges {} src {} dst {}", new Object[]{
+ count, lt, vportSrc, vportDst});
} else {
log.error("deleteLink(): failed src port vertex not found {} src {} dst {}", new Object[]{lt, vportSrc, vportDst});