commit da14784f11fe7253014568c6dee67536cfcc9407
author Pavlin Radoslavov <pavlin@onlab.us> Fri Jun 13 20:08:09 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Mon Jun 16 11:21:49 2014 -0700
tree 792e500fc57404cd2de055de56fb7858ff4effc5
parent b3983b10b2b8540acd2659fdd962622b1f294ab1

Fix an issue with removing intents that are in INST_NACK state
(i.e., Intent state where the intent cannot be installed).

NOTE: This solution is a hack. A (slightly) better solution would
be to perform the appropriate checks inside method
executeIntentOperations(), but this might impact the old API.
For now, the hack is applied only to the new Java and REST API
for removing intents.

Change-Id: I0b24c536603b95c2fea8a9f57ba3786675e04a9a

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 b663db4..5776f26 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
@@ -359,6 +359,7 @@
     public boolean removeApplicationIntents(final String appId,
                                             Collection<String> intentIds) {
         IntentMap intentMap = getHighLevelIntents();
+        List<String> removeIntentIds = new LinkedList<String>();
 
         //
         // Process all intents one-by-one
@@ -368,10 +369,26 @@
             String appIntentId = appId + ":" + intentId;
             Intent intent = intentMap.getIntent(appIntentId);
             if (intent != null) {
+                if (intent.getState() == IntentState.INST_NACK) {
+                    // TODO: A hack to remove intents stuck in INST_NACK state
+                    removeIntentIds.add(intent.getId());
+                    continue;
+                }
                 operations.add(IntentOperation.Operator.REMOVE, intent);
                 removedApplicationIntentIds.add(appIntentId);
             }
         }
+
+        // Purge intents
+        if (!removeIntentIds.isEmpty()) {
+            lock.lock(); // TODO optimize locking using smaller steps
+            try {
+                highLevelIntents.purge(removeIntentIds);
+            } finally {
+                lock.unlock();
+            }
+        }
+
         executeIntentOperations(operations);
 
         return true;
@@ -386,15 +403,32 @@
     @Override
     public boolean removeAllApplicationIntents(final String appId) {
         IntentMap intentMap = getHighLevelIntents();
+        List<String> removeIntentIds = new LinkedList<String>();
 
         //
         // Remove all intents
         //
         IntentOperationList operations = new IntentOperationList();
         for (Intent intent : intentMap.getAllIntents()) {
+            if (intent.getState() == IntentState.INST_NACK) {
+                // TODO: A hack to remove intents stuck in INST_NACK state
+                removeIntentIds.add(intent.getId());
+                continue;
+            }
             operations.add(IntentOperation.Operator.REMOVE, intent);
             removedApplicationIntentIds.add(intent.getId());
         }
+
+        // Purge intents
+        if (!removeIntentIds.isEmpty()) {
+            lock.lock(); // TODO optimize locking using smaller steps
+            try {
+                highLevelIntents.purge(removeIntentIds);
+            } finally {
+                lock.unlock();
+            }
+        }
+
         executeIntentOperations(operations);
 
         return true;