[ONOS-3110] Port pair manager test case fixed
Change-Id: I7962527669e45dc7b4eb3e84dadcf9f059177bb5
diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java
index 827c481..d7fae66 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portpair/impl/PortPairManager.java
@@ -30,6 +30,8 @@
import org.onosproject.event.AbstractListenerManager;
import org.onosproject.store.serializers.KryoNamespaces;
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.StorageService;
import org.onosproject.store.service.WallClockTimestamp;
@@ -51,17 +53,22 @@
private static final String PORT_PAIR_ID_NULL = "PortPair ID cannot be null";
private static final String PORT_PAIR_NULL = "PortPair 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 EventuallyConsistentMap<PortPairId, PortPair> portPairStore;
+ private EventuallyConsistentMapListener<PortPairId, PortPair> portPairListener =
+ new InnerPortPairStoreListener();
+
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected StorageService storageService;
@Activate
public void activate() {
+ eventDispatcher.addSink(PortPairEvent.class, listenerRegistry);
KryoNamespace.Builder serializer = KryoNamespace.newBuilder()
.register(KryoNamespaces.API)
.register(MultiValuedTimestamp.class)
@@ -73,11 +80,14 @@
.withTimestampProvider((k, v) -> new WallClockTimestamp())
.build();
+ portPairStore.addListener(portPairListener);
+
log.info("Started");
}
@Deactivate
public void deactivate() {
+ eventDispatcher.removeSink(PortPairEvent.class);
portPairStore.destroy();
log.info("Stopped");
}
@@ -145,4 +155,35 @@
}
return true;
}
+
+ private class InnerPortPairStoreListener
+ implements
+ EventuallyConsistentMapListener<PortPairId, PortPair> {
+
+ @Override
+ public void event(EventuallyConsistentMapEvent<PortPairId, PortPair> event) {
+ checkNotNull(event, EVENT_NOT_NULL);
+ PortPair portPair = event.value();
+ if (EventuallyConsistentMapEvent.Type.PUT == event.type()) {
+ notifyListeners(new PortPairEvent(
+ PortPairEvent.Type.PORT_PAIR_PUT,
+ portPair));
+ }
+ if (EventuallyConsistentMapEvent.Type.REMOVE == event.type()) {
+ notifyListeners(new PortPairEvent(
+ PortPairEvent.Type.PORT_PAIR_DELETE,
+ portPair));
+ }
+ }
+ }
+
+ /**
+ * Notifies specify event to all listeners.
+ *
+ * @param event port pair event
+ */
+ private void notifyListeners(PortPairEvent event) {
+ checkNotNull(event, EVENT_NOT_NULL);
+ post(event);
+ }
}
diff --git a/apps/vtn/vtnrsc/src/test/java/org/onosproject/vtnrsc/portpair/impl/PortPairManagerTest.java b/apps/vtn/vtnrsc/src/test/java/org/onosproject/vtnrsc/portpair/impl/PortPairManagerTest.java
index c936d7c..6608512 100644
--- a/apps/vtn/vtnrsc/src/test/java/org/onosproject/vtnrsc/portpair/impl/PortPairManagerTest.java
+++ b/apps/vtn/vtnrsc/src/test/java/org/onosproject/vtnrsc/portpair/impl/PortPairManagerTest.java
@@ -26,6 +26,9 @@
import org.onosproject.vtnrsc.TenantId;
import org.onosproject.vtnrsc.DefaultPortPair;
import org.onosproject.vtnrsc.util.VtnStorageServiceTest;
+import org.onosproject.common.event.impl.TestEventDispatcher;
+
+import static org.onosproject.net.NetTestTools.injectEventDispatcher;
/**
* Unit tests for PortPairManager class.
@@ -49,6 +52,7 @@
public void testCreatePortPair() {
// initialize port pair manager
portPairMgr.storageService = storageService;
+ injectEventDispatcher(portPairMgr, new TestEventDispatcher());
portPairMgr.activate();
// create port pair