diff options
Diffstat (limited to 'v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier')
4 files changed, 6 insertions, 7 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionReader.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionReader.java index 002fc62fd..1f469c5c4 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionReader.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionReader.java @@ -102,7 +102,7 @@ public class ClassifySessionReader extends FutureJVppCustomizer if (classifySession.isPresent()) { final ClassifySessionDetails detail = classifySession.get(); - builder.setHitNextIndex(readVppNode(detail.hitNextIndex, LOG)); + builder.setHitNext(readVppNode(detail.hitNextIndex, LOG)); if (detail.opaqueIndex != ~0) { // value is specified: builder.setOpaqueIndex(readOpaqueIndex(detail.opaqueIndex)); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriter.java index 08989ce7d..e56d50dbf 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriter.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriter.java @@ -131,7 +131,7 @@ public class ClassifySessionWriter extends FutureJVppCustomizer // mandatory: // TODO implement node name to index conversion after https://jira.fd.io/browse/VPP-203 is fixed - request.hitNextIndex = classifySession.getHitNextIndex().getPacketHandlingAction().getIntValue(); + request.hitNextIndex = classifySession.getHitNext().getPacketHandlingAction().getIntValue(); if (classifySession.getOpaqueIndex() != null) { request.opaqueIndex = getOpaqueIndexValue(classifySession.getOpaqueIndex()); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReader.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReader.java index 7f877ca49..ce29dc97b 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReader.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReader.java @@ -106,7 +106,7 @@ public class ClassifyTableReader extends FutureJVppCustomizer builder.setSkipNVectors(UnsignedInts.toLong(reply.skipNVectors)); - builder.setMissNextIndex(readVppNode(reply.missNextIndex, LOG)); + builder.setMissNext(readVppNode(reply.missNextIndex, LOG)); builder.setMask(new HexString(printHexBinary(reply.mask))); builder.setActiveSessions(UnsignedInts.toLong(reply.activeSessions)); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriter.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriter.java index 4f59ffe8e..788aac59c 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriter.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriter.java @@ -90,8 +90,7 @@ public class ClassifyTableWriter extends FutureJVppCustomizer public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<ClassifyTable> id, @Nonnull final ClassifyTable dataBefore, @Nonnull final ClassifyTable dataAfter, @Nonnull final WriteContext writeContext) throws WriteFailedException { - LOG.warn("ClassifyTable update is not supported, ignoring configuration {}", dataAfter); - // TODO if only leaves were updated (but not child/aug nodes), we should throw exception to deny config change + throw new UnsupportedOperationException("Classify table update is not supported"); } @Override @@ -141,10 +140,10 @@ public class ClassifyTableWriter extends FutureJVppCustomizer // mandatory // TODO implement node name to index conversion after https://jira.fd.io/browse/VPP-203 is fixed - request.missNextIndex = table.getMissNextIndex().getPacketHandlingAction().getIntValue(); + request.missNextIndex = table.getMissNext().getPacketHandlingAction().getIntValue(); final String nextTable = table.getNextTable(); - if (nextTable != null) { + if (isAdd && nextTable != null) { request.nextTableIndex = classifyTableContext.getIndex(nextTable, ctx); } else { request.nextTableIndex = ~0; // value not specified |