commit f66aa267fbf7387541fbb4fa7fbf441094f77bb0
author Sangho Shin <sangho@onlab.us> Mon Oct 27 16:03:42 2014 -0700
committer Sangho Shin <sangho@onlab.us> Mon Oct 27 16:03:42 2014 -0700
tree 61cb3374f42a134ad491aa78ca34a4cbdcb9b57b
parent 8a661e7e20ae2a531455c1964119b2b8e3fd8306

Change the SupportECMPTransit flag to checking switch object type of OFSwitchImplDellOSR

Change-Id: I4a7a642942fce2313737131ed00f8e8f8a401402

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 4391c8b..c5e0ee9 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -507,7 +507,8 @@
             log.debug("Remove port {} from switch {}", srcPort, srcSw);
             log.debug("Remove port {} from switch {}", dstPort, dstSw);
 
-            if (!supportTransitECMP &&
+            if ((srcSw instanceof OFSwitchImplDellOSR &&
+                    dstSw instanceof OFSwitchImplDellOSR) &&
                isTransitRouter(mutableTopology.getSwitch(srcPort.getDpid())) &&
                isTransitRouter(mutableTopology.getSwitch(dstPort.getDpid()))) {
                 populateEcmpRoutingRules(false);
@@ -1716,8 +1717,12 @@
         Switch srcSwitch = mutableTopology.getSwitch(new Dpid(srcSwDpid));
         if (srcSwitch == null)
             return null;
+        IOF13Switch srcSwitch13 = (IOF13Switch)floodlightProvider.getMasterSwitch(
+                getSwId(srcSwitch.getDpid().toString()));
+
         for (Dpid neighborDpid: ns.getDpids()) {
-            if (!supportTransitECMP && ns.getDpids().size() == 1) {
+            if (srcSwitch13 instanceof OFSwitchImplDellOSR &&
+                    ns.getDpids().size() == 1) {
                 Switch dstSwitch = mutableTopology.getSwitch(neighborDpid);
                 if (isTransitRouter(srcSwitch) && isTransitRouter(dstSwitch)) {
                     Link link = srcSwitch.getLinkToNeighbor(neighborDpid);
@@ -1974,7 +1979,9 @@
                         else {
                             Dpid firstVia = via.get(via.size()-1);
                             fwdSws.add(firstVia);
-                            if (!supportTransitECMP &&
+                            IOF13Switch targetSw13 = (IOF13Switch)floodlightProvider.getMasterSwitch(
+                                    getSwId(targetSw.getDpid().toString()));
+                            if (targetSw13 instanceof OFSwitchImplDellOSR &&
                                 isTransitRouter(targetSw) &&
                                 isTransitRouter(mutableTopology.getSwitch(firstVia))) {
                                 return fwdSws;