commit c8d2f5931b2e08714e32628f967cb0de00e93647
author Sangho Shin <sangho@onlab.us> Tue Sep 30 16:53:57 2014 -0700
committer Sangho Shin <sangho@onlab.us> Tue Sep 30 16:53:57 2014 -0700
tree ecf15b77be28a52a193b1dd8a0ceb5e2d1cc2985
parent 11d4e0fc6c3696adace1cf77914a4e881768ef3a

Do not decrement MPLS TTL when the MPLS labels is popped out

Change-Id: I46eb85cdde09b8aabbac763e762e12f187015e44

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 2f5bff5..036b23c 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -51,8 +51,10 @@
 import net.onrc.onos.core.packet.IPv4;
 import net.onrc.onos.core.topology.ITopologyListener;
 import net.onrc.onos.core.topology.ITopologyService;
+import net.onrc.onos.core.topology.LinkData;
 import net.onrc.onos.core.topology.MutableTopology;
 import net.onrc.onos.core.topology.Port;
+import net.onrc.onos.core.topology.PortData;
 import net.onrc.onos.core.topology.Switch;
 import net.onrc.onos.core.topology.TopologyEvents;
 import net.onrc.onos.core.util.Dpid;
@@ -132,7 +134,14 @@
 
     @Override
     public void startUp(FloodlightModuleContext context) throws FloodlightModuleException {
+        ScheduledExecutorService ses = threadPool.getScheduledExecutor();
 
+        discoveryTask = new SingletonTask(ses, new Runnable() {
+            @Override
+            public void run() {
+                populateEcmpRoutingRules();
+            }
+        });
     }
 
     @Override
@@ -232,18 +241,34 @@
         if ((topologyEvents.getAddedLinkDataEntries() != null) ||
                 (topologyEvents.getRemovedLinkDataEntries() != null))
         {
-
-            ScheduledExecutorService ses = threadPool.getScheduledExecutor();
-
-            discoveryTask = new SingletonTask(ses, new Runnable() {
-                @Override
-                public void run() {
-                    populateEcmpRoutingRules();
-                }
-            });
-
             discoveryTask.reschedule(1, TimeUnit.SECONDS);
         }
+
+        Collection<PortData> portEntries =
+                topologyEvents.getRemovedPortDataEntries();
+        if (!portEntries.isEmpty()) {
+            // report port removal to the driver
+            for (PortData port: portEntries) {
+                Dpid dpid = port.getDpid();
+                int portNo = (int) port.getPortNumber().value();
+                log.debug("Remove port {} from switch {}", portNo, dpid.toString());
+            }
+        }
+
+        Collection<LinkData> linkEntries =
+                topologyEvents.getRemovedLinkDataEntries();
+        if (!linkEntries.isEmpty()) {
+            for (LinkData link: linkEntries) {
+                Dpid srcSwDpid = link.getSrc().getDpid();
+                Dpid dstSwDpid = link.getDst().getDpid();
+
+                Switch srcSwitch = mutableTopology.getSwitch(srcSwDpid);
+                Switch dstSwitch = mutableTopology.getSwitch(dstSwDpid);
+
+
+            }
+        }
+
     }
 
     /**
@@ -294,7 +319,6 @@
                     OFBarrierReplyFuture replyFuture = sw13.sendBarrier();
                     replyFuture.get(10, TimeUnit.SECONDS);
                 } catch (IOException e) {
-                    // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
                 catch (InterruptedException | ExecutionException | TimeoutException e) {
@@ -365,7 +389,6 @@
                 setIpTableRouter(targetSw, subnetIp, mplsLabel, fwdToSw, entries);
             }
         } catch (JSONException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
 
@@ -376,7 +399,6 @@
             try {
                 sw13.pushFlows(entries);
             } catch (IOException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
             }
         }
@@ -465,7 +487,7 @@
         }
         actions.add(groupAction);
 
-        //MatchAction matchAction = new MatchAction(maIdGenerator.getNewId(),
+        // TODO: Mactch Action Id should be set correctly
         MatchAction matchAction = new MatchAction(new MatchActionId(0),
                 new SwitchPort((long)0,(short)0), ipMatch, actions);
 
@@ -484,7 +506,6 @@
             else
                 sw13.pushFlow(maEntry);
         } catch (IOException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
 
@@ -525,6 +546,7 @@
         List<Action> actions = new ArrayList<Action>();
 
         // If the destination is the same as the next hop, then pop MPLS
+        // Otherwise, just decrease the MPLS TTL.
         if (fwdSws.size() == 1) {
             String fwdMplsId = getMplsLabel(fwdSws.get(0));
             if (fwdMplsId.equals(mplsLabel)) {
@@ -539,10 +561,11 @@
                     actions.add(decNwTtlAction);
                 }
             }
+            else {
+                DecMplsTtlAction decMplsTtlAction = new DecMplsTtlAction(1);
+                actions.add(decMplsTtlAction);
+            }
         }
-        DecMplsTtlAction decMplsTtlAction = new DecMplsTtlAction(1);
-        actions.add(decMplsTtlAction);
-
         GroupAction groupAction = new GroupAction();
         for (String fwdSw: fwdSws)
             groupAction.addSwitch(new Dpid(fwdSw));
@@ -563,7 +586,6 @@
             printMatchActionOperationEntry(sw, maEntry);
             sw13.pushFlow(maEntry);
         } catch (IOException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }