commit e4b6bb2515b964b1a7b5f7ba839c8149d8447267
author Thomas Vachuska <tom@onlab.us> Tue Nov 25 17:09:43 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Nov 26 04:31:14 2014 +0000
tree c1bc6185536b4a1ac5cbc082c884828c4dbcb935
parent c91eebe810c32e7bfb2d9989e596ad264d96771b

Intents are now removed after being withdrawn.

Change-Id: I7574fe94add00abf58c71c6122bb3dc5aafa0f79

cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java

diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java
index 4d597ca..f3c6b41 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java
@@ -15,6 +15,7 @@
  */
 package org.onlab.onos.cli.net;
 
+import com.google.common.collect.Lists;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onlab.onos.cli.AbstractShellCommand;
@@ -35,6 +36,7 @@
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.MacAddress;
 
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -89,39 +91,44 @@
 
         add = true;
         latch = new CountDownLatch(count);
-        IntentOperations operations = generateIntents(ingress, egress);
+        List<Intent> operations = generateIntents(ingress, egress);
         submitIntents(operations);
 
         add = false;
         latch = new CountDownLatch(count);
-        operations = generateIntents(ingress, egress);
         submitIntents(operations);
 
         service.removeListener(this);
     }
 
-    private IntentOperations generateIntents(ConnectPoint ingress, ConnectPoint egress) {
+    private List<Intent> generateIntents(ConnectPoint ingress, ConnectPoint egress) {
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder()
                 .matchEthType(Ethernet.TYPE_IPV4);
         TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();
 
-        IntentOperations.Builder ops = IntentOperations.builder();
+        List<Intent> intents = Lists.newArrayList();
         for (int i = 1; i <= count; i++) {
             TrafficSelector s = selector
                     .matchEthSrc(MacAddress.valueOf(i))
                     .build();
-            Intent intent = new PointToPointIntent(appId(), s, treatment,
-                                                   ingress, egress);
-            if (add) {
-                ops.addSubmitOperation(intent);
-            } else {
-                ops.addWithdrawOperation(intent.id());
-            }
+            intents.add(new PointToPointIntent(appId(), s, treatment,
+                                               ingress, egress));
+
         }
-        return ops.build();
+        return intents;
     }
 
-    private void submitIntents(IntentOperations ops) {
+    private void submitIntents(List<Intent> intents) {
+        IntentOperations.Builder builder = IntentOperations.builder();
+        for (Intent intent : intents) {
+            if (add) {
+                builder.addSubmitOperation(intent);
+            } else {
+                builder.addWithdrawOperation(intent.id());
+            }
+        }
+        IntentOperations ops = builder.build();
+
         start = System.currentTimeMillis();
         service.execute(ops);
         try {