From 0ce0fa21ea0ae4f6e2b56546a8275901f9cf8196 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 5 Aug 2016 14:49:14 +0200 Subject: HONEYCOMB-117: add support for jvpp plugins Change-Id: I9f1dd5562b13a37392ce92b170a466c48d61bcc5 Signed-off-by: Marek Gradzki --- .../v3po/interfacesstate/ip/Ipv4AddressCustomizer.java | 10 +++++----- .../v3po/interfacesstate/ip/Ipv4Customizer.java | 6 +++--- .../v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java | 6 +++--- .../translate/v3po/interfacesstate/ip/Ipv4ReadUtils.java | 16 ++++++++-------- .../v3po/interfacesstate/ip/Ipv6Customizer.java | 6 +++--- .../ip/SubInterfaceIpv4AddressCustomizer.java | 10 +++++----- 6 files changed, 27 insertions(+), 27 deletions(-) (limited to 'v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java index b4b656c52..f3605ca0f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java @@ -39,9 +39,9 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev14061 import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.dto.IpAddressDetails; -import org.openvpp.jvpp.dto.IpAddressDetailsReplyDump; -import org.openvpp.jvpp.future.FutureJVpp; +import org.openvpp.jvpp.core.dto.IpAddressDetails; +import org.openvpp.jvpp.core.dto.IpAddressDetailsReplyDump; +import org.openvpp.jvpp.core.future.FutureJVppCore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,8 +55,8 @@ public class Ipv4AddressCustomizer extends FutureJVppCustomizer private final NamingContext interfaceContext; - public Ipv4AddressCustomizer(@Nonnull final FutureJVpp futureJvpp, @Nonnull final NamingContext interfaceContext) { - super(futureJvpp); + public Ipv4AddressCustomizer(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull final NamingContext interfaceContext) { + super(futureJVppCore); this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null"); } diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java index 6b890f343..73e1c7047 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java @@ -27,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev14061 import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.future.FutureJVpp; +import org.openvpp.jvpp.core.future.FutureJVppCore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,8 +35,8 @@ public class Ipv4Customizer extends FutureJVppCustomizer implements ReaderCustom private static final Logger LOG = LoggerFactory.getLogger(Ipv4Customizer.class); - public Ipv4Customizer(@Nonnull final FutureJVpp futureJvpp) { - super(futureJvpp); + public Ipv4Customizer(@Nonnull final FutureJVppCore futureJVppCore) { + super(futureJVppCore); } @Override diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java index 3b04c5614..05b5ef47c 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4NeighbourCustomizer.java @@ -29,7 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev14061 import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.future.FutureJVpp; +import org.openvpp.jvpp.core.future.FutureJVppCore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,8 +42,8 @@ public class Ipv4NeighbourCustomizer extends FutureJVppCustomizer private static final Logger LOG = LoggerFactory.getLogger(Ipv4NeighbourCustomizer.class); - public Ipv4NeighbourCustomizer(FutureJVpp futureJvpp) { - super(futureJvpp); + public Ipv4NeighbourCustomizer(FutureJVppCore futureJVppCore) { + super(futureJVppCore); } @Override diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4ReadUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4ReadUtils.java index 56ad73c9b..1ccae0aed 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4ReadUtils.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4ReadUtils.java @@ -34,10 +34,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yangtools.yang.binding.Identifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.openvpp.jvpp.VppBaseCallException; -import org.openvpp.jvpp.dto.IpAddressDetails; -import org.openvpp.jvpp.dto.IpAddressDetailsReplyDump; -import org.openvpp.jvpp.dto.IpAddressDump; -import org.openvpp.jvpp.future.FutureJVpp; +import org.openvpp.jvpp.core.dto.IpAddressDetails; +import org.openvpp.jvpp.core.dto.IpAddressDetailsReplyDump; +import org.openvpp.jvpp.core.dto.IpAddressDump; +import org.openvpp.jvpp.core.future.FutureJVppCore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ final class Ipv4ReadUtils { // Many VPP APIs do not provide get operation for single item. Dump requests for all items are used instead. // To improve HC performance, caching dump requests is a common pattern. // TODO: use more generic caching implementation, once provided - static Optional dumpAddresses(@Nonnull final FutureJVpp futureJvpp, + static Optional dumpAddresses(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull final InstanceIdentifier id, @Nonnull final String interfaceName, final int interfaceIndex, @Nonnull final ReadContext ctx) @@ -71,7 +71,7 @@ final class Ipv4ReadUtils { Optional dumpFromOperational; try { - dumpFromOperational = dumpAddressFromOperationalData(futureJvpp, id, interfaceIndex); + dumpFromOperational = dumpAddressFromOperationalData(futureJVppCore, id, interfaceIndex); } catch (VppBaseCallException e) { throw new ReadFailedException(id, e); } @@ -90,14 +90,14 @@ final class Ipv4ReadUtils { } private static Optional dumpAddressFromOperationalData( - @Nonnull final FutureJVpp futureJvpp, @Nonnull final InstanceIdentifier id, final int interfaceIndex) + @Nonnull final FutureJVppCore futureJVppCore, @Nonnull final InstanceIdentifier id, final int interfaceIndex) throws VppBaseCallException, ReadTimeoutException { LOG.debug("Dumping Ipv4 addresses for interface id={}", interfaceIndex); final IpAddressDump dumpRequest = new IpAddressDump(); dumpRequest.isIpv6 = 0; dumpRequest.swIfIndex = interfaceIndex; return Optional.fromNullable( - TranslateUtils.getReplyForRead(futureJvpp.ipAddressDump(dumpRequest).toCompletableFuture(), id)); + TranslateUtils.getReplyForRead(futureJVppCore.ipAddressDump(dumpRequest).toCompletableFuture(), id)); } @Nonnull static List getAllIpv4AddressIds( diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv6Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv6Customizer.java index b71cca0bb..1bcc81517 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv6Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv6Customizer.java @@ -27,14 +27,14 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev14061 import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.future.FutureJVpp; +import org.openvpp.jvpp.core.future.FutureJVppCore; public class Ipv6Customizer extends FutureJVppCustomizer implements ReaderCustomizer { private final NamingContext interfaceContext; - public Ipv6Customizer(@Nonnull final FutureJVpp futureJvpp, final NamingContext interfaceContext) { - super(futureJvpp); + public Ipv6Customizer(@Nonnull final FutureJVppCore futureJVppCore, final NamingContext interfaceContext) { + super(futureJVppCore); this.interfaceContext = interfaceContext; } diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java index c5fa6ee8e..e1f306140 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/SubInterfaceIpv4AddressCustomizer.java @@ -41,9 +41,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.openvpp.jvpp.dto.IpAddressDetails; -import org.openvpp.jvpp.dto.IpAddressDetailsReplyDump; -import org.openvpp.jvpp.future.FutureJVpp; +import org.openvpp.jvpp.core.dto.IpAddressDetails; +import org.openvpp.jvpp.core.dto.IpAddressDetailsReplyDump; +import org.openvpp.jvpp.core.future.FutureJVppCore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,9 +57,9 @@ public class SubInterfaceIpv4AddressCustomizer extends FutureJVppCustomizer private final NamingContext interfaceContext; - public SubInterfaceIpv4AddressCustomizer(@Nonnull final FutureJVpp futureJvpp, + public SubInterfaceIpv4AddressCustomizer(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull final NamingContext interfaceContext) { - super(futureJvpp); + super(futureJVppCore); this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null"); } -- cgit 1.2.3-korg