diff options
Diffstat (limited to 'lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java')
-rwxr-xr-x | lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java index 03f8a2f9a..72ed941f5 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/AdjacencyCustomizer.java @@ -17,6 +17,8 @@ package io.fd.hc2vpp.lisp.translate.read; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -33,10 +35,16 @@ import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; -import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGet; -import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGetReply; +import io.fd.vpp.jvpp.core.dto.OneAdjacenciesGet; +import io.fd.vpp.jvpp.core.dto.OneAdjacenciesGetReply; import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.LispAdjacency; +import io.fd.vpp.jvpp.core.types.OneAdjacency; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.adjacencies.identification.contexts.adjacencies.identification.mappings.mapping.EidIdentificatorPair; import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.adjacencies.identification.contexts.adjacencies.identification.mappings.mapping.EidIdentificatorPairBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.MappingId; @@ -51,20 +59,11 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -import static com.google.common.base.Preconditions.checkNotNull; - public class AdjacencyCustomizer extends FutureJVppCustomizer implements InitializingListReaderCustomizer<Adjacency, AdjacencyKey, AdjacencyBuilder>, JvppReplyConsumer, EidTranslator, LispInitPathsMapper { - private final DumpCacheManager<LispAdjacenciesGetReply, AdjacencyDumpParams> dumpCacheManager; + private final DumpCacheManager<OneAdjacenciesGetReply, AdjacencyDumpParams> dumpCacheManager; private final AdjacenciesMappingContext adjacenciesMappingContext; private final EidPairProducer eidPairProducer; @@ -74,9 +73,9 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer @Nonnull final EidMappingContext remoteMappingContext, @Nonnull final AdjacenciesMappingContext adjacenciesMappingContext) { super(futureJvpp); - dumpCacheManager = new DumpCacheManager.DumpCacheManagerBuilder<LispAdjacenciesGetReply, AdjacencyDumpParams>() + dumpCacheManager = new DumpCacheManager.DumpCacheManagerBuilder<OneAdjacenciesGetReply, AdjacencyDumpParams>() .withExecutor(createExecutor()) - .acceptOnly(LispAdjacenciesGetReply.class) + .acceptOnly(OneAdjacenciesGetReply.class) .build(); this.adjacenciesMappingContext = @@ -91,7 +90,7 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer final int vni = id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier().intValue(); - final Optional<LispAdjacenciesGetReply> optionalDump = + final Optional<OneAdjacenciesGetReply> optionalDump = dumpCacheManager.getDump(id, context.getModificationCache(), new AdjacencyDumpParams(vni)); @@ -127,7 +126,7 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer final int vni = id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier().intValue(); - final Optional<LispAdjacenciesGetReply> optionalDump = dumpCacheManager + final Optional<OneAdjacenciesGetReply> optionalDump = dumpCacheManager .getDump(id, ctx.getModificationCache(), new AdjacencyDumpParams(vni)); if (!optionalDump.isPresent() || optionalDump.get().adjacencies.length == 0) { @@ -138,7 +137,7 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer final EidIdentificatorPair currentAdjacencyIdentificationPair = adjacenciesMappingContext.getEidPair(currentAdjacencyId, ctx.getMappingContext()); - final LispAdjacency currentAdjacency = Arrays.stream(optionalDump.get().adjacencies) + final OneAdjacency currentAdjacency = Arrays.stream(optionalDump.get().adjacencies) .filter(lispAdjacency -> Objects.equals(currentAdjacencyIdentificationPair, eidPairProducer.createPair(lispAdjacency, vni, ctx.getMappingContext()))) .collect(RWUtils.singleItemCollector()); @@ -151,14 +150,14 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer MappingsDumpParams.EidType.valueOf(currentAdjacency.eidType), currentAdjacency.reid, vni)); } - private EntityDumpExecutor<LispAdjacenciesGetReply, AdjacencyDumpParams> createExecutor() { + private EntityDumpExecutor<OneAdjacenciesGetReply, AdjacencyDumpParams> createExecutor() { return (final InstanceIdentifier<?> identifier, final AdjacencyDumpParams params) -> { checkNotNull(params, "Dump parameters cannot be null"); - final LispAdjacenciesGet request = new LispAdjacenciesGet(); + final OneAdjacenciesGet request = new OneAdjacenciesGet(); request.vni = params.getVni(); - return getReplyForRead(getFutureJVpp().lispAdjacenciesGet(request).toCompletableFuture(), identifier); + return getReplyForRead(getFutureJVpp().oneAdjacenciesGet(request).toCompletableFuture(), identifier); }; } @@ -196,7 +195,7 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer this.remoteMappingContext = checkNotNull(remoteMappingContext, "Remote mapping context cannot be null"); } - EidIdentificatorPair createPair(final LispAdjacency data, final int vni, + EidIdentificatorPair createPair(final OneAdjacency data, final int vni, final MappingContext mappingContext) { return new EidIdentificatorPairBuilder() .setLocalEidId(new MappingId(localMappingContext.getId(getArrayAsEidLocal( |