fix: Virtual flow rule and packet store
Changes.
1. Simple Packet store is declared as OSGi component
2. some description is added
Change-Id: Iaffa6786bbca5b967926b19183f45b723b8ab211
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkService.java b/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkService.java
index 06d164c..1c05a2b 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkService.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkService.java
@@ -124,6 +124,7 @@
* <li>{@link org.onosproject.net.host.HostService}</li>
* <li>{@link org.onosproject.net.topology.TopologyService}</li>
* <li>{@link org.onosproject.net.topology.PathService}</li>
+ * <li>{@link org.onosproject.net.packet.PacketService}</li>
* <li>{@link org.onosproject.net.flow.FlowRuleService}</li>
* <li>{@link org.onosproject.net.flowobjective.FlowObjectiveService}</li>
* <li>{@link org.onosproject.net.intent.IntentService}</li>
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowRuleStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowRuleStore.java
index 412ffd1..5f71b57 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowRuleStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowRuleStore.java
@@ -68,10 +68,11 @@
import static org.slf4j.LoggerFactory.getLogger;
/**
- * Manages inventory of virtual flow rules using trivial in-memory implementation.
+ * Implementation of the virtual network flow rule store to manage inventory of
+ * virtual flow rules using trivial in-memory implementation.
*/
-
//TODO: support distributed flowrule store for virtual networks
+
@Component(immediate = true)
@Service
public class SimpleVirtualFlowRuleStore
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualPacketStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualPacketStore.java
index cb779ee..01e8a9d 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualPacketStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualPacketStore.java
@@ -20,6 +20,10 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Service;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.incubator.net.virtual.VirtualNetworkPacketStore;
import org.onosproject.net.flow.TrafficSelector;
@@ -27,22 +31,41 @@
import org.onosproject.net.packet.PacketEvent;
import org.onosproject.net.packet.PacketRequest;
import org.onosproject.net.packet.PacketStoreDelegate;
+import org.slf4j.Logger;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* Simple single instance implementation of the virtual packet store.
*/
+//TODO: support distributed packet store for virtual networks
+
+@Component(immediate = true)
+@Service
public class SimpleVirtualPacketStore
extends AbstractVirtualStore<PacketEvent, PacketStoreDelegate>
implements VirtualNetworkPacketStore {
+ private final Logger log = getLogger(getClass());
+
private Map<NetworkId, Map<TrafficSelector, Set<PacketRequest>>> requests
= Maps.newConcurrentMap();
+ @Activate
+ public void activate() {
+ log.info("Started");
+ }
+
+ @Deactivate
+ public void deactivate() {
+ log.info("Stopped");
+ }
+
@Override
public void emit(NetworkId networkId, OutboundPacket packet) {
notifyDelegate(networkId, new PacketEvent(PacketEvent.Type.EMIT, packet));