* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.impl.registry.flow;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.Futures;
import java.math.BigInteger;
import java.util.Collections;
import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.junit.Assert;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.openflowplugin.api.OFConstants;
import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowDescriptor;
import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowRegistryKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
@Mock
private DataBroker dataBroker;
@Mock
- private ReadOnlyTransaction readOnlyTransaction;
+ private ReadTransaction readOnlyTransaction;
@Before
- public void setUp() throws Exception {
- nodeInstanceIdentifier = InstanceIdentifier.create(Nodes.class).child(Node.class, new NodeKey(new NodeId(NODE_ID)));
+ public void setUp() {
+ nodeInstanceIdentifier =
+ InstanceIdentifier.create(Nodes.class).child(Node.class, new NodeKey(new NodeId(NODE_ID)));
when(dataBroker.newReadOnlyTransaction()).thenReturn(readOnlyTransaction);
- deviceFlowRegistry = new DeviceFlowRegistryImpl(dataBroker, nodeInstanceIdentifier);
+ deviceFlowRegistry =
+ new DeviceFlowRegistryImpl(OFConstants.OFP_VERSION_1_3, dataBroker, nodeInstanceIdentifier);
final FlowAndStatisticsMapList flowStats = TestFlowHelper.createFlowAndStatisticsMapListBuilder(1).build();
- key = FlowRegistryKeyFactory.create(flowStats);
+ key = FlowRegistryKeyFactory.create(OFConstants.OFP_VERSION_1_3, flowStats);
descriptor = FlowDescriptorFactory.create(key.getTableId(), new FlowId("ut:1"));
Assert.assertEquals(0, deviceFlowRegistry.getAllFlowDescriptors().size());
- deviceFlowRegistry.store(key, descriptor);
+ deviceFlowRegistry.storeDescriptor(key, descriptor);
Assert.assertEquals(1, deviceFlowRegistry.getAllFlowDescriptors().size());
}
.setTable(Collections.singletonList(table))
.build();
- final Map<FlowRegistryKey, FlowDescriptor> allFlowDescriptors = testFill(path, flowCapableNode);
- final FlowRegistryKey key = FlowRegistryKeyFactory.create(flow);
+ final Map<FlowRegistryKey, FlowDescriptor> allFlowDescriptors = fillRegistry(path, flowCapableNode);
+ key = FlowRegistryKeyFactory.create(OFConstants.OFP_VERSION_1_3, flow);
InOrder order = inOrder(dataBroker, readOnlyTransaction);
order.verify(dataBroker).newReadOnlyTransaction();
order.verify(readOnlyTransaction).read(LogicalDatastoreType.OPERATIONAL, path);
assertTrue(allFlowDescriptors.containsKey(key));
- deviceFlowRegistry.markToBeremoved(key);
- deviceFlowRegistry.removeMarked();
+ deviceFlowRegistry.addMark(key);
}
@Test
public void testFailedFill() throws Exception {
final InstanceIdentifier<FlowCapableNode> path = nodeInstanceIdentifier.augmentation(FlowCapableNode.class);
- testFill(path, null);
+ fillRegistry(path, null);
- testFill(path, new FlowCapableNodeBuilder()
+ fillRegistry(path, new FlowCapableNodeBuilder()
.setTable(null)
.build());
- testFill(path, new FlowCapableNodeBuilder()
+ fillRegistry(path, new FlowCapableNodeBuilder()
.setTable(Collections.singletonList(null))
.build());
- testFill(path, new FlowCapableNodeBuilder()
+ fillRegistry(path, new FlowCapableNodeBuilder()
.setTable(Collections.singletonList(new TableBuilder()
.setFlow(null)
.build()))
.build());
- testFill(path, new FlowCapableNodeBuilder()
+ fillRegistry(path, new FlowCapableNodeBuilder()
.setTable(Collections.singletonList(new TableBuilder()
.setFlow(Collections.singletonList(null))
.build()))
.build());
- testFill(path, new FlowCapableNodeBuilder()
+ fillRegistry(path, new FlowCapableNodeBuilder()
.setTable(Collections.singletonList(new TableBuilder()
.setFlow(Collections.singletonList(new FlowBuilder()
.setId(null)
Assert.assertEquals(1, deviceFlowRegistry.getAllFlowDescriptors().size());
}
- private Map<FlowRegistryKey, FlowDescriptor> testFill(final InstanceIdentifier<FlowCapableNode> path,
- final FlowCapableNode flowCapableNode) throws Exception {
- when(readOnlyTransaction.read(any(), any())).thenReturn(Futures.immediateCheckedFuture(Optional.fromNullable(flowCapableNode)));
+ private Map<FlowRegistryKey, FlowDescriptor> fillRegistry(final InstanceIdentifier<FlowCapableNode> path,
+ final FlowCapableNode flowCapableNode) throws Exception {
+ doReturn(FluentFutures.immediateFluentFuture(Optional.ofNullable(flowCapableNode))).when(readOnlyTransaction)
+ .read(any(), any());
deviceFlowRegistry.fill().get();
return deviceFlowRegistry.getAllFlowDescriptors();
}
@Test
- public void testRetrieveIdForFlow() throws Exception {
- Assert.assertEquals(descriptor, deviceFlowRegistry.retrieveIdForFlow(key));
+ public void testRetrieveIdForFlow() {
+ Assert.assertEquals(descriptor, deviceFlowRegistry.retrieveDescriptor(key));
}
@Test
- public void testStore() throws Exception {
+ public void testStore() {
//store the same key with different value
final FlowDescriptor descriptor2 = FlowDescriptorFactory.create(key.getTableId(), new FlowId("ut:2"));
- deviceFlowRegistry.store(key, descriptor2);
+ deviceFlowRegistry.storeDescriptor(key, descriptor2);
Assert.assertEquals(1, deviceFlowRegistry.getAllFlowDescriptors().size());
- Assert.assertEquals("ut:2", deviceFlowRegistry.retrieveIdForFlow(key).getFlowId().getValue());
+ Assert.assertEquals("ut:2", deviceFlowRegistry.retrieveDescriptor(key).getFlowId().getValue());
// store new key with old value
final FlowAndStatisticsMapList flowStats = TestFlowHelper.createFlowAndStatisticsMapListBuilder(2).build();
- final FlowRegistryKey key2 = FlowRegistryKeyFactory.create(flowStats);
- deviceFlowRegistry.store(key2, descriptor);
+ final FlowRegistryKey key2 = FlowRegistryKeyFactory.create(OFConstants.OFP_VERSION_1_3, flowStats);
+ deviceFlowRegistry.storeDescriptor(key2, descriptor);
Assert.assertEquals(2, deviceFlowRegistry.getAllFlowDescriptors().size());
- Assert.assertEquals("ut:1", deviceFlowRegistry.retrieveIdForFlow(key2).getFlowId().getValue());
+ Assert.assertEquals("ut:1", deviceFlowRegistry.retrieveDescriptor(key2).getFlowId().getValue());
}
@Test
- public void testStoreIfNecessary() throws Exception {
+ public void testStoreIfNecessary() {
FlowId newFlowId;
//store existing key
- newFlowId = deviceFlowRegistry.storeIfNecessary(key);
+ deviceFlowRegistry.store(key);
+ newFlowId = deviceFlowRegistry.retrieveDescriptor(key).getFlowId();
Assert.assertEquals(1, deviceFlowRegistry.getAllFlowDescriptors().size());
- Assert.assertEquals(descriptor, deviceFlowRegistry.retrieveIdForFlow(key));
+ Assert.assertEquals(descriptor, deviceFlowRegistry.retrieveDescriptor(key));
Assert.assertEquals(descriptor.getFlowId(), newFlowId);
//store new key
final String alienPrefix = "#UF$TABLE*2-";
- final FlowRegistryKey key2 = FlowRegistryKeyFactory.create(TestFlowHelper.createFlowAndStatisticsMapListBuilder(2).build());
- newFlowId = deviceFlowRegistry.storeIfNecessary(key2);
+ final FlowRegistryKey key2 = FlowRegistryKeyFactory.create(OFConstants.OFP_VERSION_1_3,
+ TestFlowHelper.createFlowAndStatisticsMapListBuilder(2).build());
+ deviceFlowRegistry.store(key2);
+ newFlowId = deviceFlowRegistry.retrieveDescriptor(key2).getFlowId();
Assert.assertTrue(newFlowId.getValue().startsWith(alienPrefix));
- Assert.assertTrue(deviceFlowRegistry.retrieveIdForFlow(key2).getFlowId().getValue().startsWith(alienPrefix));
+ Assert.assertTrue(deviceFlowRegistry.retrieveDescriptor(key2).getFlowId().getValue().startsWith(alienPrefix));
Assert.assertEquals(2, deviceFlowRegistry.getAllFlowDescriptors().size());
}
@Test
- public void testRemoveMarked() throws Exception {
- deviceFlowRegistry.markToBeremoved(key);
- deviceFlowRegistry.removeMarked();
+ public void testRemoveDescriptor() {
+ deviceFlowRegistry.addMark(key);
Assert.assertEquals(0, deviceFlowRegistry.getAllFlowDescriptors().size());
}
@Test
- public void testRemoveMarkedNegative() throws Exception {
- final FlowAndStatisticsMapList flowStats = TestFlowHelper.createFlowAndStatisticsMapListBuilder(2).build();
- FlowRegistryKey key2 = FlowRegistryKeyFactory.create(flowStats);
- deviceFlowRegistry.markToBeremoved(key2);
- deviceFlowRegistry.removeMarked();
- Assert.assertEquals(1, deviceFlowRegistry.getAllFlowDescriptors().size());
- }
-
- @Test
- public void testClose() throws Exception {
- deviceFlowRegistry.markToBeremoved(key);
+ public void testClose() {
deviceFlowRegistry.close();
Assert.assertEquals(0, deviceFlowRegistry.getAllFlowDescriptors().size());
-
- deviceFlowRegistry.store(key, descriptor);
- Assert.assertEquals(1, deviceFlowRegistry.getAllFlowDescriptors().size());
- deviceFlowRegistry.removeMarked();
- Assert.assertEquals(1, deviceFlowRegistry.getAllFlowDescriptors().size());
}
@Test
- public void createAlienFlowIdTest() throws Exception {
+ public void createAlienFlowIdTest() {
final String alienFlowId1 = DeviceFlowRegistryImpl.createAlienFlowId(DUMMY_TABLE_ID).getValue();
final Integer index1 = parseIndex(alienFlowId1);
final String alienFlowId2 = DeviceFlowRegistryImpl.createAlienFlowId(DUMMY_TABLE_ID).getValue();
assertTrue(index1 < index2);
}
+ @Test
+ public void testForEach() {
+ final AtomicInteger counter = new AtomicInteger(0);
+ deviceFlowRegistry.forEach(k -> counter.incrementAndGet());
+ Assert.assertEquals(1, counter.get());
+ }
+
private static Integer parseIndex(String alienFlowIdValue) {
final Matcher mach = INDEX_PATTERN.matcher(alienFlowIdValue);
return null;
}
-}
\ No newline at end of file
+}
Code Review / openflowplugin.git / blobdiff