summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-12-08 14:34:50 +0100
committerMarek Gradzki <mgradzki@cisco.com>2016-12-09 08:21:25 +0100
commit486cef9607ec67105f62275799a9f50bae4b9b96 (patch)
tree967a8107d4140a24bc5b7752ebad1e67301d5e61
parenteee2b296b00cef593155474def5a142e71c96e4f (diff)
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 <mgradzki@cisco.com>
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/acl/common/AbstractIetfAclWriter.java1
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java1
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java1
3 files changed, 3 insertions, 0 deletions
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 fb8d85bdf..fff93eda4 100644
--- 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 4b3ba1c71..cb182272a 100644
--- 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 8f71274d0..07d4166c8 100644
--- 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;
}