From e24c25446ea6b6c601175d203c2862876ef53bd3 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Mon, 30 Sep 2013 19:25:08 -0700 Subject: [PATCH 1/1] Fix installInHw handling in FlowConfig Change-Id: I1a78614e04c0d2b1c345c7d4538003aa790ea8ec Signed-off-by: Alessandro Boch --- .../controller/forwardingrulesmanager/FlowConfig.java | 9 +++++---- .../controller/forwardingrulesmanager/frmTest.java | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java b/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java index e0b8e9a786..c57dca2a88 100644 --- a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java +++ b/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import org.opendaylight.controller.forwardingrulesmanager.FlowEntry; import org.opendaylight.controller.sal.action.Action; import org.opendaylight.controller.sal.action.ActionType; import org.opendaylight.controller.sal.action.Controller; @@ -188,13 +189,13 @@ public class FlowConfig implements Serializable { public boolean installInHw() { if (installInHw == null) { // backward compatibility - installInHw = "true"; + installInHw = Boolean.toString(true); } - return installInHw.equals("true"); + return Boolean.valueOf(installInHw); } public void setInstallInHw(boolean inHw) { - installInHw = inHw ? "true" : "false"; + installInHw = String.valueOf(inHw); } public String getInstallInHw() { @@ -1072,7 +1073,7 @@ public class FlowConfig implements Serializable { } public void toggleInstallation() { - installInHw = (installInHw == null) ? "true" : (installInHw.equals("true")) ? "false" : "true"; + installInHw = (installInHw == null) ? Boolean.toString(false) : Boolean.toString(!Boolean.valueOf(installInHw)); } /* diff --git a/opendaylight/forwardingrulesmanager/api/src/test/java/org/opendaylight/controller/forwardingrulesmanager/frmTest.java b/opendaylight/forwardingrulesmanager/api/src/test/java/org/opendaylight/controller/forwardingrulesmanager/frmTest.java index a3e1ded141..406970711c 100644 --- a/opendaylight/forwardingrulesmanager/api/src/test/java/org/opendaylight/controller/forwardingrulesmanager/frmTest.java +++ b/opendaylight/forwardingrulesmanager/api/src/test/java/org/opendaylight/controller/forwardingrulesmanager/frmTest.java @@ -469,13 +469,14 @@ public class frmTest { @Test public void testStatusToggle() throws UnknownHostException { + // default is install in Hw FlowConfig fc = new FlowConfig(); fc.toggleInstallation(); - Assert.assertTrue(fc.installInHw()); - fc.toggleInstallation(); Assert.assertFalse(fc.installInHw()); fc.toggleInstallation(); Assert.assertTrue(fc.installInHw()); + fc.toggleInstallation(); + Assert.assertFalse(fc.installInHw()); } -- 2.36.6