Apply the naming convention to BatchOperationEntry
Resolve ONOS-889
Change-Id: I2001fabba138b9ff5be9a5943d3f020b4c38d195
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
index 18aca8a..32dfefd 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
@@ -201,7 +201,7 @@
*/
Map<OFFlowMod, OpenFlowSwitch> mods = Maps.newIdentityHashMap();
for (FlowRuleBatchEntry fbe : batch.getOperations()) {
- FlowRule flowRule = fbe.getTarget();
+ FlowRule flowRule = fbe.target();
final Dpid dpid = Dpid.dpid(flowRule.deviceId().uri());
OpenFlowSwitch sw = controller.getSwitch(dpid);
if (sw == null) {
@@ -220,7 +220,7 @@
FlowModBuilder.builder(flowRule, sw.factory(),
Optional.of(flowModXid));
OFFlowMod mod = null;
- switch (fbe.getOperator()) {
+ switch (fbe.operator()) {
case ADD:
mod = builder.buildFlowAdd();
break;
@@ -231,7 +231,7 @@
mod = builder.buildFlowMod();
break;
default:
- log.error("Unsupported batch operation {}", fbe.getOperator());
+ log.error("Unsupported batch operation {}", fbe.operator());
}
if (mod != null) {
mods.put(mod, sw);
@@ -406,7 +406,7 @@
FlowEntry fe = null;
FlowRuleBatchEntry fbe = fms.get(msg.getXid());
failedId = fbe.id();
- FlowRule offending = fbe.getTarget();
+ FlowRule offending = fbe.target();
//TODO handle specific error msgs
switch (msg.getErrType()) {
case BAD_ACTION:
@@ -482,11 +482,11 @@
this.state = BatchState.CANCELLED;
cleanUp();
for (FlowRuleBatchEntry fbe : fms.values()) {
- if (fbe.getOperator() == FlowRuleOperation.ADD ||
- fbe.getOperator() == FlowRuleOperation.MODIFY) {
- removeFlowRule(fbe.getTarget());
- } else if (fbe.getOperator() == FlowRuleOperation.REMOVE) {
- applyRule(fbe.getTarget());
+ if (fbe.operator() == FlowRuleOperation.ADD ||
+ fbe.operator() == FlowRuleOperation.MODIFY) {
+ removeFlowRule(fbe.target());
+ } else if (fbe.operator() == FlowRuleOperation.REMOVE) {
+ applyRule(fbe.target());
}
}
@@ -554,7 +554,7 @@
.add("pending devices", sws)
.add("devices in batch",
fms.values().stream()
- .map((fbe) -> fbe.getTarget().deviceId())
+ .map((fbe) -> fbe.target().deviceId())
.distinct().collect(Collectors.toList()))
.add("failedId", failedId)
.add("latchCount", countDownLatch.getCount())