diff options
Diffstat (limited to 'lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait')
4 files changed, 31 insertions, 33 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java index f342d48be..609bcb90b 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorReader.java @@ -18,11 +18,11 @@ package io.fd.hc2vpp.lisp.translate.read.trait; import static com.google.common.base.Preconditions.checkNotNull; +import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.LocatorDumpParams; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.vpp.jvpp.core.dto.LispLocatorDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.LispLocatorDump; +import io.fd.vpp.jvpp.core.dto.OneLocatorDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.OneLocatorDump; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; @@ -31,16 +31,16 @@ import javax.annotation.Nonnull; */ public interface LocatorReader extends JvppReplyConsumer { - default EntityDumpExecutor<LispLocatorDetailsReplyDump, LocatorDumpParams> createLocatorDumpExecutor( + default EntityDumpExecutor<OneLocatorDetailsReplyDump, LocatorDumpParams> createLocatorDumpExecutor( @Nonnull final FutureJVppCore vppApi) { return (identifier, params) -> { checkNotNull(params, "Params for dump request not present"); - final LispLocatorDump request = new LispLocatorDump(); + final OneLocatorDump request = new OneLocatorDump(); request.lsIndex = params.getLocatorSetIndex(); //flag that lsIndex is set request.isIndexSet = (byte) 1; - return getReplyForRead(vppApi.lispLocatorDump(request).toCompletableFuture(), identifier); + return getReplyForRead(vppApi.oneLocatorDump(request).toCompletableFuture(), identifier); }; } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java index cf76b92af..bc0e0d0e6 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/LocatorSetReader.java @@ -16,10 +16,10 @@ package io.fd.hc2vpp.lisp.translate.read.trait; -import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.LispLocatorSetDump; +import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; +import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.OneLocatorSetDump; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.locator.sets.grouping.locator.sets.LocatorSet; @@ -29,13 +29,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev */ public interface LocatorSetReader extends JvppReplyConsumer { - default EntityDumpExecutor<LispLocatorSetDetailsReplyDump, Void> createExecutor( + default EntityDumpExecutor<OneLocatorSetDetailsReplyDump, Void> createExecutor( @Nonnull final FutureJVppCore vppApi) { return (identifier, params) -> { - final LispLocatorSetDump request = new LispLocatorSetDump(); + final OneLocatorSetDump request = new OneLocatorSetDump(); //only local request.filter = 1; - return getReplyForRead(vppApi.lispLocatorSetDump(request).toCompletableFuture(), identifier); + return getReplyForRead(vppApi.oneLocatorSetDump(request).toCompletableFuture(), identifier); }; } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java index 8e8b51890..bad719d01 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/MappingReader.java @@ -21,12 +21,12 @@ import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDump import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6; import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.MAC; +import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.vpp.jvpp.core.dto.LispEidTableDetails; -import io.fd.vpp.jvpp.core.dto.LispEidTableDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.LispEidTableDump; +import io.fd.vpp.jvpp.core.dto.OneEidTableDetails; +import io.fd.vpp.jvpp.core.dto.OneEidTableDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.OneEidTableDump; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.function.Predicate; import javax.annotation.Nonnull; @@ -41,13 +41,13 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; */ public interface MappingReader extends JvppReplyConsumer { - Predicate<LispEidTableDetails> BRIDGE_DOMAIN_MAPPINGS_ONLY = - (LispEidTableDetails detail) -> detail.eidType == MAC.getValue(); + Predicate<OneEidTableDetails> BRIDGE_DOMAIN_MAPPINGS_ONLY = + (OneEidTableDetails detail) -> detail.eidType == MAC.getValue(); - Predicate<LispEidTableDetails> VRF_MAPPINGS_ONLY = - (LispEidTableDetails detail) -> detail.eidType == IPV4.getValue() || detail.eidType == IPV6.getValue(); + Predicate<OneEidTableDetails> VRF_MAPPINGS_ONLY = + (OneEidTableDetails detail) -> detail.eidType == IPV4.getValue() || detail.eidType == IPV6.getValue(); - default Predicate<LispEidTableDetails> subtableFilterForLocalMappings( + default Predicate<OneEidTableDetails> subtableFilterForLocalMappings( @Nonnull final InstanceIdentifier<LocalMapping> identifier) { if (identifier.firstIdentifierOf(VrfSubtable.class) != null) { @@ -59,7 +59,7 @@ public interface MappingReader extends JvppReplyConsumer { } } - default Predicate<LispEidTableDetails> subtableFilterForRemoteMappings( + default Predicate<OneEidTableDetails> subtableFilterForRemoteMappings( @Nonnull final InstanceIdentifier<RemoteMapping> identifier) { if (identifier.firstIdentifierOf(VrfSubtable.class) != null) { @@ -71,12 +71,12 @@ public interface MappingReader extends JvppReplyConsumer { } } - default EntityDumpExecutor<LispEidTableDetailsReplyDump, MappingsDumpParams> createMappingDumpExecutor( + default EntityDumpExecutor<OneEidTableDetailsReplyDump, MappingsDumpParams> createMappingDumpExecutor( @Nonnull final FutureJVppCore vppApi) { return (identifier, params) -> { checkNotNull(params, "Params for dump request not present"); - LispEidTableDump request = new LispEidTableDump(); + OneEidTableDump request = new OneEidTableDump(); request.eid = params.getEid(); request.eidSet = params.getEidSet(); request.eidType = params.getEidType(); @@ -84,7 +84,7 @@ public interface MappingReader extends JvppReplyConsumer { request.vni = params.getVni(); request.filter = params.getFilter(); - return getReplyForRead(vppApi.lispEidTableDump(request).toCompletableFuture(), identifier); + return getReplyForRead(vppApi.oneEidTableDump(request).toCompletableFuture(), identifier); }; } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java index 7229628e5..1ae0f1047 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/trait/SubtableReader.java @@ -22,15 +22,13 @@ import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDump import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams.MapLevel.L3; import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams.SubtableDumpParamsBuilder; +import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.SubtableDumpParams; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.vpp.jvpp.core.dto.LispEidTableMapDetailsReplyDump; -import io.fd.vpp.jvpp.core.dto.LispEidTableMapDump; +import io.fd.vpp.jvpp.core.dto.OneEidTableMapDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.OneEidTableMapDump; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.eid.table.grouping.eid.table.VniTable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.eid.table.grouping.eid.table.vni.table.VrfSubtable; /** * Provides common logic for reading Eid subtables @@ -40,12 +38,12 @@ public interface SubtableReader extends JvppReplyConsumer { SubtableDumpParams L2_PARAMS = new SubtableDumpParamsBuilder().setL2(L2).build(); SubtableDumpParams L3_PARAMS = new SubtableDumpParamsBuilder().setL2(L3).build(); - default EntityDumpExecutor<LispEidTableMapDetailsReplyDump, SubtableDumpParams> createExecutor( + default EntityDumpExecutor<OneEidTableMapDetailsReplyDump, SubtableDumpParams> createExecutor( @Nonnull final FutureJVppCore vppApi) { return (identifier, params) -> { - final LispEidTableMapDump request = new LispEidTableMapDump(); + final OneEidTableMapDump request = new OneEidTableMapDump(); request.isL2 = checkNotNull(params, "Cannot bind null params").isL2(); - return getReplyForRead(vppApi.lispEidTableMapDump(request).toCompletableFuture(), identifier); + return getReplyForRead(vppApi.oneEidTableMapDump(request).toCompletableFuture(), identifier); }; } } |