Fix a bug when pushing modified Flow Paths to the database:
don't push Flow Paths that are marked for deletion, because those
are handled elsewhere.
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 0bced44..2619243 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -620,6 +620,16 @@
for (FlowPath flowPath : modifiedFlowPaths) {
//
+ // Don't push Flow Paths that are deleted by the user.
+ // Those will be deleted at the ONOS instance that received the
+ // API call to delete the flow.
+ //
+ if (flowPath.flowPathUserState() ==
+ FlowPathUserState.FP_USER_DELETE) {
+ continue;
+ }
+
+ //
// Push the changes only on the instance responsible for the
// first switch.
//