commit d66228c5868452b0a316ec1ccb26e90593aed745
author Jon Hall <jhall@ciena.com> Wed Aug 09 11:24:24 2017 -0700
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Wed Aug 09 22:39:39 2017 +0000
tree 827fec195dba14007e0a18bf5b8133b05917d2a8
parent aa7c123251c2d36260b081d7a21967f53e41877b

Add intents and logging to Event History app

Also fixed overshadowing of hosts cli flag

Change-Id: I09c12a6cc4ab431a948905e8c1a76c2a9998aa75

apps/events/src/main/java/org/onosproject/events/EventsCommand.java

diff --git a/apps/events/src/main/java/org/onosproject/events/EventsCommand.java b/apps/events/src/main/java/org/onosproject/events/EventsCommand.java
index 3896f27..db8df10 100644
--- a/apps/events/src/main/java/org/onosproject/events/EventsCommand.java
+++ b/apps/events/src/main/java/org/onosproject/events/EventsCommand.java
@@ -32,6 +32,7 @@
 import org.onosproject.net.Link;
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.host.HostEvent;
+import org.onosproject.net.intent.IntentEvent;
 import org.onosproject.net.link.LinkEvent;
 import org.onosproject.net.topology.Topology;
 import org.onosproject.net.topology.TopologyEvent;
@@ -78,7 +79,7 @@
             required = false)
     private boolean topology = false;
 
-    @Option(name = "--host", aliases = "-t",
+    @Option(name = "--host", aliases = "-h",
             description = "Include HostEvent",
             required = false)
     private boolean host = false;
@@ -88,6 +89,11 @@
             required = false)
     private boolean cluster = false;
 
+    @Option(name = "--intent", aliases = "-i",
+            description = "Include IntentEvent",
+            required = false)
+    private boolean intent = false;
+
     @Option(name = "--max-events", aliases = "-n",
             description = "Maximum number of events to print",
             required = false,
@@ -100,7 +106,7 @@
 
         Stream<Event<?, ?>> events = eventHistoryService.history().stream();
 
-        boolean dumpAll = all || !(mastership || device || link || topology || host || cluster);
+        boolean dumpAll = all || !(mastership || device || link || topology || host || cluster || intent);
 
         if (!dumpAll) {
             Predicate<Event<?, ?>> filter = (defaultIs) -> false;
@@ -123,6 +129,9 @@
             if (cluster) {
                 filter = filter.or(evt -> evt instanceof ClusterEvent);
             }
+            if (intent) {
+                filter = filter.or(evt -> evt instanceof IntentEvent);
+            }
 
             events = events.filter(filter);
         }