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/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java

diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
index 79b3f48..ca00687 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
@@ -52,9 +52,9 @@
     private static final Logger log = getLogger(FabricTreatmentInterpreter.class);
     private static final String INVALID_TREATMENT = "Invalid treatment for %s block [%s]";
     private static final String INVALID_TREATMENT_WITH_EXP = "Invalid treatment for %s block: %s [%s]";
-    private static final PiAction NOP = PiAction.builder()
-            .withId(FabricConstants.NOP)
-            .build();
+    private static final PiAction NOP = PiAction.builder().withId(FabricConstants.NOP).build();
+    private static final PiAction NOP_ACL = PiAction.builder()
+            .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ACL).build();
 
     private static final PiAction POP_VLAN = PiAction.builder()
             .withId(FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN)
@@ -141,7 +141,11 @@
             throws PiInterpreterException {
         // Empty treatment, generate table entry with no action
         if (treatment.equals(DefaultTrafficTreatment.emptyTreatment())) {
-            return null;
+            if (tableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_ACL)) {
+                return NOP_ACL;
+            } else {
+                return NOP;
+            }
         }
         PortNumber outPort = getOutputPort(treatment);
         if (outPort == null