Apply the naming convention to BatchOperationEntry
Resolve ONOS-889
Change-Id: I2001fabba138b9ff5be9a5943d3f020b4c38d195
diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 44f6473..6d6cd9a 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -186,7 +186,7 @@
ArrayListMultimap.create();
List<Future<CompletedBatchOperation>> futures = Lists.newArrayList();
for (FlowRuleBatchEntry fbe : batch.getOperations()) {
- final FlowRule f = fbe.getTarget();
+ final FlowRule f = fbe.target();
perDeviceBatches.put(f.deviceId(), fbe);
}
@@ -400,7 +400,7 @@
FlowRuleBatchOperation batchOperation = request.asBatchOperation();
FlowRuleProvider flowRuleProvider =
- getProvider(batchOperation.getOperations().get(0).getTarget().deviceId());
+ getProvider(batchOperation.getOperations().get(0).target().deviceId());
final Future<CompletedBatchOperation> result =
flowRuleProvider.executeBatch(batchOperation);
futureService.submit(new Runnable() {
@@ -416,7 +416,7 @@
Set<FlowRule> failures = new HashSet<>(batchOperation.size());
for (FlowRuleBatchEntry op : batchOperation.getOperations()) {
- failures.add(op.getTarget());
+ failures.add(op.target());
}
res = new CompletedBatchOperation(false, failures);
store.batchOperationComplete(FlowRuleBatchEvent.completed(request, res));
@@ -565,12 +565,12 @@
log.debug("cleaning up batch");
// TODO convert these into a batch?
for (FlowRuleBatchEntry fbe : batches.values()) {
- if (fbe.getOperator() == FlowRuleOperation.ADD ||
- fbe.getOperator() == FlowRuleOperation.MODIFY) {
- store.deleteFlowRule(fbe.getTarget());
- } else if (fbe.getOperator() == FlowRuleOperation.REMOVE) {
- store.removeFlowRule(new DefaultFlowEntry(fbe.getTarget()));
- store.storeFlowRule(fbe.getTarget());
+ if (fbe.operator() == FlowRuleOperation.ADD ||
+ fbe.operator() == FlowRuleOperation.MODIFY) {
+ store.deleteFlowRule(fbe.target());
+ } else if (fbe.operator() == FlowRuleOperation.REMOVE) {
+ store.removeFlowRule(new DefaultFlowEntry(fbe.target()));
+ store.storeFlowRule(fbe.target());
}
}
}
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java b/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
index 1da849e..e956575 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
@@ -56,8 +56,8 @@
@Override
public Future<CompletedBatchOperation> applyBatch(FlowRuleBatchOperation batch) {
for (FlowRuleBatchEntry fbe : batch.getOperations()) {
- FlowRule fr = fbe.getTarget();
- switch (fbe.getOperator()) {
+ FlowRule fr = fbe.target();
+ switch (fbe.operator()) {
case ADD:
flows.add(fr);
break;