diff options
Diffstat (limited to 'ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write')
4 files changed, 33 insertions, 28 deletions
diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java index 6886b9b5d..dd7d34edb 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizer.java @@ -16,21 +16,21 @@ package io.fd.hc2vpp.ipsec.write; -import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; +import io.fd.hc2vpp.ipsec.FutureJVppIkev2Customizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.Ikev2SetLocalKey; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.ikev2.dto.Ikev2SetLocalKey; +import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.ikev2.IkeGlobalConfiguration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class Ikev2GlobalConfigurationCustomizer extends FutureJVppCustomizer +public class Ikev2GlobalConfigurationCustomizer extends FutureJVppIkev2Customizer implements WriterCustomizer<IkeGlobalConfiguration>, JvppReplyConsumer { - public Ikev2GlobalConfigurationCustomizer(final FutureJVppCore vppApi) { + public Ikev2GlobalConfigurationCustomizer(final FutureJVppIkev2Facade vppApi) { super(vppApi); } @@ -44,7 +44,7 @@ public class Ikev2GlobalConfigurationCustomizer extends FutureJVppCustomizer if (fileAUg.getLocalKeyFile() != null) { Ikev2SetLocalKey request = new Ikev2SetLocalKey(); request.keyFile = fileAUg.getLocalKeyFile().getBytes(); - getReplyForWrite(getFutureJVpp().ikev2SetLocalKey(request).toCompletableFuture(), id); + getReplyForWrite(getjVppIkev2Facade().ikev2SetLocalKey(request).toCompletableFuture(), id); } } } diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java index 6cb37329c..47a09c8b1 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java @@ -17,17 +17,17 @@ package io.fd.hc2vpp.ipsec.write; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; -import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; +import io.fd.hc2vpp.ipsec.FutureJVppIkev2Customizer; import io.fd.hc2vpp.ipsec.dto.AuthMethod; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.Ikev2ProfileAddDel; -import io.fd.vpp.jvpp.core.dto.Ikev2ProfileSetAuth; -import io.fd.vpp.jvpp.core.dto.Ikev2ProfileSetTs; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileAddDel; +import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetAuth; +import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetTs; +import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; import java.nio.ByteBuffer; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkev2PolicyAugmentation; @@ -38,10 +38,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev18 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.ikev2.policy.profile.grouping.Authentication; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class Ikev2PolicyCustomizer extends FutureJVppCustomizer +public class Ikev2PolicyCustomizer extends FutureJVppIkev2Customizer implements ListWriterCustomizer<Policy, PolicyKey>, JvppReplyConsumer, ByteDataTranslator, Ipv4Translator { - public Ikev2PolicyCustomizer(final FutureJVppCore vppApi) { + public Ikev2PolicyCustomizer(final FutureJVppIkev2Facade vppApi) { super(vppApi); } @@ -51,7 +51,7 @@ public class Ikev2PolicyCustomizer extends FutureJVppCustomizer final Ikev2ProfileAddDel request = new Ikev2ProfileAddDel(); request.isAdd = BYTE_TRUE; request.name = dataAfter.getName().getBytes(); - getReplyForWrite(getFutureJVpp().ikev2ProfileAddDel(request).toCompletableFuture(), id); + getReplyForWrite(getjVppIkev2Facade().ikev2ProfileAddDel(request).toCompletableFuture(), id); addAuthorization(dataAfter, id); addTrafficSelectors(dataAfter, id); } @@ -62,7 +62,7 @@ public class Ikev2PolicyCustomizer extends FutureJVppCustomizer final Ikev2ProfileAddDel request = new Ikev2ProfileAddDel(); request.isAdd = BYTE_FALSE; request.name = dataBefore.getName().getBytes(); - getReplyForWrite(getFutureJVpp().ikev2ProfileAddDel(request).toCompletableFuture(), id); + getReplyForWrite(getjVppIkev2Facade().ikev2ProfileAddDel(request).toCompletableFuture(), id); } @Override @@ -113,7 +113,7 @@ public class Ikev2PolicyCustomizer extends FutureJVppCustomizer if (dataAfter.getName() != null) { addTsRequest.name = dataAfter.getName().getBytes(); } - getReplyForWrite(getFutureJVpp().ikev2ProfileSetTs(addTsRequest).toCompletableFuture(), id); + getReplyForWrite(getjVppIkev2Facade().ikev2ProfileSetTs(addTsRequest).toCompletableFuture(), id); } } } @@ -141,7 +141,7 @@ public class Ikev2PolicyCustomizer extends FutureJVppCustomizer request.dataLen = request.data.length; request.isHex = BYTE_FALSE; request.authMethod = AuthMethod.RSA_SIG.getValue(); - getReplyForWrite(getFutureJVpp().ikev2ProfileSetAuth(request).toCompletableFuture(), id); + getReplyForWrite(getjVppIkev2Facade().ikev2ProfileSetAuth(request).toCompletableFuture(), id); } private void setProfilePreSharedKeyAuth(final String name, @@ -155,6 +155,6 @@ public class Ikev2PolicyCustomizer extends FutureJVppCustomizer request.data = preSharedKey.stringValue().getBytes(); request.dataLen = request.data.length; request.name = name.getBytes(); - getReplyForWrite(getFutureJVpp().ikev2ProfileSetAuth(request).toCompletableFuture(), id); + getReplyForWrite(getjVppIkev2Facade().ikev2ProfileSetAuth(request).toCompletableFuture(), id); } } diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java index f6b100c54..430aebc88 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java @@ -17,15 +17,15 @@ package io.fd.hc2vpp.ipsec.write; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; -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.ipsec.FutureJVppIkev2Customizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.Ikev2ProfileSetId; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.ikev2.dto.Ikev2ProfileSetId; +import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.identity.grouping.identity.FqdnString; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.identity.grouping.identity.Ipv4Address; @@ -35,10 +35,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev18 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.ikev2.Policy; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class Ikev2PolicyIdentityCustomizer extends FutureJVppCustomizer +public class Ikev2PolicyIdentityCustomizer extends FutureJVppIkev2Customizer implements WriterCustomizer<Identity>, JvppReplyConsumer, ByteDataTranslator, Ipv4Translator, Ipv6Translator { - public Ikev2PolicyIdentityCustomizer(final FutureJVppCore vppApi) { + public Ikev2PolicyIdentityCustomizer(final FutureJVppIkev2Facade vppApi) { super(vppApi); } @@ -74,7 +74,7 @@ public class Ikev2PolicyIdentityCustomizer extends FutureJVppCustomizer request.isLocal = isLocalId ? BYTE_TRUE : BYTE_FALSE; - getReplyForWrite(getFutureJVpp().ikev2ProfileSetId(request).toCompletableFuture(), id); + getReplyForWrite(getjVppIkev2Facade().ikev2ProfileSetId(request).toCompletableFuture(), id); } private void transformIdentityToRequest( diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java index 8b164ac74..4dc7ff1b0 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecWriterFactory.java @@ -24,6 +24,7 @@ import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkev2PolicyAugmentation; @@ -67,11 +68,15 @@ public final class IpsecWriterFactory implements WriterFactory { private static final InstanceIdentifier<Spd> SPD_ID = IPSEC_ID.child(Spd.class); private final FutureJVppCore vppApi; + private final FutureJVppIkev2Facade vppIkev2Api; private MultiNamingContext sadEntriesMapping; @Inject - public IpsecWriterFactory(final FutureJVppCore vppApi, final MultiNamingContext sadEntriesMappingContext) { + public IpsecWriterFactory(final FutureJVppCore vppApi, + final FutureJVppIkev2Facade vppIkev2Api, + final MultiNamingContext sadEntriesMappingContext) { this.vppApi = vppApi; + this.vppIkev2Api = vppIkev2Api; this.sadEntriesMapping = sadEntriesMappingContext; } @@ -104,16 +109,16 @@ public final class IpsecWriterFactory implements WriterFactory { registry.subtreeAdd(Sets.newHashSet(InstanceIdentifier.create(IkeGlobalConfiguration.class) .augmentation(IpsecIkeGlobalConfAugmentation.class)), new GenericWriter<>(IKE2_ID.child(IkeGlobalConfiguration.class), - new Ikev2GlobalConfigurationCustomizer(vppApi))); + new Ikev2GlobalConfigurationCustomizer(vppIkev2Api))); registry.subtreeAdd(Sets.newHashSet(InstanceIdentifier.create(Policy.class).child( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.ikev2.policy.profile.grouping.Authentication.class), InstanceIdentifier.create(Policy.class).augmentation(IpsecIkev2PolicyAugmentation.class), InstanceIdentifier.create(Policy.class).augmentation(IpsecIkev2PolicyAugmentation.class) .child(TrafficSelectors.class)), - new GenericListWriter<>(IKE2_ID.child(Policy.class), new Ikev2PolicyCustomizer(vppApi))); + new GenericListWriter<>(IKE2_ID.child(Policy.class), new Ikev2PolicyCustomizer(vppIkev2Api))); registry.subtreeAdd(Sets.newHashSet(InstanceIdentifier.create(Identity.class).child(Local.class), InstanceIdentifier.create(Identity.class).child(Remote.class)), new GenericWriter<>(IKE2_ID.child(Policy.class).child(Identity.class), - new Ikev2PolicyIdentityCustomizer(vppApi))); + new Ikev2PolicyIdentityCustomizer(vppIkev2Api))); } } |