commit 181f3f46cca806c94424692a0e12cbac2f6df4a8
author Carmelo Cascone <carmelo@opennetworking.org> Wed Apr 11 17:37:53 2018 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Apr 12 01:05:00 2018 +0000
tree 2d91e4c4a37947e77ac967bac1f62d5130e6e462
parent 0316b96ff24c844cad9b6d634a70d620827e6764

Fixed wrong LPM mask in PI flow rule translator

Change-Id: I5c8c67ae4b989ed326c6e17c0fe1e5745defd900

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 f22fdde..46238c4e 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
@@ -430,11 +430,11 @@
                                 "Invalid prefix length for LPM field '%s', found %d but field has bit-width %d",
                                 fieldMatch.fieldId(), lpmfield.prefixLength(), modelBitWidth));
                     }
-                    ImmutableByteSequence lpmMask = prefixOnes(modelBitWidth * Byte.SIZE,
-                                                               lpmfield.prefixLength());
                     ImmutableByteSequence lpmValue = lpmfield.value()
-                            .fit(modelBitWidth)
-                            .bitwiseAnd(lpmMask);
+                            .fit(modelBitWidth);
+                    ImmutableByteSequence lpmMask = prefixOnes(lpmValue.size(),
+                                                               lpmfield.prefixLength());
+                    lpmValue = lpmValue.bitwiseAnd(lpmMask);
                     return new PiLpmFieldMatch(fieldMatch.fieldId(),
                                                lpmValue, lpmfield.prefixLength());
                 case RANGE: