commit 707d5de9c2fcf4415b96f3b24d28a74fa6487699
author Sangho Shin <sangho@onlab.us> Mon Nov 17 12:42:28 2014 -0800
committer Sangho Shin <sangho@onlab.us> Mon Nov 17 14:10:55 2014 -0800
tree 016b01868c7bd0f7ec25110aa1c19f728c7351d9
parent 708bca4f8fc17728e9bd3d57fff6f88295ec982b

Some minor debug logs in topology change event handler

Change-Id: Iee27b685724e3b9f85ca27302c96499f98c8609e

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 cfa98fd..5d5de8c 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -329,14 +329,17 @@
             numOfEvents++;
 
             if (!portEntriesRemoved.isEmpty()) {
+                log.debug("handleTopologyChangeEvents: portEntriesRemoved are {}",portEntriesRemoved);
                 processPortRemoval(portEntriesRemoved);
             }
 
             if (!linkEntriesRemoved.isEmpty()) {
+                log.debug("handleTopologyChangeEvents: linkEntriesRemoved are {}",linkEntriesRemoved);
                 processLinkRemoval(linkEntriesRemoved);
             }
 
             if (!switchRemoved.isEmpty()) {
+                log.debug("handleTopologyChangeEvents: switchRemoved are {}",switchRemoved);
                 processSwitchRemoved(switchRemoved);
             }
 
@@ -345,14 +348,17 @@
             }
 
             if (!linkEntriesAdded.isEmpty()) {
+                log.debug("handleTopologyChangeEvents: linkEntriesAdded are {}",linkEntriesAdded);
                 processLinkAdd(linkEntriesAdded, false);
             }
 
             if (!portEntriesAdded.isEmpty()) {
+                log.debug("handleTopologyChangeEvents: portEntriesAdded are {}",portEntriesAdded);
                 processPortAdd(portEntriesAdded);
             }
 
             if (!switchAdded.isEmpty()) {
+                log.debug("handleTopologyChangeEvents: switchAdded are {}",switchAdded);
                 processSwitchAdd(switchAdded);
             }
 
@@ -1433,7 +1439,7 @@
         for (OFBarrierReplyFuture replyFuture: replies) {
             OFBarrierReply br = null;
             try {
-                br = replyFuture.get(5, TimeUnit.SECONDS);
+                br = replyFuture.get(2, TimeUnit.SECONDS);
             } catch (TimeoutException | InterruptedException | ExecutionException e) {
                 // XXX for some reason these exceptions are not being thrown
             }
@@ -1504,14 +1510,6 @@
             return null;
         }
         MplsMatch mplsMatch = new MplsMatch(Integer.parseInt(mplsLabel), Bos);
-        /*
-        if (sw13 instanceof OFSwitchImplDellOSR && !Bos) {
-            mplsMatch = new MplsMatch(Integer.parseInt(mplsLabel) * 10, Bos);
-        }
-        else {
-            mplsMatch = new MplsMatch(Integer.parseInt(mplsLabel), Bos);
-        }
-        */
         List<Action> actions = new ArrayList<Action>();
 
         PopMplsAction popActionBos = new PopMplsAction(EthType.IPv4);