commit cf696e55d384ec01ce6c21511e8b49b4903ed983
author Charles Chan <rascov@gmail.com> Thu Aug 16 16:25:13 2018 -0700
committer Charles Chan <charles@opennetworking.org> Fri Aug 17 17:45:03 2018 +0000
tree 1f46fff138fe373c209abea01b689c871e191826
parent b71e1ba9638e7e16ddd0277cd88c9c6ae3d84e21

NoAction in ACL should be mapped to NOP

Change-Id: Ia3c9038eb726379ed2f95635c28ddf5794e646de

pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java

diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
index bb6b45d..11f22e7 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
@@ -30,7 +30,6 @@
 import org.onosproject.net.pi.runtime.PiActionParam;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
 /**
  * Test for fabric interpreter.
@@ -132,9 +131,20 @@
     @Test
     public void testEmptyForwardingTreatment() throws Exception {
         TrafficTreatment treatment = DefaultTrafficTreatment.emptyTreatment();
+
         PiAction mappedAction = interpreter.mapTreatment(treatment,
                                                          FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4);
-        assertNull(mappedAction);
+        PiAction expectedAction = PiAction.builder()
+                .withId(FabricConstants.NOP)
+                .build();
+        assertEquals(expectedAction, mappedAction);
+
+        mappedAction = interpreter.mapTreatment(treatment,
+                                                FabricConstants.FABRIC_INGRESS_FORWARDING_ACL);
+        expectedAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ACL)
+                .build();
+        assertEquals(expectedAction, mappedAction);
     }
 
     /* Next control block */