commit 721ca04189c7a15d72006e1f6cfc96ef95050ed4
author Sangho Shin <sangho@onlab.us> Thu Oct 09 13:03:40 2014 -0700
committer Sangho Shin <sangho@onlab.us> Thu Oct 09 13:05:06 2014 -0700
tree 89b9a33c07413c53ca420a587f0f4529240b2b48
parent d563af69764a8279b1520e026d996861850e4d05

 - Add more null check to get the switch object
 - Support ring topology case
  -- populate MPLS table also for the edge router
  -- do not set node ID in Group Action when the neighbor switch is the destination

Change-Id: Id5bb5fbff5759a53cd403960f36d853d591cd465

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 b9b0f0b..74dc0de 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -389,7 +389,8 @@
 
             IOF13Switch sw = (IOF13Switch) floodlightProvider.getMasterSwitch(
                     getSwId(port.getDpid().toString()));
-            sw.addPortToGroups(port.getPortNumber());
+            if (sw != null)
+                sw.addPortToGroups(port.getPortNumber());
 
             log.debug("Add port {} to switch {}", port, dpid);
         }
@@ -704,6 +705,8 @@
             String routerIp = destSwitch.getStringAttribute("routerIp");
             setIpTableRouter(targetSw, routerIp, getMplsLabel(destSw), fwdToSw,
                     null, modified);
+            // Edge router can be a transit router
+            setMplsTable(targetSw, getMplsLabel(destSw), fwdToSw, modified);
         }
         // Only if the target switch is the edge router, then set the IP rules
         else if (IsEdgeRouter(targetSw.getDpid().toString())) {
@@ -713,6 +716,8 @@
             String routerIp = destSwitch.getStringAttribute("routerIp");
             setIpTableRouter(targetSw, routerIp, getMplsLabel(destSw), fwdToSw,
                     null, modified);
+            // Edge router can be a transit router
+            setMplsTable(targetSw, getMplsLabel(destSw), fwdToSw, modified);
         }
         // if it is a transit router, then set rules in the MPLS table
         else {
@@ -750,10 +755,12 @@
             IOF13Switch sw13 = (IOF13Switch) floodlightProvider.getMasterSwitch(
                     getSwId(targetSw.getDpid().toString()));
 
-            try {
-                sw13.pushFlows(entries);
-            } catch (IOException e) {
-                e.printStackTrace();
+            if (sw13 != null) {
+                try {
+                    sw13.pushFlows(entries);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
         }
 
@@ -808,6 +815,7 @@
 
         Ipv4Match ipMatch = new Ipv4Match(subnetIp);
         List<Action> actions = new ArrayList<>();
+        GroupAction groupAction = new GroupAction();
 
         // If destination SW is the same as the fwd SW, then do not push MPLS
         // label
@@ -822,6 +830,8 @@
             //actions.add(copyTtlOutAction);
             //actions.add(decMplsTtlAction);
             actions.add(setIdAction);
+            groupAction.setEdgeLabel(Integer.parseInt(mplsLabel));
+
         }
         else {
             String fwdToSw = fwdToSws.get(0);
@@ -840,12 +850,10 @@
                 //actions.add(copyTtlOutAction);
                 //actions.add(decMplsTtlAction);
                 actions.add(setIdAction);
+                groupAction.setEdgeLabel(Integer.parseInt(mplsLabel));
             }
         }
 
-        GroupAction groupAction = new GroupAction();
-        groupAction.setEdgeLabel(Integer.parseInt(mplsLabel));
-
         for (String fwdSw : fwdToSws) {
             groupAction.addSwitch(new Dpid(fwdSw));
         }