commit 667538d4ea0281fa72f534284c3ff85c7415082b
author Yi Tseng <yi@opennetworking.org> Fri Jun 22 02:19:23 2018 +0800
committer Yi Tseng <yi@opennetworking.org> Fri Jun 22 02:19:23 2018 +0800
tree 675f0eeeee3dec7d12b1018aaf1e2f58c9104023
parent bf0d4374238ca4113a10c48efe6e7eadc7b93ccf

[ONOS-7724] Incorrect priority check in PiFlowRuleTranslator

Change-Id: Ib927bd52959b3d128060960c5e048ea5afc7a52a

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 40a150f..5741e65 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
@@ -111,9 +111,9 @@
                     .build();
             // FIXME: P4Runtime limit
             // Need to ignore priority if no TCAM lookup match field
-            needPriority = fieldMatches.stream()
-                    .anyMatch(match -> match.type() == PiMatchType.TERNARY ||
-                            match.type() == PiMatchType.RANGE);
+            needPriority = tableModel.matchFields().stream()
+                    .anyMatch(match -> match.matchType() == PiMatchType.TERNARY ||
+                            match.matchType() == PiMatchType.RANGE);
         }
         // Translate treatment.
         final PiTableAction piTableAction = translateTreatment(rule.treatment(), interpreter, piTableId, pipelineModel);