commit 14dba900a597a0e981ff04b5337da59470c595e6
author Toshio Koide <t-koide@onlab.us> Thu Jun 05 18:39:21 2014 -0700
committer Toshio Koide <t-koide@onlab.us> Fri Jun 06 16:01:25 2014 -0700
tree ce58cf68b10de586e87d2c9ceb3a091a308984ea
parent 1dbcce622942e846418fb58ad6245e863c39f630

Fix bug: PathIntent's state is stuck in the DEL_REQ state after rerouting

Change-Id: I1241353e3b0f36b176c990eb87e2eec969de9ab0

src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java

diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
index 320126c..74f89f4 100644
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
@@ -376,20 +376,21 @@
             IntentStateList highLevelIntentStates = new IntentStateList();
             IntentStateList pathIntentStates = new IntentStateList();
             for (Entry<String, IntentState> entry : value.entrySet()) {
-                PathIntent pathIntent = (PathIntent) pathIntents.getIntent(entry.getKey());
+                String pathIntentId = entry.getKey();
+                IntentState nextPathIntentState = entry.getValue();
+                PathIntent pathIntent = (PathIntent) pathIntents.getIntent(pathIntentId);
                 if (pathIntent == null) {
                     continue;
                 }
 
                 Intent parentIntent = pathIntent.getParentIntent();
                 if (parentIntent == null ||
-                        !(parentIntent instanceof ShortestPathIntent) ||
-                        !((ShortestPathIntent) parentIntent).getPathIntentId().equals(pathIntent.getId())) {
+                        !(parentIntent instanceof ShortestPathIntent)) {
                     continue;
                 }
 
-                IntentState state = entry.getValue();
-                switch (state) {
+                boolean isChildIntent = ((ShortestPathIntent) parentIntent).getPathIntentId().equals(pathIntentId);
+                switch (nextPathIntentState) {
                     case INST_ACK:
                         Set<Long> installedDpids = calcInstalledDpids(pathIntent, value.domainSwitchDpids);
                         if (!isFlowInstalled(pathIntent, installedDpids)) {
@@ -398,24 +399,32 @@
                         // FALLTHROUGH
                     case INST_NACK:
                         // FALLTHROUGH
-                    // case INST_REQ:
-                        // FALLTHROUGH
-                    // case DEL_REQ:
-                        // FALLTHROUGH
                     case DEL_PENDING:
-                        log.debug("put the state highLevelIntentStates ID {}, state {}", parentIntent.getId(), state);
-                        highLevelIntentStates.put(parentIntent.getId(), state);
-                        log.debug("put the state pathIntentStates ID {}, state {}", entry.getKey(), entry.getValue());
-                        pathIntentStates.put(entry.getKey(), entry.getValue());
+                        if (isChildIntent) {
+                            log.debug("put the state highLevelIntentStates ID {}, state {}", parentIntent.getId(), nextPathIntentState);
+                            highLevelIntentStates.put(parentIntent.getId(), nextPathIntentState);
+                        }
+                        log.debug("put the state pathIntentStates ID {}, state {}", pathIntentId, nextPathIntentState);
+                        pathIntentStates.put(pathIntentId, nextPathIntentState);
                         break;
                     case DEL_ACK:
-                        if (intentInstalledMap.containsKey(parentIntent.getId())) {
-                             intentInstalledMap.remove(parentIntent.getId());
+                        if (isChildIntent) {
+                            if (intentInstalledMap.containsKey(parentIntent.getId())) {
+                                 intentInstalledMap.remove(parentIntent.getId());
+                            }
+                            log.debug("put the state highLevelIntentStates ID {}, state {}", parentIntent.getId(), nextPathIntentState);
+                            highLevelIntentStates.put(parentIntent.getId(), nextPathIntentState);
                         }
-                        log.debug("put the state highLevelIntentStates ID {}, state {}", parentIntent.getId(), state);
-                        highLevelIntentStates.put(parentIntent.getId(), state);
-                        log.debug("put the state pathIntentStates ID {}, state {}", entry.getKey(), entry.getValue());
-                        pathIntentStates.put(entry.getKey(), entry.getValue());
+                        log.debug("put the state pathIntentStates ID {}, state {}", pathIntentId, nextPathIntentState);
+                        pathIntentStates.put(pathIntentId, nextPathIntentState);
+                        break;
+                    case CREATED:
+                        break;
+                    case DEL_REQ:
+                        break;
+                    case INST_REQ:
+                        break;
+                    case REROUTE_REQ:
                         break;
                     default:
                         break;