Cleanup in the FlowPusher and the FlowSynchronizer:
* Don't use FlowPath and IFlowPath when pushing flows through the
FlowPusher, because it is not needed anymore: now the FlowEntry object
is self-contained.
* Removed the alternative FlowPusher add(IFlowEntry) method that takes
IFlowEntry argument from Titan; instead, extract the IFlowEntry
into a FlowEntry object, and then use the remaining add(FlowEntry)
method.
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index 186d4ff..bdd0355 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -417,7 +417,6 @@
Map<Long, IOFSwitch> mySwitches = getMySwitches();
for (FlowPathEntryPair flowPair : modifiedFlowEntries) {
- FlowPath flowPath = flowPair.flowPath;
FlowEntry flowEntry = flowPair.flowEntry;
IOFSwitch mySwitch = mySwitches.get(flowEntry.dpid().value());
@@ -429,10 +428,10 @@
//
// Push the Flow Entry into the switch
//
- if (! pusher.add(mySwitch, flowPath, flowEntry)) {
+ if (! pusher.add(mySwitch, flowEntry)) {
String logMsg = "Cannot install Flow Entry " +
flowEntry.flowEntryId() +
- " from Flow Path " + flowPath.flowId() +
+ " from Flow Path " + flowEntry.flowId() +
" on switch " + flowEntry.dpid();
log.error(logMsg);
continue;