LinkStore bugfix. avoid DIRECT -> INDIRECT transition

Change-Id: If2a4c3e5e33f705a73374010cd7941167cef1aaf

@@ -23,9 +23,9 @@ import org.onlab.onos.net.DefaultAnnotations;
 import org.onlab.onos.net.DefaultLink;
 import org.onlab.onos.net.DefaultLink;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.Link;
-import org.onlab.onos.net.SparseAnnotations;
 import org.onlab.onos.net.Link.Type;
 import org.onlab.onos.net.Link.Type;
 import org.onlab.onos.net.LinkKey;
 import org.onlab.onos.net.LinkKey;
+import org.onlab.onos.net.SparseAnnotations;
 import org.onlab.onos.net.device.DeviceClockService;
 import org.onlab.onos.net.device.DeviceClockService;
 import org.onlab.onos.net.link.DefaultLinkDescription;
 import org.onlab.onos.net.link.DefaultLinkDescription;
 import org.onlab.onos.net.link.LinkDescription;
 import org.onlab.onos.net.link.LinkDescription;
@@ -263,8 +263,8 @@ public class GossipLinkStore
             ProviderId providerId,
             ProviderId providerId,
             Timestamped<LinkDescription> linkDescription) {
             Timestamped<LinkDescription> linkDescription) {
 
 
-        LinkKey key = linkKey(linkDescription.value().src(),
-                              linkDescription.value().dst());
+        final LinkKey key = linkKey(linkDescription.value().src(),
+                                    linkDescription.value().dst());
         Map<ProviderId, Timestamped<LinkDescription>> descs = getOrCreateLinkDescriptions(key);
         Map<ProviderId, Timestamped<LinkDescription>> descs = getOrCreateLinkDescriptions(key);
 
 
         synchronized (descs) {
         synchronized (descs) {
@@ -275,6 +275,7 @@ public class GossipLinkStore
                 if (linkDescription.isNewer(linkRemovedTimestamp)) {
                 if (linkDescription.isNewer(linkRemovedTimestamp)) {
                     removedLinks.remove(key);
                     removedLinks.remove(key);
                 } else {
                 } else {
+                    log.trace("Link {} was already removed ignoring.", key);
                     return null;
                     return null;
                 }
                 }
             }
             }
@@ -299,17 +300,25 @@ public class GossipLinkStore
         // merge existing annotations
         // merge existing annotations
         Timestamped<LinkDescription> existingLinkDescription = descs.get(providerId);
         Timestamped<LinkDescription> existingLinkDescription = descs.get(providerId);
         if (existingLinkDescription != null && existingLinkDescription.isNewer(linkDescription)) {
         if (existingLinkDescription != null && existingLinkDescription.isNewer(linkDescription)) {
+            log.trace("local info is more up-to-date, ignoring {}.", linkDescription);
             return null;
             return null;
         }
         }
         Timestamped<LinkDescription> newLinkDescription = linkDescription;
         Timestamped<LinkDescription> newLinkDescription = linkDescription;
         if (existingLinkDescription != null) {
         if (existingLinkDescription != null) {
+            // we only allow transition from INDIRECT -> DIRECT
+            final Type newType;
+            if (existingLinkDescription.value().type() == DIRECT) {
+                newType = DIRECT;
+            } else {
+                newType = linkDescription.value().type();
+            }
             SparseAnnotations merged = union(existingLinkDescription.value().annotations(),
             SparseAnnotations merged = union(existingLinkDescription.value().annotations(),
                     linkDescription.value().annotations());
                     linkDescription.value().annotations());
             newLinkDescription = new Timestamped<LinkDescription>(
             newLinkDescription = new Timestamped<LinkDescription>(
                     new DefaultLinkDescription(
                     new DefaultLinkDescription(
                         linkDescription.value().src(),
                         linkDescription.value().src(),
                         linkDescription.value().dst(),
                         linkDescription.value().dst(),
-                        linkDescription.value().type(), merged),
+                        newType, merged),
                     linkDescription.timestamp());
                     linkDescription.timestamp());
         }
         }
         return descs.put(providerId, newLinkDescription);
         return descs.put(providerId, newLinkDescription);
@@ -343,6 +352,8 @@ public class GossipLinkStore
             return null;
             return null;
         }
         }
 
 
+        // Note: INDIRECT -> DIRECT transition only
+        // so that BDDP discovered Link will not overwrite LDDP Link
         if ((oldLink.type() == INDIRECT && newLink.type() == DIRECT) ||
         if ((oldLink.type() == INDIRECT && newLink.type() == DIRECT) ||
             !AnnotationsUtil.isEqual(oldLink.annotations(), newLink.annotations())) {
             !AnnotationsUtil.isEqual(oldLink.annotations(), newLink.annotations())) {
 
 

@@ -172,12 +172,19 @@ public class SimpleLinkStore
         LinkDescription oldDesc = descs.get(providerId);
         LinkDescription oldDesc = descs.get(providerId);
         LinkDescription newDesc = linkDescription;
         LinkDescription newDesc = linkDescription;
         if (oldDesc != null) {
         if (oldDesc != null) {
+            // we only allow transition from INDIRECT -> DIRECT
+            final Type newType;
+            if (oldDesc.type() == DIRECT) {
+                newType = DIRECT;
+            } else {
+                newType = linkDescription.type();
+            }
             SparseAnnotations merged = union(oldDesc.annotations(),
             SparseAnnotations merged = union(oldDesc.annotations(),
                     linkDescription.annotations());
                     linkDescription.annotations());
             newDesc = new DefaultLinkDescription(
             newDesc = new DefaultLinkDescription(
                         linkDescription.src(),
                         linkDescription.src(),
                         linkDescription.dst(),
                         linkDescription.dst(),
-                        linkDescription.type(), merged);
+                        newType, merged);
         }
         }
         return descs.put(providerId, newDesc);
         return descs.put(providerId, newDesc);
     }
     }