[ONOS-3116] Port Chain manager test case fixed

Change-Id: I1772cff0e33fff4f2ece43aea737f51408efdb74

@@ -30,6 +30,8 @@ import org.onlab.util.KryoNamespace;
 import org.onosproject.event.AbstractListenerManager;
 import org.onosproject.event.AbstractListenerManager;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.EventuallyConsistentMap;
 import org.onosproject.store.service.EventuallyConsistentMap;
+import org.onosproject.store.service.EventuallyConsistentMapEvent;
+import org.onosproject.store.service.EventuallyConsistentMapListener;
 import org.onosproject.store.service.MultiValuedTimestamp;
 import org.onosproject.store.service.MultiValuedTimestamp;
 import org.onosproject.store.service.StorageService;
 import org.onosproject.store.service.StorageService;
 import org.onosproject.store.service.WallClockTimestamp;
 import org.onosproject.store.service.WallClockTimestamp;
@@ -50,17 +52,22 @@ public class PortChainManager extends AbstractListenerManager<PortChainEvent, Po
 
 
     private static final String PORT_CHAIN_ID_NULL = "PortChain ID cannot be null";
     private static final String PORT_CHAIN_ID_NULL = "PortChain ID cannot be null";
     private static final String PORT_CHAIN_NULL = "PortChain cannot be null";
     private static final String PORT_CHAIN_NULL = "PortChain cannot be null";
-    private static final String LISTENER_NOT_NULL = "Listener cannot be null";
+    private static final String EVENT_NOT_NULL = "event cannot be null";
 
 
     private final Logger log = getLogger(getClass());
     private final Logger log = getLogger(getClass());
     private EventuallyConsistentMap<PortChainId, PortChain> portChainStore;
     private EventuallyConsistentMap<PortChainId, PortChain> portChainStore;
 
 
+    private EventuallyConsistentMapListener<PortChainId, PortChain> portChainListener =
+            new InnerPortChainStoreListener();
+
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected StorageService storageService;
     protected StorageService storageService;
 
 
     @Activate
     @Activate
     public void activate() {
     public void activate() {
 
 
+        eventDispatcher.addSink(PortChainEvent.class, listenerRegistry);
+
         KryoNamespace.Builder serializer = KryoNamespace.newBuilder()
         KryoNamespace.Builder serializer = KryoNamespace.newBuilder()
                 .register(KryoNamespaces.API)
                 .register(KryoNamespaces.API)
                 .register(MultiValuedTimestamp.class)
                 .register(MultiValuedTimestamp.class)
@@ -71,11 +78,14 @@ public class PortChainManager extends AbstractListenerManager<PortChainEvent, Po
                 .withName("portchainstore").withSerializer(serializer)
                 .withName("portchainstore").withSerializer(serializer)
                 .withTimestampProvider((k, v) -> new WallClockTimestamp()).build();
                 .withTimestampProvider((k, v) -> new WallClockTimestamp()).build();
 
 
+        portChainStore.addListener(portChainListener);
+
         log.info("Started");
         log.info("Started");
     }
     }
 
 
     @Deactivate
     @Deactivate
     public void deactivate() {
     public void deactivate() {
+        eventDispatcher.removeSink(PortChainEvent.class);
         portChainStore.destroy();
         portChainStore.destroy();
         log.info("Stopped");
         log.info("Stopped");
     }
     }
@@ -147,4 +157,35 @@ public class PortChainManager extends AbstractListenerManager<PortChainEvent, Po
         }
         }
         return true;
         return true;
     }
     }
+
+    private class InnerPortChainStoreListener
+            implements
+            EventuallyConsistentMapListener<PortChainId, PortChain> {
+
+        @Override
+        public void event(EventuallyConsistentMapEvent<PortChainId, PortChain> event) {
+            checkNotNull(event, EVENT_NOT_NULL);
+            PortChain portChain = event.value();
+            if (EventuallyConsistentMapEvent.Type.PUT == event.type()) {
+                notifyListeners(new PortChainEvent(
+                        PortChainEvent.Type.PORT_CHAIN_PUT,
+                        portChain));
+            }
+            if (EventuallyConsistentMapEvent.Type.REMOVE == event.type()) {
+                notifyListeners(new PortChainEvent(
+                        PortChainEvent.Type.PORT_CHAIN_DELETE,
+                        portChain));
+            }
+        }
+    }
+
+    /**
+     * Notifies specify event to all listeners.
+     *
+     * @param event port chain event
+     */
+    private void notifyListeners(PortChainEvent event) {
+        checkNotNull(event, EVENT_NOT_NULL);
+        post(event);
+    }
 }
 }

@@ -31,6 +31,9 @@ import org.onosproject.vtnrsc.PortChain;
 import org.onosproject.vtnrsc.DefaultPortChain;
 import org.onosproject.vtnrsc.DefaultPortChain;
 import org.onosproject.vtnrsc.DefaultFlowClassifier;
 import org.onosproject.vtnrsc.DefaultFlowClassifier;
 import org.onosproject.vtnrsc.util.VtnStorageServiceTest;
 import org.onosproject.vtnrsc.util.VtnStorageServiceTest;
+import org.onosproject.common.event.impl.TestEventDispatcher;
+
+import static org.onosproject.net.NetTestTools.injectEventDispatcher;
 
 
 /**
 /**
  * Unit tests for PortChainManager class.
  * Unit tests for PortChainManager class.
@@ -55,6 +58,7 @@ public class PortChainManagerTest {
     public void testCreatePortChain() {
     public void testCreatePortChain() {
         // initialize port chain manager
         // initialize port chain manager
         portChainMgr.storageService = storageService;
         portChainMgr.storageService = storageService;
+        injectEventDispatcher(portChainMgr, new TestEventDispatcher());
         portChainMgr.activate();
         portChainMgr.activate();
 
 
         // create list of Port Pair Groups.
         // create list of Port Pair Groups.