commit 370e17bd4b67967408f2000f56c3954df8abbd9e
author Sangho Shin <sangho@onlab.us> Mon Oct 27 11:39:08 2014 -0700
committer Sangho Shin <sangho@onlab.us> Mon Oct 27 11:42:50 2014 -0700
tree bf008d0b63e90a1af4009243d57879cbca388207
parent 05ed322075ca33bc903c972733dfa979ab3333cb

When ECMP in transit routers is not supported, when a link is broken just recompute the path.

Change-Id: I2e94cfa193466447b779a886e71b4e6d0cfb4660

src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java

diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
index 2e89510..3f26842 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -118,7 +118,7 @@
     private HashMap<Integer, HashMap<Integer, List<Integer>>> adjacencySidTable;
 
     // Flag whether transit router supports ECMP or not
-    private boolean supportTransitECMP = true;
+    private boolean supportTransitECMP = false;
 
     private int testMode = 0;
 
@@ -482,13 +482,13 @@
     /**
      * Check if all links are gone b/w the two switches. If all links are gone,
      * then we need to recalculate the path. Otherwise, just report link failure
-     * to the driver.
+     * to the driver. IF the switches do not support ECMP in transit routers and
+     * the link removed is between transit routers, then just recompute the path
+     * regardless of ECMP.
      *
      * @param linkEntries
      */
     private void processLinkRemoval(Collection<LinkData> linkEntries) {
-        boolean recomputationRequired = false;
-
         for (LinkData link : linkEntries) {
             SwitchPort srcPort = link.getSrc();
             SwitchPort dstPort = link.getDst();
@@ -506,13 +506,20 @@
             log.debug("Remove port {} from switch {}", srcPort, srcSw);
             log.debug("Remove port {} from switch {}", dstPort, dstSw);
 
-            Switch srcSwitch = mutableTopology.getSwitch(srcPort.getDpid());
-            if (srcSwitch.getLinkToNeighbor(dstPort.getDpid()) == null) {
-                // TODO: it is only for debugging purpose.
-                // We just need to call populateEcmpRoutingRules() and return;
-                recomputationRequired = true;
-                log.debug("All links are gone b/w {} and {}", srcPort.getDpid(),
-                        dstPort.getDpid());
+            if (!supportTransitECMP &&
+               isTransitRouter(mutableTopology.getSwitch(srcPort.getDpid())) &&
+               isTransitRouter(mutableTopology.getSwitch(dstPort.getDpid()))) {
+                populateEcmpRoutingRules(false);
+            }
+            else {
+                Switch srcSwitch = mutableTopology.getSwitch(srcPort.getDpid());
+                if (srcSwitch.getLinkToNeighbor(dstPort.getDpid()) == null) {
+                    log.debug("All links are gone b/w {} and {}", srcPort.getDpid(),
+                            dstPort.getDpid());
+                    log.debug("All paths will recomputed regardless of the rest "
+                            + "of the event");
+                    populateEcmpRoutingRules(false);
+                }
             }
 
             String key = link.getSrc().getDpid().toString()+
@@ -522,8 +529,6 @@
             }
         }
 
-        if (recomputationRequired)
-            populateEcmpRoutingRules(false);
     }
 
     /**