diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-08-10 06:56:36 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-08-10 07:00:25 +0200 |
| commit | 446de16ff5c8df1914039b826adbbd0ec5ac2adc (patch) | |
| tree | 80cddfeeab13f5853546e017b3f80a524a5cd856 /vpp-classifier | |
| parent | 69870253c3beae0f5414aa0dc3460b6506c20cec (diff) | |
Set mask/match length when using VPP's classfier
Adapts hc2vpp to recent VPP api change:
https://gerrit.fd.io/r/#/c/13007/
Setting length field is currently mandatory
for variable length arrays (VPP-199).
Change-Id: I7ce66076d8a29d1ff5dfe5592e651d133e4072aa
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'vpp-classifier')
4 files changed, 4 insertions, 0 deletions
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java index 0e69b33b6..11a48ef14 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriter.java @@ -166,6 +166,7 @@ public class ClassifySessionWriter extends VppNodeWriter request.advance = classifySession.getAdvance(); request.match = DatatypeConverter.parseHexBinary(classifySession.getMatch().getValue().replace(":", "")); + request.matchLen = request.match.length; return request; } diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriter.java index 34e689e5a..8e72df46a 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriter.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriter.java @@ -145,6 +145,7 @@ public class ClassifyTableWriter extends VppNodeWriter request.nextTableIndex = ~0; // value not specified } request.mask = DatatypeConverter.parseHexBinary(table.getMask().getValue().replace(":", "")); + request.maskLen = request.mask.length; checkArgument(request.mask.length % 16 == 0, "Number of mask bytes must be multiple of 16."); request.matchNVectors = request.mask.length / 16; diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java index 0716cde19..b59acdb4e 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java @@ -87,6 +87,7 @@ public class ClassifySessionWriterTest extends WriterCustomizerTest { request.match = new byte[]{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, 0x00, 0x00, 0x00, 0x00}; + request.matchLen = request.match.length; return request; } diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java index 389337c76..bd627d5b8 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java @@ -88,6 +88,7 @@ public class ClassifyTableWriterTest extends WriterCustomizerTest { request.mask = new byte[]{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, 0x00, 0x00, 0x00, 0x00}; + request.maskLen = request.mask.length; return request; } |