ONOS-6204 initial impl of dist. flow objective store
Change-Id: I968bea6f95d91b5b30e9d0e11c6948502684022c
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowObjectiveManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowObjectiveManagerTest.java
index 5809ce5..f12ffdc 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowObjectiveManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowObjectiveManagerTest.java
@@ -75,7 +75,7 @@
private DistributedVirtualNetworkStore virtualNetworkManagerStore;
private TestableIntentService intentService = new FakeIntentManager();
private ServiceDirectory testDirectory;
- private SimpleVirtualFlowObjectiveStore flowObjectiveStore;
+ protected SimpleVirtualFlowObjectiveStore flowObjectiveStore;
private VirtualProviderManager providerRegistryService;
private EventDeliveryService eventDeliveryService;
@@ -91,6 +91,7 @@
//FIXME: referring flowrule service, store, and provider shouldn't be here
private VirtualFlowRuleProvider flowRuleProvider = new TestProvider();
private SimpleVirtualFlowRuleStore flowRuleStore;
+ protected StorageService storageService = new TestStorageService();
@Before
public void setUp() throws Exception {
@@ -98,7 +99,6 @@
CoreService coreService = new TestCoreService();
TestUtils.setField(virtualNetworkManagerStore, "coreService", coreService);
- StorageService storageService = new TestStorageService();
TestUtils.setField(virtualNetworkManagerStore, "storageService", storageService);
virtualNetworkManagerStore.activate();
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowObjectiveManagerWithDistStoreTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowObjectiveManagerWithDistStoreTest.java
new file mode 100644
index 0000000..1c1c616
--- /dev/null
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkFlowObjectiveManagerWithDistStoreTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.incubator.net.virtual.impl;
+
+import org.junit.After;
+import org.junit.Before;
+import org.onlab.junit.TestUtils;
+import org.onosproject.incubator.store.virtual.impl.DistributedVirtualFlowObjectiveStore;
+
+/**
+ * Junit tests for VirtualNetworkFlowObjectiveManager using
+ * DistributedVirtualFlowObjectiveStore. This test class extends
+ * VirtualNetworkFlowObjectiveManagerTest - all the tests defined in
+ * VirtualNetworkFlowObjectiveManagerTest will run using
+ * DistributedVirtualFlowObjectiveStore.
+ */
+public class VirtualNetworkFlowObjectiveManagerWithDistStoreTest
+ extends VirtualNetworkFlowObjectiveManagerTest {
+
+ private static final String STORE_FIELDNAME_STORAGESERVICE = "storageService";
+
+ private DistributedVirtualFlowObjectiveStore distStore;
+
+ @Before
+ public void setUp() throws Exception {
+ setupDistFlowObjectiveStore();
+ super.setUp();
+ }
+
+ private void setupDistFlowObjectiveStore() throws TestUtils.TestUtilsException {
+ distStore = new DistributedVirtualFlowObjectiveStore();
+ TestUtils.setField(distStore, STORE_FIELDNAME_STORAGESERVICE, storageService);
+
+ distStore.activate();
+ flowObjectiveStore = distStore; // super.setUp() will cause Distributed store to be used.
+ }
+
+ @After
+ public void tearDown() {
+ distStore.deactivate();
+ }
+}
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualFlowObjectiveStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualFlowObjectiveStore.java
new file mode 100644
index 0000000..411c417
--- /dev/null
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualFlowObjectiveStore.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2017-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.incubator.store.virtual.impl;
+
+import com.google.common.collect.Maps;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+import org.onlab.util.KryoNamespace;
+import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.VirtualNetworkFlowObjectiveStore;
+import org.onosproject.store.serializers.KryoNamespaces;
+import org.onosproject.store.service.ConsistentMap;
+import org.onosproject.store.service.Serializer;
+import org.slf4j.Logger;
+
+import java.util.concurrent.ConcurrentMap;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Distributed flow objective store for virtual network.
+ */
+@Component(immediate = true, enabled = false)
+@Service
+public class DistributedVirtualFlowObjectiveStore
+ extends SimpleVirtualFlowObjectiveStore
+ implements VirtualNetworkFlowObjectiveStore {
+
+ private final Logger log = getLogger(getClass());
+
+ private ConsistentMap<NetworkId, ConcurrentMap<Integer, byte[]>> nextGroupsMap;
+ private static final String VNET_FLOW_OBJ_GROUP_MAP_NAME =
+ "onos-networkId-flowobjective-groups";
+ private static final String VNET_FLOW_OBJ_GROUP_MAP_FRIENDLYNAME =
+ "DistributedVirtualFlowObjectiveStore";
+
+ @Override
+ protected void initNextGroupsMap() {
+ nextGroupsMap = storageService.<NetworkId, ConcurrentMap<Integer, byte[]>>consistentMapBuilder()
+ .withName(VNET_FLOW_OBJ_GROUP_MAP_NAME)
+ .withSerializer(Serializer.using(
+ new KryoNamespace.Builder()
+ .register(KryoNamespaces.API)
+ .register(NetworkId.class)
+ .build(VNET_FLOW_OBJ_GROUP_MAP_FRIENDLYNAME)))
+ .build();
+
+ }
+
+ @Override
+ protected ConcurrentMap<Integer, byte[]> getNextGroups(NetworkId networkId) {
+ nextGroupsMap.computeIfAbsent(networkId, n -> {
+ log.debug("getNextGroups - creating new ConcurrentMap");
+ return Maps.newConcurrentMap();
+ });
+
+ return nextGroupsMap.get(networkId).value();
+ }
+
+ @Override
+ protected void updateNextGroupsMap(NetworkId networkId, ConcurrentMap<Integer,
+ byte[]> nextGroups) {
+ nextGroupsMap.put(networkId, nextGroups);
+ }
+
+}
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowObjectiveStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowObjectiveStore.java
index 1ac5396..e2ecdf3 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowObjectiveStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowObjectiveStore.java
@@ -72,13 +72,25 @@
eventQ = new LinkedBlockingQueue<>();
tpool.execute(new FlowObjectiveNotifier());
- nextGroupsMap = Maps.newConcurrentMap();
+ initNextGroupsMap();
nextIds = storageService.getAtomicCounter("next-objective-counter");
log.info("Started");
}
- private ConcurrentMap<Integer, byte[]> getNextGroups(NetworkId networkId) {
+ public void deactivate() {
+ log.info("Stopped");
+ }
+
+ protected void initNextGroupsMap() {
+ nextGroupsMap = Maps.newConcurrentMap();
+ }
+
+ protected void updateNextGroupsMap(NetworkId networkId,
+ ConcurrentMap<Integer, byte[]> nextGroups) {
+ }
+
+ protected ConcurrentMap<Integer, byte[]> getNextGroups(NetworkId networkId) {
nextGroupsMap.computeIfAbsent(networkId, n -> Maps.newConcurrentMap());
return nextGroupsMap.get(networkId);
}
@@ -87,6 +99,7 @@
public void putNextGroup(NetworkId networkId, Integer nextId, NextGroup group) {
ConcurrentMap<Integer, byte[]> nextGroups = getNextGroups(networkId);
nextGroups.put(nextId, group.data());
+ updateNextGroupsMap(networkId, nextGroups);
eventQ.add(new VirtualObjectiveEvent(networkId, ObjectiveEvent.Type.ADD, nextId));
}
@@ -94,14 +107,22 @@
@Override
public NextGroup getNextGroup(NetworkId networkId, Integer nextId) {
ConcurrentMap<Integer, byte[]> nextGroups = getNextGroups(networkId);
- return new DefaultNextGroup(nextGroups.get(nextId));
+ byte[] groupData = nextGroups.get(nextId);
+ if (groupData != null) {
+ return new DefaultNextGroup(groupData);
+ }
+ return null;
}
@Override
public NextGroup removeNextGroup(NetworkId networkId, Integer nextId) {
ConcurrentMap<Integer, byte[]> nextGroups = getNextGroups(networkId);
+ byte[] nextGroup = nextGroups.remove(nextId);
+ updateNextGroupsMap(networkId, nextGroups);
+
eventQ.add(new VirtualObjectiveEvent(networkId, ObjectiveEvent.Type.REMOVE, nextId));
- return new DefaultNextGroup(nextGroups.remove(nextId));
+
+ return new DefaultNextGroup(nextGroup);
}
@Override