Merge "Fixed Group and meter id bugs"

[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 f139f45377a0344733b853cb6c86c59daca1226f..48e1f07716ec267ddb52340e3ea21ef64ac8cebd 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.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;
@@ -258,7 +256,10 @@ public class frmTest {
     public void testInternalFlow() {
         FlowConfig flowConfig = new FlowConfig();
         Assert.assertFalse(flowConfig.isInternalFlow());
-        flowConfig.setName("**Internal");
+        flowConfig.setName("__Internal__");
+        Status status = flowConfig.validate(null);
+        Assert.assertFalse(status.isSuccess());
+        Assert.assertTrue(status.getDescription().contains("name"));
         Assert.assertTrue(flowConfig.isInternalFlow());
         flowConfig.setName("External");
         Assert.assertFalse(flowConfig.isInternalFlow());
@@ -468,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());
 
     }
 
@@ -520,6 +522,12 @@ public class frmTest {
         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");
@@ -538,11 +546,6 @@ public class frmTest {
         fc.setCookie("100");
         Assert.assertTrue(fc.validate(null).isSuccess());
 
-        fc.setIngressPort("-1");
-        status = fc.validate(null);
-        Assert.assertFalse(status.isSuccess());
-        Assert.assertTrue(status.getDescription().contains("is not valid for the Switch"));
-
         fc.setIngressPort("100");
         Assert.assertTrue(fc.validate(null).isSuccess());
 
@@ -608,9 +611,15 @@ public class frmTest {
         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("0xffff");
+        Assert.assertTrue(fc.validate(null).isSuccess());
+
         fc.setDstPort("-1");
         status = fc.validate(null);
         Assert.assertFalse(status.isSuccess());
@@ -621,9 +630,15 @@ public class frmTest {
         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("0xffff");
+        Assert.assertTrue(fc.validate(null).isSuccess());
+
         fc.setSrcMac("abc");
         status = fc.validate(null);
         Assert.assertFalse(status.isSuccess());