Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Replace exception.printStacktrace with write to log."
[controller.git]
/
opendaylight
/
forwardingrulesmanager
/
api
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
forwardingrulesmanager
/
frmTest.java
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 fc22ee7dddaef5752bd03647e2e4830c0f77205d..a3e1ded14178ff8d00a3efe21d02ea798fa19af2 100644
(file)
--- 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
@@
-19,8
+19,6
@@
import java.util.concurrent.ConcurrentMap;
import org.junit.Assert;
import org.junit.Test;
import org.junit.Assert;
import org.junit.Test;
-import org.opendaylight.controller.forwardingrulesmanager.FlowConfig;
-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;
import org.opendaylight.controller.sal.action.Action;
import org.opendaylight.controller.sal.action.ActionType;
import org.opendaylight.controller.sal.action.Controller;
@@
-523,6
+521,12
@@
public class frmTest {
Assert.assertTrue(status.getDescription().contains("Node is null"));
fc.setNode(Node.fromString(Node.NodeIDType.OPENFLOW, "1"));
Assert.assertTrue(status.getDescription().contains("Node is null"));
fc.setNode(Node.fromString(Node.NodeIDType.OPENFLOW, "1"));
+ Assert.assertFalse(fc.validate(null).isSuccess());
+ List<String> actions = new ArrayList<String>();
+ fc.setActions(actions);
+ Assert.assertFalse(fc.validate(null).isSuccess());
+ actions.add("OUTPUT=2");
+ fc.setActions(actions);
Assert.assertTrue(fc.validate(null).isSuccess());
fc.setPriority("-1");
Assert.assertTrue(fc.validate(null).isSuccess());
fc.setPriority("-1");
@@
-611,9
+615,15
@@
public class frmTest {
Assert.assertFalse(status.isSuccess());
Assert.assertTrue(status.getDescription().contains("Transport source port"));
Assert.assertFalse(status.isSuccess());
Assert.assertTrue(status.getDescription().contains("Transport source port"));
+ fc.setSrcPort("0");
+ Assert.assertTrue(fc.validate(null).isSuccess());
+
fc.setSrcPort("0x00ff");
Assert.assertTrue(fc.validate(null).isSuccess());
fc.setSrcPort("0x00ff");
Assert.assertTrue(fc.validate(null).isSuccess());
+ fc.setSrcPort("0xffff");
+ Assert.assertTrue(fc.validate(null).isSuccess());
+
fc.setDstPort("-1");
status = fc.validate(null);
Assert.assertFalse(status.isSuccess());
fc.setDstPort("-1");
status = fc.validate(null);
Assert.assertFalse(status.isSuccess());
@@
-624,9
+634,15
@@
public class frmTest {
Assert.assertFalse(status.isSuccess());
Assert.assertTrue(status.getDescription().contains("Transport destination port"));
Assert.assertFalse(status.isSuccess());
Assert.assertTrue(status.getDescription().contains("Transport destination port"));
+ fc.setDstPort("0");
+ Assert.assertTrue(fc.validate(null).isSuccess());
+
fc.setDstPort("0x00ff");
Assert.assertTrue(fc.validate(null).isSuccess());
fc.setDstPort("0x00ff");
Assert.assertTrue(fc.validate(null).isSuccess());
+ fc.setDstPort("0xffff");
+ Assert.assertTrue(fc.validate(null).isSuccess());
+
fc.setSrcMac("abc");
status = fc.validate(null);
Assert.assertFalse(status.isSuccess());
fc.setSrcMac("abc");
status = fc.validate(null);
Assert.assertFalse(status.isSuccess());