From: Marek Gradzki Date: Mon, 16 Oct 2017 05:38:22 +0000 (+0200) Subject: HC2VPP-246: adapt Policer Writer to policer_add_del byte order changes X-Git-Tag: v1.18.01-RC1~53 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F8825%2F1;p=hc2vpp.git HC2VPP-246: adapt Policer Writer to policer_add_del byte order changes Endianness of policer_add_del parameters was changed to network order: https://gerrit.fd.io/r/#/c/8548 JVPP flips ordering, so there is no need for additional convertion anymore. Change-Id: Ib7c5fafe240e0607819800c4cf4d37f4c4a8e1c6 Signed-off-by: Marek Gradzki --- diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java index 69eff100a..17718a418 100644 --- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java +++ b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/policer/write/PolicerCustomizer.java @@ -89,19 +89,17 @@ public class PolicerCustomizer extends FutureJVppCustomizer implements ListWrite request.isAdd = booleanToByte(isAdd); request.name = policer.getName().getBytes(StandardCharsets.US_ASCII); - // policer_add_del expects host order unlike most of the other VPP APIs - // jvpp by default converts ordering to network order, so we need additional reverse if (policer.getCir() != null) { - request.cir = Integer.reverseBytes(policer.getCir().intValue()); + request.cir = policer.getCir().intValue(); } if (policer.getEir() != null) { - request.eir = Integer.reverseBytes(policer.getEir().intValue()); + request.eir = policer.getEir().intValue(); } if (policer.getCb() != null) { - request.cb = Long.reverseBytes(policer.getCb().longValue()); + request.cb = policer.getCb().longValue(); } if (policer.getEb() != null) { - request.eb = Long.reverseBytes(policer.getEb().longValue()); + request.eb = policer.getEb().longValue(); } if (policer.getRateType() != null) { request.rateType = (byte) policer.getRateType().getIntValue();