commit 708bca4f8fc17728e9bd3d57fff6f88295ec982b
author Saurav Das <sauravdas@alumni.stanford.edu> Mon Nov 17 13:31:21 2014 -0800
committer Saurav Das <sauravdas@alumni.stanford.edu> Mon Nov 17 13:31:21 2014 -0800
tree 689d8583c61c8976bf587e6b4d11af89a23a9e35
parent 32d72b7b00ee74c553df9c202e61d94735a44eb7

Changes to ensure that port is always taken at transit router
for Dell switches irrespective of php or non-php case

Change-Id: I88dd3058177b7d6148115d68df2352561813b1ce

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 aada531..cfa98fd 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -1535,7 +1535,7 @@
             actions.add(decMplsTtlAction);
         }
 
-        if ((sw13 instanceof OFSwitchImplDellOSR) && isTransitRouter(sw) && !php) {
+        if ((sw13 instanceof OFSwitchImplDellOSR) && isTransitRouter(sw)) {
             PortNumber port = pickOnePort(sw, fwdSws);
             if (port == null) {
                 log.warn("Failed to get a port from NeightborSet");
@@ -1553,8 +1553,7 @@
             actions.add(outputAction);
             actions.add(setSAAction);
             actions.add(setDAAction);
-        }
-        else {
+        } else {
             GroupAction groupAction = new GroupAction();
             for (String dpid: fwdSws)
                 groupAction.addSwitch(new Dpid(dpid));