commit 4019786cefef72363cb0e11c59165839ff0ba3f2
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Feb 17 11:30:15 2017 -0800
committer Thomas Vachuska <tom@onlab.us> Tue Feb 21 18:39:08 2017 +0000
tree 55257430d9fc4feefb01ebce17e2fb7ebdedbf9a
parent 8bda4d84e9204c7d4d722158ae6e3e8106096c90

Allow Link.Type transition to types other than DIRECT

Change-Id: Ib7accc4d055c269afc28308bdda31768e05199c2

core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
index d93672e..2240eb4 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
@@ -293,11 +293,17 @@
 
     private LinkDescription createOrUpdateLinkInternal(LinkDescription current, LinkDescription updated) {
         if (current != null) {
-            // we only allow transition from INDIRECT -> DIRECT
+            Type type;
+            if (current.type() == DIRECT && updated.type() == Type.INDIRECT) {
+                // mask transition from DIRECT -> INDIRECT, likely to be triggered by BDDP
+                type = Type.DIRECT;
+            } else {
+                type = updated.type();
+            }
             return new DefaultLinkDescription(
                     current.src(),
                     current.dst(),
-                    current.type() == DIRECT ? DIRECT : updated.type(),
+                    type,
                     current.isExpected(),
                     union(current.annotations(), updated.annotations()));
         }
@@ -324,7 +330,7 @@
                 return newLink;
             } else if (existingLink.state() != newLink.state() ||
                     existingLink.isExpected() != newLink.isExpected() ||
-                    (existingLink.type() == INDIRECT && newLink.type() == DIRECT) ||
+                    (existingLink.type() !=  newLink.type()) ||
                     !AnnotationsUtil.isEqual(existingLink.annotations(), newLink.annotations())) {
                 eventType.set(LINK_UPDATED);
                 return newLink;