From 7e90b6c5f8a605470dd388bf3c31d9f5beb2724c Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 23 Aug 2017 16:19:41 +0200 Subject: DumpCacheManager: make dumpParams optional Requires https://gerrit.fd.io/r/#/c/8185/ Change-Id: Ib2d529366bd3cf6bb292014026ab8053a19c0ed7 Signed-off-by: Marek Gradzki --- .../main/java/io/fd/hc2vpp/acl/read/VppMacIpAclCustomizer.java | 3 +-- .../src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java | 7 ++----- .../main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java | 3 +-- .../hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java | 3 +-- .../gpe/translate/read/NativeForwardPathsTableCustomizer.java | 6 ++---- .../lisp/gpe/translate/service/GpeStateCheckServiceImpl.java | 3 +-- .../hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java | 5 +---- .../io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java | 4 +--- .../io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java | 6 ++---- .../io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java | 8 ++------ .../io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java | 6 ++---- .../java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java | 5 ++--- .../hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java | 3 +-- .../main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java | 8 ++++---- .../main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java | 8 ++++---- .../main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java | 4 ++-- .../main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java | 4 ++-- .../io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java | 6 +++--- .../main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java | 6 ++---- .../main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java | 6 ++---- .../java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java | 6 ++---- .../fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java | 3 +-- .../java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java | 3 +-- .../io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java | 3 +-- .../v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java | 3 +-- .../main/java/io/fd/hc2vpp/policer/read/PolicerCustomizer.java | 6 ++---- 26 files changed, 46 insertions(+), 82 deletions(-) diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppMacIpAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppMacIpAclCustomizer.java index 8a7eb5e17..0ae05826c 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppMacIpAclCustomizer.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppMacIpAclCustomizer.java @@ -17,7 +17,6 @@ package io.fd.hc2vpp.acl.read; import static io.fd.hc2vpp.acl.read.AbstractVppAclCustomizer.getAclCfgId; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; @@ -120,7 +119,7 @@ public class VppMacIpAclCustomizer extends FutureJVppAclCustomizer final int interfaceIndex = interfaceContext.getIndex(interfaceName, mappingContext); final ModificationCache modificationCache = ctx.getModificationCache(); final Optional interfacesMacIpDumpReply = - interfaceMacIpAclDumpManager.getDump(id, modificationCache, NO_PARAMS); + interfaceMacIpAclDumpManager.getDump(id, modificationCache); if (interfacesMacIpDumpReply.isPresent() && interfaceIndex < interfacesMacIpDumpReply.get().count) { final int aclIndex = interfacesMacIpDumpReply.get().acls[interfaceIndex]; diff --git a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java index 875b93933..8565e10a2 100644 --- a/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java +++ b/dhcp/dhcp-impl/src/main/java/io/fd/hc2vpp/dhcp/read/DhcpRelayCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.dhcp.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import com.google.common.primitives.UnsignedInts; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; @@ -89,7 +87,7 @@ final class DhcpRelayCustomizer extends FutureJVppCustomizer Collections.emptyList(); final Optional dump = - dumpManager.getDump(id, context.getModificationCache(), NO_PARAMS); + dumpManager.getDump(id, context.getModificationCache()); if (!dump.isPresent() || dump.get().dhcpProxyDetails.isEmpty()) { return Collections.emptyList(); @@ -115,8 +113,7 @@ final class DhcpRelayCustomizer extends FutureJVppCustomizer @Override public void readCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final RelayBuilder builder, @Nonnull final ReadContext ctx) throws ReadFailedException { - final Optional dump = - dumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS); + final Optional dump = dumpManager.getDump(id, ctx.getModificationCache()); if (!dump.isPresent() || dump.get().dhcpProxyDetails.isEmpty()) { return; diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java index 5c5dbc4b8..7533ecf2f 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/nd/NdProxyCustomizer.java @@ -17,7 +17,6 @@ package io.fd.hc2vpp.l3.read.ipv6.nd; import static com.google.common.base.Preconditions.checkNotNull; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; @@ -81,7 +80,7 @@ public final class NdProxyCustomizer extends FutureJVppCustomizer final int swIfIndex = interfaceContext.getIndex(interfaceName, context.getMappingContext()); LOG.debug("Reading NDProxies for interface {}(id={})", interfaceName, swIfIndex); final Optional dump = - dumpManager.getDump(id, context.getModificationCache(), NO_PARAMS); + dumpManager.getDump(id, context.getModificationCache()); if (!dump.isPresent() || dump.get().ip6NdProxyDetails.isEmpty()) { return Collections.emptyList(); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java index 1f2b4e921..958833d14 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java @@ -16,7 +16,6 @@ package io.fd.hc2vpp.lisp.gpe.translate.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import static java.lang.String.format; import com.google.common.base.Optional; @@ -245,7 +244,7 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer private Stream activeVnis(final InstanceIdentifier id, final ModificationCache cache) throws ReadFailedException { - final int[] vnis = activeVnisDumpManager.getDump(id, cache, NO_PARAMS).or(() -> { + final int[] vnis = activeVnisDumpManager.getDump(id, cache).or(() -> { final GpeFwdEntryVnisGetReply reply = new GpeFwdEntryVnisGetReply(); reply.vnis = new int[0]; return reply; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java index d787592dd..07bc32f4a 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.lisp.gpe.translate.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.primitives.UnsignedInts; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -145,7 +143,7 @@ public class NativeForwardPathsTableCustomizer extends FutureJVppCustomizer impl private Stream v4FibsStream(final InstanceIdentifier id, final ReadContext ctx) throws ReadFailedException { - return dumpCacheManagerV4.getDump(id, ctx.getModificationCache(), NO_PARAMS).or(DEFAULT_REPLY_V4) + return dumpCacheManagerV4.getDump(id, ctx.getModificationCache()).or(DEFAULT_REPLY_V4) .ipFibDetails.stream() .map(ipFibDetails -> ipFibDetails.tableId); } @@ -153,7 +151,7 @@ public class NativeForwardPathsTableCustomizer extends FutureJVppCustomizer impl private Stream v6FibsStream(final InstanceIdentifier id, final ReadContext ctx) throws ReadFailedException { - return dumpCacheManagerV6.getDump(id, ctx.getModificationCache(), NO_PARAMS).or(DEFAULT_REPLY_V6) + return dumpCacheManagerV6.getDump(id, ctx.getModificationCache()).or(DEFAULT_REPLY_V6) .ip6FibDetails.stream() .map(ip6FibDetails -> ip6FibDetails.tableId); } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java index 8d45f2387..cfdc0835c 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java @@ -17,7 +17,6 @@ package io.fd.hc2vpp.lisp.gpe.translate.service; import static com.google.common.base.Preconditions.checkState; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; @@ -73,7 +72,7 @@ public final class GpeStateCheckServiceImpl implements GpeStateCheckService, Jvp public boolean isGpeEnabled(@Nonnull final ReadContext readContext) { try { return byteToBoolean( - dumpCacheManager.getDump(GPE_FEATURE_STATE_ID, readContext.getModificationCache(), NO_PARAMS) + dumpCacheManager.getDump(GPE_FEATURE_STATE_ID, readContext.getModificationCache()) .or(DEFAULT_REPLY).gpeStatus); } catch (ReadFailedException e) { throw new IllegalStateException("Unable to read Gpe feature status", e); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java index 2cb85bb58..37adcff7c 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizer.java @@ -17,8 +17,6 @@ package io.fd.hc2vpp.lisp.translate.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -79,8 +77,7 @@ public class ItrRemoteLocatorSetCustomizer extends CheckedLispCustomizer return; } - final Optional reply = - dumpCacheManager.getDump(id, ctx.getModificationCache(), NO_PARAMS); + final Optional reply = dumpCacheManager.getDump(id, ctx.getModificationCache()); if (!reply.isPresent() || reply.get().locatorSetName == null) { return; } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java index 68ab8958d..d43d6f700 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizer.java @@ -17,8 +17,6 @@ package io.fd.hc2vpp.lisp.translate.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; @@ -103,7 +101,7 @@ public class LispStateCustomizer extends FutureJVppCustomizer */ final Optional dumpOptional; try { - dumpOptional = dumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS); + dumpOptional = dumpManager.getDump(id, ctx.getModificationCache()); } catch (ReadFailedException e) { throw new IllegalStateException("Unable to initialize locator set context mapping", e); } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java index 7a6723f65..d210e07d4 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/LocatorSetCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.lisp.translate.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.lisp.translate.read.init.LispInitPathsMapper; @@ -79,7 +77,7 @@ public class LocatorSetCustomizer extends CheckedLispCustomizer LOG.debug("Reading attributes for Locator Set {}", id); final Optional dumpOptional = - dumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS); + dumpManager.getDump(id, ctx.getModificationCache()); if (!dumpOptional.isPresent() || dumpOptional.get().oneLocatorSetDetails.isEmpty()) { return; @@ -113,7 +111,7 @@ public class LocatorSetCustomizer extends CheckedLispCustomizer LOG.debug("Dumping Locator Set {}", id); final Optional dumpOptional = - dumpManager.getDump(id, context.getModificationCache(), NO_PARAMS); + dumpManager.getDump(id, context.getModificationCache()); if (!dumpOptional.isPresent() || dumpOptional.get().oneLocatorSetDetails.isEmpty()) { return Collections.emptyList(); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java index 290540a36..2958e99d9 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.lisp.translate.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -34,12 +32,10 @@ import io.fd.vpp.jvpp.core.dto.OneMapResolverDetails; import io.fd.vpp.jvpp.core.dto.OneMapResolverDetailsReplyDump; import io.fd.vpp.jvpp.core.dto.OneMapResolverDump; import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170808.map.resolvers.grouping.MapResolvers; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170808.map.resolvers.grouping.MapResolversBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170808.map.resolvers.grouping.map.resolvers.MapResolver; @@ -86,7 +82,7 @@ public class MapResolverCustomizer extends CheckedLispCustomizer LOG.debug("Reading attributes..."); final Optional dumpOptional = - dumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS); + dumpManager.getDump(id, ctx.getModificationCache()); if (!dumpOptional.isPresent() || dumpOptional.get().oneMapResolverDetails.isEmpty()) { LOG.warn("No data dumped"); @@ -115,7 +111,7 @@ public class MapResolverCustomizer extends CheckedLispCustomizer LOG.debug("Dumping MapResolver..."); final Optional dumpOptional = - dumpManager.getDump(id, context.getModificationCache(), NO_PARAMS); + dumpManager.getDump(id, context.getModificationCache()); if (!dumpOptional.isPresent() || dumpOptional.get().oneMapResolverDetails.isEmpty()) { return Collections.emptyList(); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java index 16c01628c..0fa81f955 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapServerCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.lisp.translate.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -95,7 +93,7 @@ public class MapServerCustomizer extends CheckedLispCustomizer } final Optional dump = - dumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS); + dumpManager.getDump(instanceIdentifier, readContext.getModificationCache()); if (dump.isPresent() && dump.get().oneMapServerDetails != null) { return dump.get().oneMapServerDetails.stream() @@ -127,7 +125,7 @@ public class MapServerCustomizer extends CheckedLispCustomizer return; } final Optional dump = - dumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS); + dumpManager.getDump(instanceIdentifier, readContext.getModificationCache()); if (dump.isPresent() && dump.get().oneMapServerDetails != null) { final IpAddress currentAddress = instanceIdentifier.firstKeyOf(MapServer.class).getIpAddress(); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java index cbd1ab91f..848dfbc47 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/VniTableCustomizer.java @@ -17,7 +17,6 @@ package io.fd.hc2vpp.lisp.translate.read; import static com.google.common.base.Preconditions.checkState; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -99,7 +98,7 @@ public class VniTableCustomizer extends CheckedLispCustomizer LOG.trace("Reading all IDS..."); final Optional optionalReply = - dumpManager.getDump(id, context.getModificationCache(), NO_PARAMS); + dumpManager.getDump(id, context.getModificationCache()); if (!optionalReply.isPresent() || optionalReply.get().oneEidTableVniDetails.isEmpty()) { return Collections.emptyList(); @@ -122,7 +121,7 @@ public class VniTableCustomizer extends CheckedLispCustomizer VniTableKey key = new VniTableKey(id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier()); final Optional optionalReply = - dumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS); + dumpManager.getDump(id, ctx.getModificationCache()); if (!optionalReply.isPresent() || optionalReply.get().oneEidTableVniDetails.isEmpty()) { return; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java index b63bc0b47..daf41d62c 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImpl.java @@ -17,7 +17,6 @@ package io.fd.hc2vpp.lisp.translate.service; import static com.google.common.base.Preconditions.checkState; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; @@ -69,7 +68,7 @@ public final class LispStateCheckServiceImpl implements LispStateCheckService, J public boolean lispEnabled(@Nonnull final ReadContext ctx) { // in this case it must be dumped try { - return byteToBoolean(dumpManager.getDump(IDENTIFIER, ctx.getModificationCache(), NO_PARAMS) + return byteToBoolean(dumpManager.getDump(IDENTIFIER, ctx.getModificationCache()) .or(DEFAULT_REPLY).featureStatus); } catch (ReadFailedException e) { throw new IllegalStateException("Unable to read Lisp Feature status", e); diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java index 0fd149e5a..77b5b2cf6 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java @@ -99,7 +99,7 @@ final class ExternalIpPoolCustomizer implements final Long poolId = id.firstKeyOf(ExternalIpAddressPool.class).getPoolId(); final List nat44Details = - nat44DumpMgr.getDump(id, ctx.getModificationCache(), null) + nat44DumpMgr.getDump(id, ctx.getModificationCache()) .or(new Nat44AddressDetailsReplyDump()).nat44AddressDetails; final int nat44PoolCount = nat44Details.size(); @@ -109,7 +109,7 @@ final class ExternalIpPoolCustomizer implements readPoolIp(builder, detail.ipAddress); setPoolType(builder, NatPoolType.Nat44); } else { - final List nat64Details = nat64DumpMgr.getDump(id, ctx.getModificationCache(), null) + final List nat64Details = nat64DumpMgr.getDump(id, ctx.getModificationCache()) .or(new Nat64PoolAddrDetailsReplyDump()).nat64PoolAddrDetails; final int nat64PoolCount = nat64Details.size(); final int nat64PoolPosition = Math.toIntExact(poolId) - nat44PoolCount; @@ -152,14 +152,14 @@ final class ExternalIpPoolCustomizer implements // That's why the write and read is not symmetrical in terms of data structure, instead, // this customizer also returns every single address as a 32 prefix and assigns an artificial key to them - long addressCount = nat44DumpMgr.getDump(id, ctx.getModificationCache(), null) + long addressCount = nat44DumpMgr.getDump(id, ctx.getModificationCache()) .or(new Nat44AddressDetailsReplyDump()).nat44AddressDetails.stream() .count(); // The ietf-nat model groups address pools for Nat44 and Nat64 under the same list, // but VPP uses different APIs, so we need an other dump: - addressCount += nat64DumpMgr.getDump(id, ctx.getModificationCache(), null) + addressCount += nat64DumpMgr.getDump(id, ctx.getModificationCache()) .or(new Nat64PoolAddrDetailsReplyDump()).nat64PoolAddrDetails.stream() .count(); diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java index 8f22b756f..a3874482f 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizer.java @@ -88,7 +88,7 @@ final class MappingEntryCustomizer implements Ipv4Translator, Ipv6Translator, final int idx = id.firstKeyOf(MappingEntry.class).getIndex().intValue(); final int natInstanceId = id.firstKeyOf(NatInstance.class).getId().intValue(); final List nat44Details = - nat44DumpManager.getDump(id, ctx.getModificationCache(), null) + nat44DumpManager.getDump(id, ctx.getModificationCache()) .or(new Nat44StaticMappingDetailsReplyDump()).nat44StaticMappingDetails; final Optional nat44StaticMappingDetails = mappingEntryContext.findDetailsNat44(nat44Details, natInstanceId, idx, ctx.getMappingContext()); @@ -97,7 +97,7 @@ final class MappingEntryCustomizer implements Ipv4Translator, Ipv6Translator, readNat44Entry(builder, idx, nat44StaticMappingDetails.get()); } else { final List nat64Details = - nat64DumpManager.getDump(id, ctx.getModificationCache(), null) + nat64DumpManager.getDump(id, ctx.getModificationCache()) .or(new Nat64BibDetailsReplyDump()).nat64BibDetails; final Optional nat64StaticMappingDetails = @@ -169,7 +169,7 @@ final class MappingEntryCustomizer implements Ipv4Translator, Ipv6Translator, LOG.trace("Listing IDs for all mapping-entries within nat-instance(vrf):{}", natInstanceId); final List entryKeys = - nat44DumpManager.getDump(id, context.getModificationCache(), null) + nat44DumpManager.getDump(id, context.getModificationCache()) .or(new Nat44StaticMappingDetailsReplyDump()).nat44StaticMappingDetails.stream() .filter(detail -> natInstanceId == detail.vrfId) .map(detail -> mappingEntryContext @@ -179,7 +179,7 @@ final class MappingEntryCustomizer implements Ipv4Translator, Ipv6Translator, final List nat64Keys = - nat64DumpManager.getDump(id, context.getModificationCache(), null) + nat64DumpManager.getDump(id, context.getModificationCache()) .or(new Nat64BibDetailsReplyDump()).nat64BibDetails.stream() .filter(detail -> natInstanceId == detail.vrfId) .map(detail -> mappingEntryContext diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java index badc6e9bd..f3997dc79 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/Nat64PrefixesCustomizer.java @@ -74,7 +74,7 @@ final class Nat64PrefixesCustomizer LOG.trace("Listing IDs for all nat64 prefixes within nat-instance(vrf): {}", natKey); final Map prefixesByVrfId = - dumpManager.getDump(id, context.getModificationCache(), null).get(); + dumpManager.getDump(id, context.getModificationCache()).get(); final Nat64PrefixDetails nat64PrefixDetails = prefixesByVrfId.get(natKey.getId()); if (nat64PrefixDetails != null) { // VPP supports only single nat64-prefix per VRF/nat-instance (we map nat-instances to VRFs) @@ -108,7 +108,7 @@ final class Nat64PrefixesCustomizer return; } final Map prefixesByVrfId = - dumpManager.getDump(id, context.getModificationCache(), null).get(); + dumpManager.getDump(id, context.getModificationCache()).get(); final Nat64PrefixDetails prefixDetails = prefixesByVrfId.get(id.firstKeyOf(NatInstance.class).getId()); if (prefixDetails != null) { builder.setNat64PrefixId(prefixId); diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java index 8468289da..926c6e95f 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizer.java @@ -79,10 +79,10 @@ final class NatInstanceCustomizer // Find the nat instance IDs (vrf-ids) by listing all static mappings and their VRF assignment final List vrfIds = Stream.concat( - nat44DumpManager.getDump(id, context.getModificationCache(), null) + nat44DumpManager.getDump(id, context.getModificationCache()) .or(new Nat44StaticMappingDetailsReplyDump()).nat44StaticMappingDetails.stream() .map(detail -> detail.vrfId), - nat64DumpManager.getDump(id, context.getModificationCache(), null) + nat64DumpManager.getDump(id, context.getModificationCache()) .or(new Nat64BibDetailsReplyDump()).nat64BibDetails.stream() .map(detail -> detail.vrfId)) // V4 (nat44) and V6 (nat64) VRFs in VPP can have the same id. We store them under single nat instance, diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java index 3ef2035e4..6225851e6 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java @@ -93,7 +93,7 @@ abstract class AbstractInterfaceNatCustomizer id, final int index, final B builder, final ReadContext ctx) throws ReadFailedException { final Optional dump = - preRoutingNat44DumpMgr.getDump(id, ctx.getModificationCache(), null); + preRoutingNat44DumpMgr.getDump(id, ctx.getModificationCache()); dump.or(new Nat44InterfaceDetailsReplyDump()).nat44InterfaceDetails.stream() .filter(natIfcDetail -> natIfcDetail.swIfIndex == index) @@ -106,7 +106,7 @@ abstract class AbstractInterfaceNatCustomizer id, final int index, final B builder, final ReadContext ctx) throws ReadFailedException { final Optional dump = - preRoutingNat64DumpMgr.getDump(id, ctx.getModificationCache(), null); + preRoutingNat64DumpMgr.getDump(id, ctx.getModificationCache()); dump.or(new Nat64InterfaceDetailsReplyDump()).nat64InterfaceDetails.stream() .filter(natIfcDetail -> natIfcDetail.swIfIndex == index) @@ -119,7 +119,7 @@ abstract class AbstractInterfaceNatCustomizer id, final int index, final B builder, final ReadContext ctx) throws ReadFailedException { final Optional dump = - postRoutingNat44DumpMgr.getDump(id, ctx.getModificationCache(), null); + postRoutingNat44DumpMgr.getDump(id, ctx.getModificationCache()); dump.or(new Nat44InterfaceOutputFeatureDetailsReplyDump()).nat44InterfaceOutputFeatureDetails .stream() diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java index 71758b4fe..aa451e241 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.routing.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.MultiNamingContext; import io.fd.hc2vpp.common.translate.util.NamingContext; @@ -81,7 +79,7 @@ public class Ipv4RouteCustomizer @Nonnull final ReadContext readContext) throws ReadFailedException { final Optional ipv4RoutesDump = - ipv4RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS); + ipv4RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache()); final String protocolName = instanceIdentifier.firstKeyOf(RoutingProtocol.class).getName(); final int protocolTableId = routingProtocolContext.getIndex(protocolName, readContext.getMappingContext()); @@ -136,7 +134,7 @@ public class Ipv4RouteCustomizer final String protocolName = instanceIdentifier.firstKeyOf(RoutingProtocol.class).getName(); final int protocolTableId = routingProtocolContext.getIndex(protocolName, readContext.getMappingContext()); final Optional ipv4RoutesDump = - ipv4RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS); + ipv4RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache()); if (ipv4RoutesDump.isPresent() && !ipv4RoutesDump.get().ipFibDetails.isEmpty()) { diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java index c83891d85..219c29951 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.routing.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.MultiNamingContext; import io.fd.hc2vpp.common.translate.util.NamingContext; @@ -79,7 +77,7 @@ public class Ipv6RouteCustomizer @Nonnull final ReadContext readContext) throws ReadFailedException { final Optional ipv6RoutesDump = - ipv6RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS); + ipv6RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache()); final String protocolName = instanceIdentifier.firstKeyOf(RoutingProtocol.class).getName(); final int protocolTableId = routingProtocolContext.getIndex(protocolName, readContext.getMappingContext()); @@ -133,7 +131,7 @@ public class Ipv6RouteCustomizer final String protocolName = instanceIdentifier.firstKeyOf(RoutingProtocol.class).getName(); final int protocolTableId = routingProtocolContext.getIndex(protocolName, readContext.getMappingContext()); final Optional ipv6RoutesDump = - ipv6RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache(), NO_PARAMS); + ipv6RoutesDumpManager.getDump(instanceIdentifier, readContext.getModificationCache()); if (ipv6RoutesDump.isPresent() && !ipv6RoutesDump.get().ip6FibDetails.isEmpty()) { diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java index c8a379b83..e33d1448d 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/RoutingProtocolCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.routing.read; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; - import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.routing.trait.RouteMapper; @@ -85,7 +83,7 @@ public class RoutingProtocolCustomizer private List ipv4TableIds(final InstanceIdentifier instanceIdentifier, final ModificationCache modificationCache) throws ReadFailedException { final Optional - ipv4Routes = ipv4RoutesDumpManager.getDump(instanceIdentifier, modificationCache, NO_PARAMS); + ipv4Routes = ipv4RoutesDumpManager.getDump(instanceIdentifier, modificationCache); if (ipv4Routes.isPresent()) { return ipv4Routes.get().ipFibDetails.stream() @@ -98,7 +96,7 @@ public class RoutingProtocolCustomizer private List ipv6TableIds(final InstanceIdentifier instanceIdentifier, final ModificationCache modificationCache) throws ReadFailedException { final Optional - ipv6Routes = ipv6RoutesDumpManager.getDump(instanceIdentifier, modificationCache, NO_PARAMS); + ipv6Routes = ipv6RoutesDumpManager.getDump(instanceIdentifier, modificationCache); if (ipv6Routes.isPresent()) { return ipv6Routes.get().ip6FibDetails.stream() diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java index 4209f2a11..a91b3c970 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java @@ -17,7 +17,6 @@ package io.fd.hc2vpp.v3po.interfacesstate; import static com.google.common.base.Preconditions.checkState; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import static java.util.Objects.requireNonNull; import io.fd.hc2vpp.common.translate.util.NamingContext; @@ -84,7 +83,7 @@ final class InterconnectionReadUtils implements InterfaceDataTranslator { final SwInterfaceDetails iface = dumpManager.getInterfaceDetail(id, ctx, ifaceName); LOG.debug("Interface details for interface: {}, details: {}", ifaceName, iface); - final BridgeDomainDetailsReplyDump dumpReply = bdDumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS) + final BridgeDomainDetailsReplyDump dumpReply = bdDumpManager.getDump(id, ctx.getModificationCache()) .or(new BridgeDomainDetailsReplyDump()); for (final BridgeDomainDetails bd : dumpReply.bridgeDomainDetails) { final Optional bdIfAssignment = getBridgeDomainSwIf(ifaceId, bd); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java index 829ba827e..5dd1fa9d8 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java @@ -17,7 +17,6 @@ package io.fd.hc2vpp.v3po.interfacesstate; import static com.google.common.base.Preconditions.checkState; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import static java.lang.String.format; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; @@ -100,7 +99,7 @@ public class TapCustomizer extends FutureJVppCustomizer } LOG.debug("Reading attributes for tap interface: {}", key.getName()); - final SwInterfaceTapDetailsReplyDump reply = tapDumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS) + final SwInterfaceTapDetailsReplyDump reply = tapDumpManager.getDump(id, ctx.getModificationCache()) .or(new SwInterfaceTapDetailsReplyDump()); final Optional detail = reply.swInterfaceTapDetails.stream() diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java index 7d5aed945..421332e59 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java @@ -16,7 +16,6 @@ package io.fd.hc2vpp.v3po.interfacesstate; -import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import static java.lang.String.format; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -108,7 +107,7 @@ public class VhostUserCustomizer implements InitializingReaderCustomizer getAllIds(@Nonnull final InstanceIdentifier id, @Nonnull final ReadContext ctx) throws ReadFailedException { - final Optional dump = dumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS); + final Optional dump = dumpManager.getDump(id, ctx.getModificationCache()); if (!dump.isPresent() || dump.get().policerDetails.isEmpty()) { return Collections.emptyList(); @@ -107,7 +105,7 @@ final class PolicerCustomizer extends FutureJVppCustomizer public void readCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final PolicerBuilder builder, @Nonnull final ReadContext ctx) throws ReadFailedException { - final Optional dump = dumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS); + final Optional dump = dumpManager.getDump(id, ctx.getModificationCache()); if (!dump.isPresent() || dump.get().policerDetails.isEmpty()) { return; -- cgit 1.2.3-korg