Update classify delete table handling after VPP-206

In case of low-level classfier model, single table is removed.
No change in case of ietf-acl model: whole chain of tables is removed.

Change-Id: I94ca5d3ecaf04efc35b67fb5f878cbffc0c100cc
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AbstractIetfAclWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AbstractIetfAclWriter.java
index fb8d85b..fff93ed 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AbstractIetfAclWriter.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AbstractIetfAclWriter.java
@@ -108,6 +108,7 @@ public abstract class AbstractIetfAclWriter implements IetfAclWriter, JvppReplyC
             return; // classify table id is absent
         }
         final ClassifyAddDelTable request = new ClassifyAddDelTable();
+        request.delChain = 1;
         request.tableIndex = tableIndex;
         final CompletionStage<ClassifyAddDelTableReply> cs = jvpp.classifyAddDelTable(request);
         getReplyForDelete(cs.toCompletableFuture(), id);

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java
index 4b3ba1c..cb18227 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java
@@ -64,6 +64,7 @@ public class EgressIetfAclWriterTest extends WriterCustomizerTest {
     private static ClassifyAddDelTable classifyAddDelTable(final int tableIndex) {
         final ClassifyAddDelTable reply = new ClassifyAddDelTable();
         reply.tableIndex = tableIndex;
+        reply.delChain = 1;
         return reply;
     }
 

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java
index 8f71274..07d4166 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java
@@ -109,6 +109,7 @@ public class IetfAclCustomizerTest extends WriterCustomizerTest {
     private static ClassifyAddDelTable classifyAddDelTable(final int tableIndex) {
         final ClassifyAddDelTable reply = new ClassifyAddDelTable();
         reply.tableIndex = tableIndex;
+        reply.delChain = 1;
         return reply;
     }