Add intents -p commmand to have some visibility into the pending map

Change-Id: Ic29460d8bf78f185bbfa426bc0aeef309b22cf7f

@@ -56,6 +56,11 @@ public class IntentsListCommand extends AbstractShellCommand {
             required = false, multiValued = false)
             required = false, multiValued = false)
     private boolean intentsSummary = false;
     private boolean intentsSummary = false;
 
 
+    @Option(name = "-p", aliases = "--pending",
+            description = "Show inforamtion about pending intents",
+            required = false, multiValued = false)
+    private boolean pending = false;
+
     @Override
     @Override
     protected void execute() {
     protected void execute() {
         IntentService service = get(IntentService.class);
         IntentService service = get(IntentService.class);
@@ -70,6 +75,14 @@ public class IntentsListCommand extends AbstractShellCommand {
                 intentSummaries.printSummary();
                 intentSummaries.printSummary();
             }
             }
             return;
             return;
+        } else if (pending) {
+            service.getPending().forEach(intent ->
+            print("id=%s, key=%s, type=%s, appId=%s",
+                  intent.id(), intent.key(),
+                  intent.getClass().getSimpleName(),
+                  intent.appId().name())
+            );
+            return;
         }
         }
 
 
         if (outputJson()) {
         if (outputJson()) {

@@ -16,6 +16,7 @@
 package org.onosproject.net.intent;
 package org.onosproject.net.intent;
 
 
 
 
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -82,11 +83,21 @@ public interface IntentService {
      */
      */
     List<Intent> getInstallableIntents(Key intentKey);
     List<Intent> getInstallableIntents(Key intentKey);
 
 
+    // TODO remove defaults
     default boolean isLocal(Key intentKey) {
     default boolean isLocal(Key intentKey) {
         return true;
         return true;
     }
     }
 
 
     /**
     /**
+     * Returns the list of intent requests pending processing.
+     *
+     * @return intents pending processing
+     */
+    default Iterable<Intent> getPending() {
+        return Collections.emptyList();
+    }
+
+    /**
      * Adds the specified listener for intent events.
      * Adds the specified listener for intent events.
      *
      *
      * @param listener listener to be added
      * @param listener listener to be added

@@ -17,6 +17,7 @@ package org.onosproject.net.intent;
 
 
 import org.onosproject.store.Store;
 import org.onosproject.store.Store;
 
 
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -113,4 +114,14 @@ public interface IntentStore extends Store<IntentEvent, IntentStoreDelegate> {
     default boolean isMaster(Key intentKey) { //FIXME remove default when impl.
     default boolean isMaster(Key intentKey) { //FIXME remove default when impl.
         return true;
         return true;
     }
     }
+
+    /**
+     * Returns the intent requests pending processing.
+     *
+     * @return pending intents
+     */
+    // FIXME remove default
+    default Iterable<Intent> getPending() {
+        return Collections.emptyList();
+    }
 }
 }

@@ -222,6 +222,11 @@ public class IntentManager
         return installerRegistry.getInstallers();
         return installerRegistry.getInstallers();
     }
     }
 
 
+    @Override
+    public Iterable<Intent> getPending() {
+        return store.getPending();
+    }
+
     // Store delegate to re-post events emitted from the store.
     // Store delegate to re-post events emitted from the store.
     private class InternalStoreDelegate implements IntentStoreDelegate {
     private class InternalStoreDelegate implements IntentStoreDelegate {
         @Override
         @Override

@@ -15,6 +15,7 @@
  */
  */
 package org.onosproject.store.ecmap;
 package org.onosproject.store.ecmap;
 
 
+import com.google.common.base.MoreObjects;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.store.Timestamp;
 import org.onosproject.store.Timestamp;
 
 
@@ -80,4 +81,12 @@ public class AntiEntropyAdvertisement<K> {
         this.timestamps = null;
         this.timestamps = null;
         this.tombstones = null;
         this.tombstones = null;
     }
     }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(getClass())
+                .add("timestampsSize", timestamps.size())
+                .add("tombstonesSize", tombstones.size())
+                .toString();
+    }
 }
 }

@@ -32,12 +32,12 @@ import org.onosproject.net.intent.IntentStoreDelegate;
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.Key;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.impl.MultiValuedTimestamp;
-import org.onosproject.store.impl.SystemClockTimestamp;
 import org.onosproject.store.ecmap.EventuallyConsistentMap;
 import org.onosproject.store.ecmap.EventuallyConsistentMap;
 import org.onosproject.store.ecmap.EventuallyConsistentMapEvent;
 import org.onosproject.store.ecmap.EventuallyConsistentMapEvent;
 import org.onosproject.store.ecmap.EventuallyConsistentMapImpl;
 import org.onosproject.store.ecmap.EventuallyConsistentMapImpl;
 import org.onosproject.store.ecmap.EventuallyConsistentMapListener;
 import org.onosproject.store.ecmap.EventuallyConsistentMapListener;
+import org.onosproject.store.impl.MultiValuedTimestamp;
+import org.onosproject.store.impl.SystemClockTimestamp;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 
 
@@ -237,7 +237,7 @@ public class GossipIntentStore
             // if current.put succeeded
             // if current.put succeeded
             pending.remove(newData.key(), newData);
             pending.remove(newData.key(), newData);
         } else {
         } else {
-            log.debug("not writing update: {}", newData);
+            log.debug("not writing update: current {}, new {}", currentData, newData);
         }
         }
         /*try {
         /*try {
             notifyDelegate(IntentEvent.getEvent(newData));
             notifyDelegate(IntentEvent.getEvent(newData));
@@ -280,6 +280,13 @@ public class GossipIntentStore
         return partitionService.isMine(intentKey);
         return partitionService.isMine(intentKey);
     }
     }
 
 
+    @Override
+    public Iterable<Intent> getPending() {
+        return pending.values().stream()
+                .map(IntentData::intent)
+                .collect(Collectors.toList());
+    }
+
     private void notifyDelegateIfNotNull(IntentEvent event) {
     private void notifyDelegateIfNotNull(IntentEvent event) {
         if (event != null) {
         if (event != null) {
             notifyDelegate(event);
             notifyDelegate(event);
@@ -310,6 +317,7 @@ public class GossipIntentStore
                 // some work.
                 // some work.
                 if (isMaster(event.value().intent().key())) {
                 if (isMaster(event.value().intent().key())) {
                     if (delegate != null) {
                     if (delegate != null) {
+                        log.debug("processing {}", event.key());
                         delegate.process(copyData(event.value()));
                         delegate.process(copyData(event.value()));
                     }
                     }
                 }
                 }