summaryrefslogtreecommitdiffstats
path: root/v3po/v3po2vpp/src/main
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-08-23 16:19:41 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-08-28 11:02:30 +0200
commit7e90b6c5f8a605470dd388bf3c31d9f5beb2724c (patch)
treef209149bfbb7525558c0ac3f9370cbcb78eeb7c1 /v3po/v3po2vpp/src/main
parentfe05c59bb2328bb6494cc3f0c994e8f10178f136 (diff)
DumpCacheManager: make dumpParams optional
Requires https://gerrit.fd.io/r/#/c/8185/ Change-Id: Ib2d529366bd3cf6bb292014026ab8053a19c0ed7 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/main')
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java3
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java3
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java3
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java3
4 files changed, 4 insertions, 8 deletions
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<BridgeDomainSwIf> 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<SwInterfaceTapDetails> 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<VhostUs
final SwInterfaceVhostUserDetailsReplyDump dump =
- vhostDumpManager.getDump(id, ctx.getModificationCache(), NO_PARAMS)
+ vhostDumpManager.getDump(id, ctx.getModificationCache())
.or(new SwInterfaceVhostUserDetailsReplyDump());
// Relying here that parent InterfaceCustomizer was invoked first to fill in the context with initial ifc mapping
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java
index adfd3f34f..536c2bb58 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java
@@ -17,7 +17,6 @@
package io.fd.hc2vpp.v3po.interfacesstate.cache;
import static io.fd.hc2vpp.common.translate.util.JvppReplyConsumer.INSTANCE;
-import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
import static java.util.stream.Collectors.toMap;
import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
@@ -113,7 +112,7 @@ final class InterfaceCacheDumpManagerImpl implements InterfaceCacheDumpManager {
if (!cache.containsKey(BY_NAME_INDEX_KEY)) {
LOG.debug("Performing dump[{}]", identifier);
final SwInterfaceDetailsReplyDump dump =
- fullDumpManager.getDump(identifier, cache, NO_PARAMS)
+ fullDumpManager.getDump(identifier, cache)
.or(new SwInterfaceDetailsReplyDump());
// naming context initialization must be done here, as it is uses getName in next step, therefore it would