Fix for Bug #308: Zombie Flows after Flow add/delete
Store the common matching conditions for all Flow Entries
in the FlowPath entry.
Thus, if the Shortest Path computation fails and the Flow Entries
are deleted, those common matching conditions are preserved.
diff --git a/src/main/java/net/onrc/onos/flow/IFlowManager.java b/src/main/java/net/onrc/onos/flow/IFlowManager.java
index d163760..743f8fb 100644
--- a/src/main/java/net/onrc/onos/flow/IFlowManager.java
+++ b/src/main/java/net/onrc/onos/flow/IFlowManager.java
@@ -84,19 +84,23 @@
* Install a Flow Entry on a switch.
*
* @param mySwitch the switch to install the Flow Entry into.
+ * @param flowPath the flow path for the flow entry to install.
* @param flowEntry the flow entry to install.
* @return true on success, otherwise false.
*/
- public boolean installFlowEntry(IOFSwitch mySwitch, FlowEntry flowEntry);
+ public boolean installFlowEntry(IOFSwitch mySwitch, FlowPath flowPath,
+ FlowEntry flowEntry);
/**
* Remove a Flow Entry from a switch.
*
* @param mySwitch the switch to remove the Flow Entry from.
+ * @param flowPath the flow path for the flow entry to remove.
* @param flowEntry the flow entry to remove.
* @return true on success, otherwise false.
*/
- public boolean removeFlowEntry(IOFSwitch mySwitch, FlowEntry flowEntry);
+ public boolean removeFlowEntry(IOFSwitch mySwitch, FlowPath flowPath,
+ FlowEntry flowEntry);
/**
* Install a Flow Entry on a remote controller.
@@ -105,16 +109,20 @@
* - For now it will make a REST call to the remote controller.
* - Internally, it needs to know the name of the remote controller.
*
+ * @param flowPath the flow path for the flow entry to install.
* @param flowEntry the flow entry to install.
* @return true on success, otherwise false.
*/
- public boolean installRemoteFlowEntry(FlowEntry flowEntry);
+ public boolean installRemoteFlowEntry(FlowPath flowPath,
+ FlowEntry flowEntry);
/**
* Remove a flow entry on a remote controller.
*
+ * @param flowPath the flow path for the flow entry to remove.
* @param flowEntry the flow entry to remove.
* @return true on success, otherwise false.
*/
- public boolean removeRemoteFlowEntry(FlowEntry flowEntry);
+ public boolean removeRemoteFlowEntry(FlowPath flowPath,
+ FlowEntry flowEntry);
}