From ee5597ccd4091fee6a1586849d61eb657a99225d Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 11 Feb 2019 09:35:12 +0100 Subject: add support for Enumsets VPP API introduced flags which are by JVPP translated to EnumSets. This fixes several cases where flags are used. Change-Id: Ie52cba0c3a36fa6de2bda91c4688277471a67243 Signed-off-by: Michal Cmarada --- .../ipsec/write/IpsecSadEntryCustomizer.java | 12 +++------ .../ipsec/read/IpsecStateCustomizerTest.java | 5 ++-- .../ipsec/write/IpsecSadEntryCustomizerTest.java | 31 ++++++++++++++++++---- .../l3/read/ipv4/Ipv4NeighbourCustomizer.java | 7 ++--- .../l3/read/ipv6/Ipv6NeighbourCustomizer.java | 7 ++--- .../l3/write/ipv6/Ipv6NeighbourCustomizer.java | 3 ++- .../fd/hc2vpp/l3/read/InterfaceChildNodeTest.java | 3 +++ .../l3/write/ipv4/Ipv4NeighbourCustomizerTest.java | 3 ++- .../l3/write/ipv6/Ipv6NeighbourCustomizerTest.java | 3 ++- .../io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java | 3 ++- 10 files changed, 52 insertions(+), 25 deletions(-) diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java index 1822b024f..d5b41cbe1 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java @@ -103,21 +103,17 @@ public class IpsecSadEntryCustomizer extends FutureJVppCustomizer if (dataAfter.getSpi() != null) { request.entry.spi = dataAfter.getSpi().intValue(); } - request.entry.flags = IpsecSadFlags.IPSEC_API_SAD_FLAG_NONE; + request.entry.flags = new IpsecSadFlags(); if (dataAfter.getAntiReplayWindow() != null && dataAfter.getAntiReplayWindow() > 0) { - request.entry.flags = IpsecSadFlags.IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY; + request.entry.flags.add(IpsecSadFlags.IpsecSadFlagsOptions.IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY); } - if (dataAfter.getSaMode() != null && dataAfter.getSaMode().equals(IpsecMode.Tunnel)) { - //TODO check if flags can be set at once if (dataAfter.getSourceAddress() != null && dataAfter.getSourceAddress().getIpAddress() instanceof Ipv4Address) { - request.entry.flags = IpsecSadFlags - .forValue((request.entry.flags.value + IpsecSadFlags.IPSEC_API_SAD_FLAG_IS_TUNNEL.value)); + request.entry.flags.add(IpsecSadFlags.IpsecSadFlagsOptions.IPSEC_API_SAD_FLAG_IS_TUNNEL); } else if (dataAfter.getSourceAddress() != null && dataAfter.getSourceAddress().getIpAddress() instanceof Ipv6Address) { - request.entry.flags = IpsecSadFlags - .forValue((request.entry.flags.value + IpsecSadFlags.IPSEC_API_SAD_FLAG_IS_TUNNEL_V6.value)); + request.entry.flags.add(IpsecSadFlags.IpsecSadFlagsOptions.IPSEC_API_SAD_FLAG_IS_TUNNEL_V6); } } request.isAdd = adding diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java index 46ebd89d8..53cbb4b3e 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/read/IpsecStateCustomizerTest.java @@ -87,8 +87,9 @@ public class IpsecStateCustomizerTest extends ReaderCustomizerTest { IpNeighborAddDel request = preBindRequest(add); - request.neighbor.flags = IpNeighborFlags.IP_API_NEIGHBOR_FLAG_STATIC; + request.neighbor.flags = new IpNeighborFlags(); + request.neighbor.flags.add(IpNeighborFlags.IpNeighborFlagsOptions.IP_API_NEIGHBOR_FLAG_STATIC); request.neighbor.macAddress = parseMacAddress(data.getLinkLayerAddress().getValue()); request.neighbor.ipAddress = ipv6AddressToAddress(data.getIp()); request.neighbor.swIfIndex = parentInterfaceIndex; diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/InterfaceChildNodeTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/InterfaceChildNodeTest.java index 9534ac966..f58422066 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/InterfaceChildNodeTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/read/InterfaceChildNodeTest.java @@ -37,6 +37,7 @@ import io.fd.vpp.jvpp.core.types.AddressUnion; import io.fd.vpp.jvpp.core.types.Ip4Address; import io.fd.vpp.jvpp.core.types.Ip6Address; import io.fd.vpp.jvpp.core.types.IpNeighbor; +import io.fd.vpp.jvpp.core.types.IpNeighborFlags; import io.fd.vpp.jvpp.core.types.MacAddress; import java.util.Arrays; import java.util.List; @@ -209,6 +210,8 @@ public interface InterfaceChildNodeTest extends NamingContextHelper, FutureProdu detail.neighbor.ipAddress.un = addressUnion; detail.neighbor.macAddress = new MacAddress(); detail.neighbor.macAddress.macaddress = mac; + detail.neighbor.flags = new IpNeighborFlags(); + detail.neighbor.flags.add(IpNeighborFlags.IpNeighborFlagsOptions.IP_API_NEIGHBOR_FLAG_STATIC); return detail; } diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizerTest.java index 7d2b6472c..cb87b5e3e 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv4/Ipv4NeighbourCustomizerTest.java @@ -137,7 +137,8 @@ public class Ipv4NeighbourCustomizerTest extends WriterCustomizerTest implements ip4Address.ip4Address = new byte[]{(byte) 192, (byte) 168, 2, 1}; request.neighbor.ipAddress.un = new AddressUnion(ip4Address); request.isAdd = booleanToByte(isAdd); - request.neighbor.flags = IpNeighborFlags.IP_API_NEIGHBOR_FLAG_STATIC; + request.neighbor.flags = new IpNeighborFlags(); + request.neighbor.flags.add(IpNeighborFlags.IpNeighborFlagsOptions.IP_API_NEIGHBOR_FLAG_STATIC); request.neighbor.swIfIndex = IFACE_ID; return request; } diff --git a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizerTest.java b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizerTest.java index ec8734cf7..f5f906155 100644 --- a/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizerTest.java +++ b/l3/impl/src/test/java/io/fd/hc2vpp/l3/write/ipv6/Ipv6NeighbourCustomizerTest.java @@ -138,7 +138,8 @@ public class Ipv6NeighbourCustomizerTest extends WriterCustomizerTest implements Ip6Address ip6Address = new Ip6Address(); ip6Address.ip6Address = new byte[]{32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 1}; request.neighbor.ipAddress.un = new AddressUnion(ip6Address); - request.neighbor.flags = IpNeighborFlags.IP_API_NEIGHBOR_FLAG_STATIC; + request.neighbor.flags = new IpNeighborFlags(); + request.neighbor.flags.add(IpNeighborFlags.IpNeighborFlagsOptions.IP_API_NEIGHBOR_FLAG_STATIC); request.neighbor.swIfIndex = IFACE_ID; return request; } diff --git a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java index 00e34d3cc..5bfdbd49b 100644 --- a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java +++ b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/write/IpWriter.java @@ -148,7 +148,8 @@ public interface IpWriter extends ByteDataTranslator, AddressTranslator, JvppRep IpNeighborAddDel request = new IpNeighborAddDel(); request.neighbor = new IpNeighbor(); request.isAdd = ByteDataTranslator.INSTANCE.booleanToByte(add); - request.neighbor.flags = IpNeighborFlags.IP_API_NEIGHBOR_FLAG_STATIC; + request.neighbor.flags = new IpNeighborFlags(); + request.neighbor.flags.add(IpNeighborFlags.IpNeighborFlagsOptions.IP_API_NEIGHBOR_FLAG_STATIC); return request; } } -- cgit 1.2.3-korg