From: Alessandro Boch <aboch@cisco.com>
Date: Thu, 1 Aug 2013 19:03:51 +0000 (-0700)
Subject: Fix minor bug in FRM proactive flow code path
X-Git-Tag: releasepom-0.1.0~241^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=e72ae0ab1513e382e141f70dc544efdd782e439d

Fix minor bug in FRM proactive flow code path

ISSUE:
When proactive flows are installed on a switch
(as a result of user configuring the forwarding mode of the node to proactive)
in case switch fails to install any of these flows, the informational log still
reports that the proactive flow was succesfully installed.
CHANGE:
When calling addStaticFlowInternal() make sure to pass the restore flag as false

Change-Id: I7f1e85d40624a145c6d71bb1149b14c825894312
Signed-off-by: Alessandro Boch <aboch@cisco.com>
---

diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java
index 2eaafb6989..cade266688 100644
--- a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java
+++ b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java
@@ -1915,7 +1915,7 @@ public class ForwardingRulesManager implements IForwardingRulesManager, PortGrou
 
         log.info("Forwarding mode for node {} set to {}", node, (proactive ? "proactive" : "reactive"));
         for (FlowConfig fc : defaultConfigs) {
-            Status status = (proactive) ? addStaticFlowInternal(fc, true) : removeStaticFlow(fc);
+            Status status = (proactive) ? addStaticFlowInternal(fc, false) : removeStaticFlow(fc);
             if (status.isSuccess()) {
                 log.info("{} Proactive Static flow: {}", (proactive ? "Installed" : "Removed"), fc.getName());
             } else {