commit 02c4c579f4e47aa9b8021e87ac78365cfa75967e
author Yi Tseng <yi@opennetworking.org> Mon Jan 22 17:52:10 2018 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Jan 23 07:50:31 2018 +0000
tree 4392f04a2cac258726bd0ba4fce09a3c870f3e9e
parent bd46d054101396e06ea7ae89ca45fa445b7be5db

[ONOS-7392] Fix P4Runtime priority bug

Change-Id: I97aabb25ebf4f2d16c3c7f17f369a7744ef03994

core/net/src/main/java/org/onosproject/net/pi/impl/PiFlowRuleTranslatorImpl.java

diff --git a/core/net/src/main/java/org/onosproject/net/pi/impl/PiFlowRuleTranslatorImpl.java b/core/net/src/main/java/org/onosproject/net/pi/impl/PiFlowRuleTranslatorImpl.java
index f04e7b0..430e5e1 100644
--- a/core/net/src/main/java/org/onosproject/net/pi/impl/PiFlowRuleTranslatorImpl.java
+++ b/core/net/src/main/java/org/onosproject/net/pi/impl/PiFlowRuleTranslatorImpl.java
@@ -31,6 +31,7 @@
 import org.onosproject.net.pi.model.PiActionParamModel;
 import org.onosproject.net.pi.model.PiMatchFieldId;
 import org.onosproject.net.pi.model.PiMatchFieldModel;
+import org.onosproject.net.pi.model.PiMatchType;
 import org.onosproject.net.pi.model.PiPipeconf;
 import org.onosproject.net.pi.model.PiPipelineInterpreter;
 import org.onosproject.net.pi.model.PiPipelineModel;
@@ -103,26 +104,23 @@
         // Build PI entry.
         final PiTableEntry.Builder tableEntryBuilder = PiTableEntry.builder();
 
-        // In the P4 world 0 is the highest priority, in ONOS the lowest one.
-        // FIXME: move priority conversion to the driver, where different constraints might apply
-        // e.g. less bits for encoding priority in TCAM-based implementations.
-        final int newPriority;
-        if (rule.priority() > MAX_PI_PRIORITY) {
-            log.warn("Flow rule priority too big, setting translated priority to max value {}: {}",
-                     MAX_PI_PRIORITY, rule);
-            newPriority = 0;
-        } else {
-            newPriority = MAX_PI_PRIORITY - rule.priority();
-        }
+        // FIXME: P4Runtime limit
+        // Need to ignore priority if no TCAM lookup match field
+        boolean dontIgnorePriority = fieldMatches.stream()
+                .anyMatch(match -> match.type() == PiMatchType.TERNARY ||
+                        match.type() == PiMatchType.RANGE);
 
         tableEntryBuilder
                 .forTable(piTableId)
-                .withPriority(newPriority)
                 .withMatchKey(PiMatchKey.builder()
                                       .addFieldMatches(fieldMatches)
                                       .build())
                 .withAction(piTableAction);
 
+        if (dontIgnorePriority) {
+            tableEntryBuilder.withPriority(rule.priority());
+        }
+
         if (!rule.isPermanent()) {
             if (tableModel.supportsAging()) {
                 tableEntryBuilder.withTimeout((double) rule.timeout());