From 11bfeb7ae44791423f2c7dea226ebb341240c55f Mon Sep 17 00:00:00 2001
From: Kanzhe Jiang <kanzhe.jiang@bigswitch.com>
Date: Fri, 13 Jan 2012 09:31:32 -0800
Subject: [PATCH] Select only non-internal AP when merging cluster
---
.../devicemanager/internal/DeviceManagerImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index 472a8b13d..92bd7c338 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -1350,7 +1350,8 @@ public class DeviceManagerImpl implements IDeviceManager, IOFMessageListener,
// Get only the latest DAPs into a map
for (DeviceAttachmentPoint dap : d.getAttachmentPoints()) {
- if (DeviceAttachmentPoint.isNotNull(dap)) {
+ if (DeviceAttachmentPoint.isNotNull(dap) &&
+ !topology.isInternal(dap.getSwitchPort())) {
long clusterId =
dap.getSwitchPort().getSw().getSwitchClusterId();
if (map.containsKey(clusterId)) {
@@ -1358,8 +1359,7 @@ public class DeviceManagerImpl implements IDeviceManager, IOFMessageListener,
// point to "old" list.
// They are removed after deleting from storage.
DeviceAttachmentPoint value = map.get(clusterId);
- if (dap.getLastSeen().after(value.getLastSeen()) &&
- !topology.isInternal(dap.getSwitchPort())) {
+ if (dap.getLastSeen().after(value.getLastSeen())) {
map.put(clusterId, dap);
d.addOldAttachmentPoint(value); // on copy of device
}
--
GitLab