1 files changed, 4 insertions, 8 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