diff options
author | Tibor Král <tibor.kral@pantheon.tech> | 2019-04-02 11:39:54 +0200 |
---|---|---|
committer | Tibor Král <tibor.kral@pantheon.tech> | 2019-04-02 11:39:54 +0200 |
commit | 89eeb336aebc92cd34c27b3fa325803c6478a461 (patch) | |
tree | f5ed058eb6776990e3d1139ae57a88995e487d54 /ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java | |
parent | 25296ac131f1ad42f826911210db6041a50b4dd0 (diff) |
Remove naming context from Ipsec writer
Change-Id: I0c0f032c1b2b1aa273514453f044c52dae66c1ab
Signed-off-by: Tibor Král <tibor.kral@pantheon.tech>
Diffstat (limited to 'ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java')
-rw-r--r-- | ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java | 15 |
1 files changed, 2 insertions, 13 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 c1e21ed7a..b4d4957ea 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 @@ -21,7 +21,6 @@ import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.Ipv6Translator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.hc2vpp.common.translate.util.MultiNamingContext; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; @@ -62,11 +61,9 @@ public class IpsecSadEntryCustomizer extends FutureJVppCustomizer JvppReplyConsumer, ByteDataTranslator, Ipv6Translator, Ipv4Translator { private static final Logger LOG = LoggerFactory.getLogger(IpsecSadEntryCustomizer.class); - private MultiNamingContext sadEntryMapping; - IpsecSadEntryCustomizer(final FutureJVppCore vppApi, final MultiNamingContext sadEntryMapping) { + IpsecSadEntryCustomizer(final FutureJVppCore vppApi) { super(vppApi); - this.sadEntryMapping = sadEntryMapping; } @Override @@ -136,14 +133,6 @@ public class IpsecSadEntryCustomizer extends FutureJVppCustomizer final CompletionStage<IpsecSadEntryAddDelReply> ipsecSadEntryAddDellReplyFuture = getFutureJVpp().ipsecSadEntryAddDel(request); getReplyForWrite(ipsecSadEntryAddDellReplyFuture.toCompletableFuture(), id); - if (adding) { - sadEntryMapping.addChild(dataAfter.key().getDirection().getName(), request.entry.sadId, - String.valueOf(dataAfter.key().getSpi()), writeContext.getMappingContext()); - } else { - sadEntryMapping - .removeChild(dataAfter.key().getDirection().getName(), String.valueOf(dataAfter.key().getSpi()), - writeContext.getMappingContext()); - } } private void fillAhAuthentication(IpsecSadEntryAddDel request, Ah data) { @@ -170,7 +159,7 @@ public class IpsecSadEntryCustomizer extends FutureJVppCustomizer request.entry.integrityKey.length = (byte) integKey.getBytes().length; request.entry.cryptoKey = new Key(); request.entry.cryptoKey.data = null; - request.entry.cryptoKey.length = 0 ; + request.entry.cryptoKey.length = 0; } } |