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 <[email protected]>

diff --git a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java
index 80ebdcc..8a737d2 100644 (file)
--- a/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java
+++ b/it/jvpp-benchmark/src/main/java/io/fd/hc2vpp/it/jvpp/benchmark/classify/ClassifyTableProviderImpl.java
@@ -17,7 +17,6 @@
 package io.fd.hc2vpp.it.jvpp.benchmark.classify;
 
 import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.io.Serializable;
 import java.util.Random;
 import javax.annotation.concurrent.NotThreadSafe;
 
@@ -66,6 +65,7 @@ class ClassifyTableProviderImpl implements ClassifyTableProvider {
         addDelTable.skipNVectors = 0;
         addDelTable.matchNVectors = 1;
         addDelTable.mask = new byte[16];
+        addDelTable.maskLen = 16;
         rnd.nextBytes(addDelTable.mask);
         return addDelTable;
     }

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 0e69b33..11a48ef 100644 (file)
--- 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 34e689e..8e72df4 100644 (file)
--- 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 0716cde..b59acdb 100644 (file)
--- 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 389337c..bd627d5 100644 (file)
--- 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;
     }