commit 435df32567fb6ca3624514f02bc5b1523da801c8
author TeruU <t-uchida@onlab.us> Mon Jun 16 23:45:13 2014 -0700
committer TeruU <t-uchida@onlab.us> Tue Jun 24 16:37:01 2014 -0700
tree 4065a547b33951d4874ff6c3502c351534327010
parent 5d2c939d2387bc87a3e1ceca53acdfaa8f88ea47

Fix to catch the INST_NACK event in the Forwarding module and delete the info from the local cache.

Change-Id: I0c1f7691b2953b37858bb82cf0c9526e364fbaeb

src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java

diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index 03c9740..43d19be 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -63,6 +63,9 @@
 
     private final String callerId = "Forwarding";
 
+    private final HighLevelIntentChangedHandler highLevelIntentChangedHandler =
+            new HighLevelIntentChangedHandler();
+
     private IPacketService packetService;
     private IControllerRegistryService controllerRegistryService;
 
@@ -79,6 +82,40 @@
 
     private final Object lock = new Object();
 
+    private class HighLevelIntentChangedHandler implements ChangedListener {
+
+        @Override
+        public void intentsChange(LinkedList<ChangedEvent> events) {
+            for (ChangedEvent event : events) {
+                ShortestPathIntent spfIntent = null;
+                if (event.intent instanceof ShortestPathIntent) {
+                    spfIntent = (ShortestPathIntent) event.intent;
+                    log.trace("ShortestPathIntent {}", spfIntent);
+                }
+
+                if (spfIntent == null) {
+                    log.trace("ShortestPathIntent is null. Skip.");
+                    continue;
+                }
+
+                switch(event.eventType) {
+                    case ADDED:
+                        break;
+                    case REMOVED:
+                        break;
+                    case STATE_CHANGED:
+                        if (spfIntent.getState() == IntentState.INST_NACK) {
+                            flowRemoved(spfIntent);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+    }
+
     private static class PacketToPush {
         public final Ethernet eth;
         public final long dpid;
@@ -194,6 +231,7 @@
 
         topology = topologyService.getTopology();
         highLevelIntentMap = pathRuntime.getHighLevelIntents();
+        highLevelIntentMap.addChangeListener(highLevelIntentChangedHandler);
         pathIntentMap = pathRuntime.getPathIntents();
         pathIntentMap.addChangeListener(this);
     }
@@ -444,12 +482,11 @@
     public void flowRemoved(FlowPath removedFlowPath) {
     }
 
-    public void flowRemoved(PathIntent removedIntent) {
+    public void flowRemoved(ShortestPathIntent spfIntent) {
         if (log.isTraceEnabled()) {
-            log.trace("Path {} was removed", removedIntent.getParentIntent().getId());
+            log.trace("ShortestPathIntent {} was removed", spfIntent.getId());
         }
 
-        ShortestPathIntent spfIntent = (ShortestPathIntent) removedIntent.getParentIntent();
         MACAddress srcMacAddress = MACAddress.valueOf(spfIntent.getSrcMac());
         MACAddress dstMacAddress = MACAddress.valueOf(spfIntent.getDstMac());
         Path removedPath = new Path(srcMacAddress, dstMacAddress);
@@ -541,14 +578,12 @@
             }
 
             if (pathIntent == null) {
-                log.trace("pathIntent is null. "
-                        + "Remove the intent info from the local cache and return.");
+                log.trace("pathIntent is null. Skip.");
                 continue;
             }
 
             if (!(pathIntent.getParentIntent() instanceof ShortestPathIntent)) {
-                log.trace("parentIntent is not ShortestPathIntent. return."
-                        + " Remove the intent info from the local cache and return.");
+                log.trace("parentIntent is not ShortestPathIntent. Skip.");
                 continue;
             }
 
@@ -556,7 +591,7 @@
                 case ADDED:
                     break;
                 case REMOVED:
-                    flowRemoved(pathIntent);
+                    flowRemoved((ShortestPathIntent) pathIntent.getParentIntent());
                     break;
                 case STATE_CHANGED:
                     IntentState state = pathIntent.getState();
@@ -569,11 +604,12 @@
                             flowInstalled(pathIntent);
                             break;
                         case INST_NACK:
+                            flowRemoved((ShortestPathIntent) pathIntent.getParentIntent());
                             break;
                         case DEL_REQ:
                             break;
                         case DEL_ACK:
-                            flowRemoved(pathIntent);
+                            flowRemoved((ShortestPathIntent) pathIntent.getParentIntent());
                             break;
                         case DEL_PENDING:
                             break;