Fixing PushTestIntents command to ignore WITHDRAW_REQ
Change-Id: I5b45c8b0304dbe730830fe4ba8a468a68fe35ab6
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 ff347f0..6f140f2 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
@@ -40,6 +40,7 @@
import org.onlab.packet.Ethernet;
import org.onlab.packet.MacAddress;
+import java.util.EnumSet;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -235,6 +236,8 @@
return deviceString.substring(0, slash);
}
+ private static final EnumSet<IntentEvent.Type> IGNORE_EVENT
+ = EnumSet.of(Type.INSTALL_REQ, Type.WITHDRAW_REQ);
@Override
public void event(IntentEvent event) {
Type expected = add ? Type.INSTALLED : Type.WITHDRAWN;
@@ -245,7 +248,7 @@
} else {
log.warn("install event latch is null");
}
- } else if (event.type() != Type.INSTALL_REQ) {
+ } else if (IGNORE_EVENT.contains(event.type())) {
log.info("Unexpected intent event: {}", event);
}
}