DistributedFlowRuleStore related fixes
- handle no master for Device case
- Changed failed item type to FlowRule
Change-Id: If6c85751759cf6ba9ab0ed0384cbe1bf08a5d572
diff --git a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
index 3791296..4fe9022 100644
--- a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
@@ -395,7 +395,7 @@
break;
case BATCH_OPERATION_COMPLETED:
- Set<FlowEntry> failedItems = event.result().failedItems();
+ Set<FlowRule> failedItems = event.result().failedItems();
for (FlowEntry entry : request.toAdd()) {
if (!failedItems.contains(entry)) {
eventDispatcher.post(new FlowRuleEvent(FlowRuleEvent.Type.RULE_ADDED, entry));
@@ -463,7 +463,7 @@
}
boolean success = true;
- Set<FlowEntry> failed = Sets.newHashSet();
+ Set<FlowRule> failed = Sets.newHashSet();
CompletedBatchOperation completed;
for (Future<CompletedBatchOperation> future : futures) {
completed = future.get();
@@ -483,7 +483,7 @@
return overall;
}
boolean success = true;
- Set<FlowEntry> failed = Sets.newHashSet();
+ Set<FlowRule> failed = Sets.newHashSet();
CompletedBatchOperation completed;
long start = System.nanoTime();
long end = start + unit.toNanos(timeout);
@@ -497,7 +497,7 @@
return finalizeBatchOperation(success, failed);
}
- private boolean validateBatchOperation(Set<FlowEntry> failed,
+ private boolean validateBatchOperation(Set<FlowRule> failed,
CompletedBatchOperation completed) {
if (isCancelled()) {
@@ -519,7 +519,7 @@
}
private CompletedBatchOperation finalizeBatchOperation(boolean success,
- Set<FlowEntry> failed) {
+ Set<FlowRule> failed) {
synchronized (this) {
if (!state.compareAndSet(BatchState.STARTED, BatchState.FINISHED)) {
if (state.get() == BatchState.FINISHED) {
diff --git a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
index 2bb0965..b986d6d 100644
--- a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
@@ -555,7 +555,7 @@
@Override
public CompletedBatchOperation get()
throws InterruptedException, ExecutionException {
- return new CompletedBatchOperation(true, Collections.<FlowEntry>emptySet());
+ return new CompletedBatchOperation(true, Collections.<FlowRule>emptySet());
}
@Override