From 06600b402072726c4eaccc68e4bbab0d7ca63482 Mon Sep 17 00:00:00 2001
From: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date: Tue, 29 Jan 2013 12:20:13 -0800
Subject: [PATCH] Bug fix: When tunnel links are identified, they should not be
added to topology switchportlinks. Update unit tests.
---
.../topology/TopologyManager.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/topology/TopologyManager.java b/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
index 0642396c9..8cffa7c6c 100644
--- a/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
+++ b/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
@@ -1223,16 +1223,20 @@ public class TopologyManager implements
public void addOrUpdateLink(long srcId, short srcPort, long dstId,
short dstPort, LinkType type) {
Link link = new Link(srcId, srcPort, dstId, dstPort);
- addPortToSwitch(srcId, srcPort);
- addPortToSwitch(dstId, dstPort);
-
- addLinkToStructure(switchPortLinks, link);
if (type.equals(LinkType.MULTIHOP_LINK)) {
+ addPortToSwitch(srcId, srcPort);
+ addPortToSwitch(dstId, dstPort);
+ addLinkToStructure(switchPortLinks, link);
+
addLinkToStructure(portBroadcastDomainLinks, link);
dtLinksUpdated = removeLinkFromStructure(directLinks, link);
linksUpdated = true;
} else if (type.equals(LinkType.DIRECT_LINK)) {
+ addPortToSwitch(srcId, srcPort);
+ addPortToSwitch(dstId, dstPort);
+ addLinkToStructure(switchPortLinks, link);
+
addLinkToStructure(directLinks, link);
removeLinkFromStructure(portBroadcastDomainLinks, link);
dtLinksUpdated = true;
--
GitLab