Refactor DistributedPacketStore to store packet requests in a ConsistentMultimap

Change-Id: Ia4a93c47fee726009673e99609b2f8800807e675
diff --git a/core/api/src/test/java/org/onosproject/store/service/TestConsistentMultimap.java b/core/api/src/test/java/org/onosproject/store/service/TestConsistentMultimap.java
index a97337e..08be2e4 100644
--- a/core/api/src/test/java/org/onosproject/store/service/TestConsistentMultimap.java
+++ b/core/api/src/test/java/org/onosproject/store/service/TestConsistentMultimap.java
@@ -76,11 +76,23 @@
     }
 
     @Override
+    public Versioned<Collection<? extends V>> putAndGet(K key, V value) {
+        innermap.put(key, version(value));
+        return (Versioned<Collection<? extends V>>) innermap.get(key);
+    }
+
+    @Override
     public boolean remove(K key, V value) {
         return innermap.remove(key, value);
     }
 
     @Override
+    public Versioned<Collection<? extends V>> removeAndGet(K key, V value) {
+        innermap.remove(key, value);
+        return (Versioned<Collection<? extends V>>) innermap.get(key);
+    }
+
+    @Override
     public boolean removeAll(K key, Collection<? extends V> values) {
         return false;
     }