From ca6cda948df343f56164ce38e258735ead68dc6e Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Tue, 6 Jun 2017 12:51:42 +0200 Subject: HC2VPP-165 - Optional Local Eid support - Support for optional local eid's for gpe entries - Fixes equality issues for mapping identificators - Fixed write request ordering of locator pairs HC2VPP-160 - Use standard index to name mapping for gpe entries - Uses indexes returned from dump/write calls to bind context mapping Change-Id: Ib69240044206dec21307a47981a63f415a16bbdd Signed-off-by: Jan Srnicek --- .../main/java/io/fd/hc2vpp/lisp/gpe/GpeModule.java | 7 +- .../lisp/gpe/translate/ctx/GpeEntryIdentifier.java | 151 --------------------- .../gpe/translate/ctx/GpeEntryMappingContext.java | 54 -------- .../translate/ctx/GpeEntryMappingContextImpl.java | 144 -------------------- .../ctx/GpeLocatorPairMappingContextImpl.java | 24 +++- .../translate/read/GpeForwardEntryCustomizer.java | 33 +++-- .../lisp/gpe/translate/read/GpeReaderFactory.java | 4 +- .../translate/write/GpeForwardEntryCustomizer.java | 97 +++++++------ .../lisp/gpe/translate/write/GpeWriterFactory.java | 4 +- 9 files changed, 97 insertions(+), 421 deletions(-) delete mode 100644 lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryIdentifier.java delete mode 100644 lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryMappingContext.java delete mode 100644 lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryMappingContextImpl.java (limited to 'lisp/lisp2vpp/src/main/java/io/fd') diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/GpeModule.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/GpeModule.java index 13bdbbddb..efdc99834 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/GpeModule.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/GpeModule.java @@ -20,8 +20,7 @@ import com.google.inject.AbstractModule; import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import com.google.inject.name.Names; -import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeEntryMappingContext; -import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeEntryMappingContextImpl; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPairMappingContext; import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPairMappingContextImpl; import io.fd.hc2vpp.lisp.gpe.translate.read.GpeReaderFactory; @@ -38,8 +37,8 @@ public class GpeModule extends AbstractModule { @Override protected void configure() { - bind(GpeEntryMappingContext.class).annotatedWith(Names.named(GPE_ENTRY_MAPPING_CTX)) - .toInstance(new GpeEntryMappingContextImpl(GPE_ENTRY_MAPPING_CTX)); + bind(NamingContext.class).annotatedWith(Names.named(GPE_ENTRY_MAPPING_CTX)) + .toInstance(new NamingContext("gpe-entry-", GPE_ENTRY_MAPPING_CTX)); bind(GpeLocatorPairMappingContext.class).annotatedWith(Names.named(GPE_TO_LOCATOR_PAIR_CTX)) .toInstance(new GpeLocatorPairMappingContextImpl(GPE_TO_LOCATOR_PAIR_CTX)); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryIdentifier.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryIdentifier.java deleted file mode 100644 index 466a422e1..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryIdentifier.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2017 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.hc2vpp.lisp.gpe.translate.ctx; - -import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams; -import io.fd.hc2vpp.lisp.translate.util.EidTranslator; -import io.fd.vpp.jvpp.core.types.GpeFwdEntry; -import javax.annotation.Nonnull; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.GpeEntryIdentificator; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.gpe.entry.identificator.LocalEid; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.gpe.entry.identificator.LocalEidBuilder; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.gpe.entry.identificator.RemoteEid; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.gpe.entry.identificator.RemoteEidBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.gpe.entry.table.GpeEntry; - - -/** - * Uniquely identifies gpe entry in mapping context - */ -public final class GpeEntryIdentifier implements EidTranslator { - - private final long vni; - private final LocalEid localEid; - private final RemoteEid remoteEid; - - private GpeEntryIdentifier(final long vni, - @Nonnull final LocalEid localEid, - @Nonnull final RemoteEid remoteEid) { - this.vni = vni; - this.localEid = localEid; - this.remoteEid = remoteEid; - } - - public long getVni() { - return vni; - } - - public LocalEid getLocalEid() { - return localEid; - } - - public RemoteEid getRemoteEid() { - return remoteEid; - } - - public boolean isSame(@Nonnull final GpeEntryIdentificator identificator) { - return new EqualsBuilder() - .append(true, compareEids(this.getLocalEid(), identificator.getLocalEid())) - .append(true, compareEids(this.getRemoteEid(), identificator.getRemoteEid())) - .append(this.vni, identificator.getVni().longValue()) - .isEquals(); - } - - public static GpeEntryIdentifier fromEntry(final GpeEntry data) { - return new GpeEntryIdentifier.GpeEntryIdentifierBuilder() - .setLocalEid(data.getLocalEid()) - .setRemoteEid(data.getRemoteEid()) - .setVni(data.getVni()) - .createGpeEntryIdentifier(); - } - - public static GpeEntryIdentifier fromDumpDetail(final GpeFwdEntry entry) { - return new GpeEntryIdentifier.GpeEntryIdentifierBuilder() - .setVni(entry.vni) - .setLocalEid( - INSTANCE.getArrayAsGpeLocalEid(MappingsDumpParams.EidType.valueOf(entry.eidType), entry.leid, - entry.leidPrefixLen, entry.vni)) - .setRemoteEid( - INSTANCE.getArrayAsGpeRemoteEid(MappingsDumpParams.EidType.valueOf(entry.eidType), entry.reid, - entry.reidPrefixLen, entry.vni)) - .createGpeEntryIdentifier(); - } - - public static final class GpeEntryIdentifierBuilder { - private long vni; - private LocalEid localEid; - private RemoteEid remoteEid; - - public GpeEntryIdentifierBuilder setVni(final long vni) { - this.vni = vni; - return this; - } - - public GpeEntryIdentifierBuilder setLocalEid( - @Nonnull final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.gpe.entry.table.gpe.entry.LocalEid localEid) { - this.localEid = new LocalEidBuilder() - .setAddress(localEid.getAddress()) - .setAddressType(localEid.getAddressType()) - .setVirtualNetworkId(localEid.getVirtualNetworkId()) - .build(); - return this; - } - - public GpeEntryIdentifierBuilder setRemoteEid( - @Nonnull final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.gpe.entry.table.gpe.entry.RemoteEid remoteEid) { - this.remoteEid = new RemoteEidBuilder() - .setAddress(remoteEid.getAddress()) - .setAddressType(remoteEid.getAddressType()) - .setVirtualNetworkId(remoteEid.getVirtualNetworkId()) - .build(); - return this; - } - - public GpeEntryIdentifier createGpeEntryIdentifier() { - return new GpeEntryIdentifier(vni, localEid, remoteEid); - } - } - - @Override - public boolean equals(final Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - final GpeEntryIdentifier that = (GpeEntryIdentifier) o; - - if (vni != that.vni) { - return false; - } - if (!localEid.equals(that.localEid)) { - return false; - } - return remoteEid.equals(that.remoteEid); - } - - @Override - public int hashCode() { - int result = (int) (vni ^ (vni >>> 32)); - result = 31 * result + localEid.hashCode(); - result = 31 * result + remoteEid.hashCode(); - return result; - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryMappingContext.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryMappingContext.java deleted file mode 100644 index fb8982add..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryMappingContext.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2017 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.hc2vpp.lisp.gpe.translate.ctx; - -import io.fd.honeycomb.translate.MappingContext; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.GpeEntryIdentificator; - - -/** - * Provides mapping context for gpe entries - */ -public interface GpeEntryMappingContext { - - /** - * Adds context mapping for specified id to gpe entry - */ - void addMapping(@Nonnull final String id, - @Nonnull final GpeEntryIdentifier identifier, - @Nonnull final MappingContext mappingContext); - - /** - * Remove context mapping for specified id - */ - void removeMapping(@Nonnull final String id, - @Nonnull final MappingContext mappingContext); - - /** - * Returns identificator for specific id - */ - GpeEntryIdentificator getIdentificatorById(@Nonnull final String id, - @Nonnull final MappingContext mappingContext); - - - /** - * Returns id for specified identifier - */ - String getIdByEntryIdentifier(@Nonnull final GpeEntryIdentifier identifier, - @Nonnull final MappingContext mappingContext); -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryMappingContextImpl.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryMappingContextImpl.java deleted file mode 100644 index 759931204..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeEntryMappingContextImpl.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (c) 2017 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.hc2vpp.lisp.gpe.translate.ctx; - -import static java.lang.String.format; - -import io.fd.honeycomb.translate.MappingContext; -import java.util.Collection; -import java.util.Optional; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.GpeEntryIdentificationCtxAugmentation; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.GpeEntryIdentificationContexts; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.GpeEntryIdentification; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.GpeEntryIdentificationKey; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.Mappings; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.Mapping; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.MappingBuilder; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.MappingKey; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.GpeEntryIdentificator; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.GpeEntryIdentificatorBuilder; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.Contexts; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class GpeEntryMappingContextImpl implements GpeEntryMappingContext { - - private static final Logger LOG = LoggerFactory.getLogger(GpeEntryMappingContextImpl.class); - - private final KeyedInstanceIdentifier - namingContextIid; - - /** - * Create new naming context - * - * @param instanceName name of this context instance. Will be used as list item identifier within context data tree - */ - public GpeEntryMappingContextImpl(@Nonnull final String instanceName) { - namingContextIid = InstanceIdentifier.create(Contexts.class) - .augmentation(GpeEntryIdentificationCtxAugmentation.class) - .child(GpeEntryIdentificationContexts.class) - .child(GpeEntryIdentification.class, new GpeEntryIdentificationKey(instanceName)); - } - - @Override - public void addMapping(@Nonnull final String id, - @Nonnull final GpeEntryIdentifier identifier, - @Nonnull final MappingContext mappingContext) { - LOG.debug("Adding mapping for gpe-entry[id={},entry-identifier={}]", id, identifier); - mappingContext.put(getMappingId(id), getMapping(id, identifier)); - LOG.debug("Mapping for gp-entry[id={}] successfully added", id); - } - - @Override - public void removeMapping(@Nonnull final String id, - @Nonnull final MappingContext mappingContext) { - LOG.debug("Removing mapping for gpe-entry[id={}]", id); - mappingContext.delete(getMappingId(id)); - LOG.debug("Mapping for gpe-entry[id={}] removed", id); - } - - @Override - public GpeEntryIdentificator getIdentificatorById(@Nonnull final String id, - @Nonnull final MappingContext mappingContext) { - final com.google.common.base.Optional read = - mappingContext.read(namingContextIid.child(Mappings.class)); - - if (read.isPresent()) { - return Optional.of(read.get()) - .map(Mappings::getMapping) - .map(Collection::stream) - .map(mappingStream -> mappingStream - .filter(mapping -> mapping.getId().equals(id)) - .map(Mapping::getGpeEntryIdentificator) - .findAny().orElse(null)) - .orElseThrow(() -> new IllegalStateException(format("No mapping for id %s", id))); - - } - throw new IllegalStateException(format("No mapping for id %s", id)); - } - - @Override - public String getIdByEntryIdentifier(@Nonnull final GpeEntryIdentifier identifier, - @Nonnull final MappingContext mappingContext) { - final com.google.common.base.Optional read = - mappingContext.read(namingContextIid.child(Mappings.class)); - - if (read.isPresent()) { - return Optional.of(read.get()) - .map(Mappings::getMapping) - .map(Collection::stream) - .map(mappingStream -> mappingStream - .filter(mapping -> identifier.isSame(mapping.getGpeEntryIdentificator())) - .map(Mapping::getId) - .findAny().orElse(null)) - .orElse(addArtificialMapping(identifier, mappingContext)); - } - - return addArtificialMapping(identifier, mappingContext); - } - - private String addArtificialMapping(@Nonnull final GpeEntryIdentifier identifier, - @Nonnull final MappingContext mappingContext) { - final String artificialName = buildArtificialName(identifier); - addMapping(artificialName, identifier, mappingContext); - return artificialName; - } - - private String buildArtificialName(@Nonnull final GpeEntryIdentifier identifier) { - return format("%s_%s_%s", identifier.getVni(), identifier.getLocalEid().getAddress(), - identifier.getRemoteEid().getAddress()); - } - - private KeyedInstanceIdentifier getMappingId(final String id) { - return namingContextIid.child(Mappings.class).child(Mapping.class, new MappingKey(id)); - } - - private Mapping getMapping(@Nonnull final String id, - @Nonnull final GpeEntryIdentifier identifier) { - return new MappingBuilder() - .setId(id) - .setGpeEntryIdentificator(new GpeEntryIdentificatorBuilder() - .setLocalEid(identifier.getLocalEid()) - .setRemoteEid(identifier.getRemoteEid()) - .setVni(identifier.getVni()) - .build()) - .build(); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeLocatorPairMappingContextImpl.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeLocatorPairMappingContextImpl.java index 94b19996b..a7d84d2b6 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeLocatorPairMappingContextImpl.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx/GpeLocatorPairMappingContextImpl.java @@ -19,6 +19,7 @@ package io.fd.hc2vpp.lisp.gpe.translate.ctx; import static java.lang.String.format; import io.fd.honeycomb.translate.MappingContext; +import io.fd.honeycomb.translate.util.RWUtils; import java.util.Collections; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.locator.pair.identification.context.rev170517.GpeLocatorPairIdentificationCtxAugmentation; @@ -76,16 +77,29 @@ public class GpeLocatorPairMappingContextImpl implements GpeLocatorPairMappingCo public LocatorPairMapping getMapping(@Nonnull final String entryId, @Nonnull final GpeLocatorPair pair, @Nonnull final MappingContext mappingContext) { + + if (!contains(entryId, pair, mappingContext)) { + final String artificialLocatorId = artificialLocatorPairId(entryId, pair); + addMapping(entryId, artificialLocatorId, pair, mappingContext); + return getMapping(entryId, artificialLocatorId, mappingContext); + } + return mappingContext.read(getMappingId(entryId)) .or(new MappingBuilder().setLocatorPairMapping(Collections.emptyList()).build()) .getLocatorPairMapping() .stream() .filter(mapping -> pair.isSame(mapping.getPair())) - .findAny().orElseGet(() -> { - final String artificialLocatorId = artificialLocatorPairId(entryId, pair); - addMapping(entryId, artificialLocatorId, pair, mappingContext); - return getMapping(entryId, artificialLocatorId, mappingContext); - }); + .collect(RWUtils.singleItemCollector()); + } + + private boolean contains(final String entryId, + final GpeLocatorPair pair, + final MappingContext mappingContext) { + return mappingContext.read(getMappingId(entryId)) + .or(new MappingBuilder().setLocatorPairMapping(Collections.emptyList()).build()) + .getLocatorPairMapping() + .stream() + .anyMatch(mapping -> pair.isSame(mapping.getPair())); } @Override 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 90ab65bad..e6e4e4491 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.hc2vpp.lisp.gpe.translate.ctx.GpeEntryIdentifier.fromDumpDetail; import static io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPair.fromDumpDetail; import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; import static java.lang.String.format; @@ -24,8 +23,7 @@ import static java.lang.String.format; import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeEntryIdentifier; -import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeEntryMappingContext; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPair; import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPairMappingContext; import io.fd.hc2vpp.lisp.gpe.translate.service.GpeStateCheckService; @@ -52,7 +50,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.entry.identification.context.rev170517.gpe.entry.identification.context.attributes.gpe.entry.identification.contexts.gpe.entry.identification.mappings.mapping.GpeEntryIdentificator; import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.gpe.locator.pair.identification.context.rev170517.gpe.locator.pair.identification.context.attributes.gpe.locator.pair.identification.contexts.gpe.locator.pair.identification.mappings.mapping.LocatorPairMapping; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.Gpe; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.GpeEntryTable; @@ -76,13 +73,13 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer private final DumpCacheManager entryDumpManager; private final DumpCacheManager entryDumpCacheManager; private final DumpCacheManager activeVnisDumpManager; - private final GpeEntryMappingContext gpeEntryMappingContext; + private final NamingContext gpeEntryMappingContext; private final GpeLocatorPairMappingContext gpeLocatorsMappingContext; private final GpeStateCheckService gpeStateCheckService; public GpeForwardEntryCustomizer(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull final GpeStateCheckService gpeStateCheckService, - @Nonnull final GpeEntryMappingContext gpeEntryMappingContext, + @Nonnull final NamingContext gpeEntryMappingContext, @Nonnull final GpeLocatorPairMappingContext gpeLocatorsMappingContext) { super(futureJVppCore); this.gpeStateCheckService = gpeStateCheckService; @@ -159,23 +156,25 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer final String entryId = id.firstKeyOf(GpeEntry.class).getId(); - final GpeEntryIdentificator identificator = - gpeEntryMappingContext.getIdentificatorById(entryId, ctx.getMappingContext()); - // reads configured vni's, then reads entries for them and filter out current one final java.util.Optional entryCandicate = activeVnis(id, ctx.getModificationCache()) .flatMap(vni -> getEntriesForVni(id, vni, ctx).stream()) - .filter(entry -> fromDumpDetail(entry).isSame(identificator)) + .filter(entry -> entryId + .equals(gpeEntryMappingContext.getName(entry.fwdEntryIndex, ctx.getMappingContext()))) .findAny(); if (entryCandicate.isPresent()) { final GpeFwdEntry gpeFwdEntry = entryCandicate.get(); final int entryVni = gpeFwdEntry.vni; + + if (!matchUndefinedEid(gpeFwdEntry.leid)) { + builder.setLocalEid(getArrayAsGpeLocalEid(MappingsDumpParams.EidType.valueOf(gpeFwdEntry.eidType), + gpeFwdEntry.leid, gpeFwdEntry.leidPrefixLen, entryVni)); + } + builder.setId(entryId) .setDpTable((long) gpeFwdEntry.dpTable) - .setLocalEid(getArrayAsGpeLocalEid(MappingsDumpParams.EidType.valueOf(gpeFwdEntry.eidType), - gpeFwdEntry.leid, gpeFwdEntry.leidPrefixLen, entryVni)) .setRemoteEid(getArrayAsGpeRemoteEid(MappingsDumpParams.EidType.valueOf(gpeFwdEntry.eidType), gpeFwdEntry.reid, gpeFwdEntry.reidPrefixLen, entryVni)) .setVni((long) entryVni); @@ -204,6 +203,12 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer } } + // not matching by specifically sized array, easier to adapt if vpp going to change size of arrays they send + // addresses , because for lisp eid there are at least 3 possible sizes(v4 - 4,mac - 6,v6 - 16) + private static boolean matchUndefinedEid(byte[] addr) { + return addr == null || Arrays.equals(addr, new byte[addr.length]); + } + private List getEntriesForVni(final InstanceIdentifier id, final int vni, final ReadContext context) { final Optional dump = getEntiesDump(id, vni, context); @@ -221,9 +226,7 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer final Optional dump = getEntiesDump(id, vni, context); if (dump.isPresent()) { return Arrays.stream(java.util.Optional.ofNullable(dump.get().entries).orElse(new GpeFwdEntry[]{})) - .map(GpeEntryIdentifier::fromDumpDetail) - .map(identifier -> gpeEntryMappingContext - .getIdByEntryIdentifier(identifier, context.getMappingContext())) + .map(entry -> gpeEntryMappingContext.getName(entry.fwdEntryIndex, context.getMappingContext())) .map(GpeEntryKey::new) .collect(Collectors.toList()); } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java index 236289033..734b4841b 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.lisp.gpe.translate.read; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.gpe.GpeModule; -import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeEntryMappingContext; import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPairMappingContext; import io.fd.hc2vpp.lisp.gpe.translate.service.GpeStateCheckService; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; @@ -60,7 +60,7 @@ public class GpeReaderFactory implements ReaderFactory { @Inject @Named(GpeModule.GPE_ENTRY_MAPPING_CTX) - private GpeEntryMappingContext gpeEntryMappingContext; + private NamingContext gpeEntryMappingContext; @Inject @Named(GpeModule.GPE_TO_LOCATOR_PAIR_CTX) diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizer.java index 1749b5658..cdd388776 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeForwardEntryCustomizer.java @@ -18,13 +18,12 @@ package io.fd.hc2vpp.lisp.gpe.translate.write; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeEntryIdentifier.fromEntry; import static io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPair.fromLocatorPair; import static java.util.Objects.nonNull; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; -import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeEntryMappingContext; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPairMappingContext; import io.fd.hc2vpp.lisp.gpe.translate.service.GpeStateCheckService; import io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType; @@ -37,10 +36,12 @@ import io.fd.vpp.jvpp.core.dto.GpeAddDelFwdEntry; import io.fd.vpp.jvpp.core.dto.GpeAddDelFwdEntryReply; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import io.fd.vpp.jvpp.core.types.GpeLocator; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.gpe.entry.table.GpeEntry; @@ -55,12 +56,12 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer implements ListWriterCustomizer, EidTranslator, JvppReplyConsumer { private final GpeStateCheckService gpeStateCheckService; - private final GpeEntryMappingContext entryMappingCtx; + private final NamingContext entryMappingCtx; private final GpeLocatorPairMappingContext locatorPairCtx; public GpeForwardEntryCustomizer(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull final GpeStateCheckService gpeStateCheckService, - @Nonnull final GpeEntryMappingContext entryMappingCtx, + @Nonnull final NamingContext entryMappingCtx, @Nonnull final GpeLocatorPairMappingContext locatorPairCtx) { super(futureJVppCore); this.gpeStateCheckService = gpeStateCheckService; @@ -73,8 +74,9 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer @Nonnull final GpeEntry dataAfter, @Nonnull final WriteContext writeContext) throws WriteFailedException { gpeStateCheckService.checkGpeEnabledAfter(writeContext); - getReplyForWrite(sendRequestAndMap(true, dataAfter, writeContext.getMappingContext()).toCompletableFuture(), - id); + final GpeAddDelFwdEntryReply replyForWrite = + getReplyForWrite(sendRequestAndMap(true, dataAfter).toCompletableFuture(), id); + addDelMapping(true, dataAfter, replyForWrite, writeContext.getMappingContext()); } @@ -84,10 +86,13 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer @Nonnull final GpeEntry dataAfter, @Nonnull final WriteContext writeContext) throws WriteFailedException { gpeStateCheckService.checkGpeEnabledAfter(writeContext); - getReplyForDelete(sendRequestAndMap(false, dataBefore, writeContext.getMappingContext()).toCompletableFuture(), - id); - getReplyForUpdate(sendRequestAndMap(true, dataAfter, writeContext.getMappingContext()).toCompletableFuture(), - id, dataBefore, dataAfter); + final GpeAddDelFwdEntryReply replyForDelete = getReplyForDelete( + sendRequestAndMap(false, dataBefore).toCompletableFuture(), id); + addDelMapping(false, dataBefore, replyForDelete, writeContext.getMappingContext()); + + final GpeAddDelFwdEntryReply replyForUpdate = getReplyForUpdate( + sendRequestAndMap(true, dataAfter).toCompletableFuture(), id, dataBefore, dataAfter); + addDelMapping(true, dataAfter, replyForUpdate, writeContext.getMappingContext()); } @Override @@ -95,35 +100,37 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer @Nonnull final GpeEntry dataBefore, @Nonnull final WriteContext writeContext) throws WriteFailedException { gpeStateCheckService.checkGpeEnabledBefore(writeContext); - getReplyForDelete(sendRequestAndMap(false, dataBefore, writeContext.getMappingContext()).toCompletableFuture(), - id); + final GpeAddDelFwdEntryReply replyForDelete = + getReplyForDelete(sendRequestAndMap(false, dataBefore).toCompletableFuture(), id); + addDelMapping(false, dataBefore, replyForDelete, writeContext.getMappingContext()); } private CompletableFuture sendRequestAndMap(final boolean add, - final GpeEntry data, - final MappingContext mappingContext) { - final CompletableFuture reply = - getFutureJVpp().gpeAddDelFwdEntry(bindRequest(add, data)).toCompletableFuture(); + final GpeEntry data) { + return getFutureJVpp().gpeAddDelFwdEntry(bindRequest(add, data)).toCompletableFuture(); + } - /* + private void addDelMapping(final boolean add, + final GpeEntry data, + final GpeAddDelFwdEntryReply reply, + final MappingContext mappingContext){ + /* * sync to disallow synchronization issues */ synchronized (entryMappingCtx) { synchronized (locatorPairCtx) { if (add) { - entryMappingCtx.addMapping(data.getId(), fromEntry(data), mappingContext); + entryMappingCtx.addName(reply.fwdEntryIndex,data.getId(),mappingContext); Optional.ofNullable(data.getLocatorPairs()).orElse(Collections.emptyList()).forEach( locatorPair -> locatorPairCtx .addMapping(data.getId(), locatorPair.getId(), fromLocatorPair(locatorPair), mappingContext)); } else { - entryMappingCtx.removeMapping(data.getId(), mappingContext); + entryMappingCtx.removeName(data.getId(),mappingContext); locatorPairCtx.removeMapping(data.getId(), mappingContext); } } } - - return reply; } private GpeAddDelFwdEntry bindRequest(final boolean add, @Nonnull final GpeEntry entry) { @@ -132,21 +139,22 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer request.vni = entry.getVni().byteValue(); request.dpTable = entry.getDpTable().byteValue(); - final LocalEid localEid = Optional.ofNullable(entry.getLocalEid()) - .orElseThrow(() -> new IllegalArgumentException("Local eid cannot be null")); final RemoteEid remoteEid = Optional.ofNullable(entry.getRemoteEid()) .orElseThrow(() -> new IllegalArgumentException("Remote eid cannot be null")); - - final EidType localEidType = getEidType(localEid); final EidType remoteEidType = getEidType(remoteEid); - checkArgument(localEidType == remoteEidType, "Different eid type detected - Local[%s]/Remote[%s]", - localEidType, - remoteEidType); - request.eidType = (byte) localEidType.getVppTypeBinding(); - request.lclEid = getEidAsByteArray(localEid); - request.lclLen = getPrefixLength(localEid); + // for gpe entries, local eid does not have to be specified + final LocalEid localEid = entry.getLocalEid(); + if (localEid != null) { + final EidType localEidType = getEidType(localEid); + checkArgument(localEidType == remoteEidType, "Different eid type detected - Local[%s]/Remote[%s]", + localEidType, + remoteEidType); + request.lclEid = getEidAsByteArray(localEid); + request.lclLen = getPrefixLength(localEid); + } + request.eidType = (byte) remoteEidType.getVppTypeBinding(); request.rmtEid = getEidAsByteArray(remoteEid); request.rmtLen = getPrefixLength(remoteEid); @@ -167,8 +175,8 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer // Pair is translated to two locators, one(local) with local address and weight, second one(remote) with remote // address private GpeLocator[] toRequestLocators(final List pairs) { - return pairs.stream() - .flatMap(locatorPairContainer -> { + final List localLocators = pairs.stream() + .map(locatorPairContainer -> { final LocatorPair locatorPair = checkNotNull(locatorPairContainer.getLocatorPair(), "Locator pair cannot be null"); @@ -183,21 +191,22 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer localLocator.addr = ipAddressToArray(locatorPair.getLocalLocator()); localLocator.isIp4 = booleanToByte(!isLocalIpv6); localLocator.weight = locatorPair.getWeight().byteValue(); + return localLocator; + }).collect(Collectors.toList()); + + final List remoteLocators = pairs.stream() + .map(locatorPairContainer -> { + final LocatorPair locatorPair = locatorPairContainer.getLocatorPair(); + + final boolean isRemoteIpv6 = isIpv6(locatorPair.getRemoteLocator()); + GpeLocator remoteLocator = new GpeLocator(); remoteLocator.addr = ipAddressToArray(locatorPair.getRemoteLocator()); remoteLocator.isIp4 = booleanToByte(!isRemoteIpv6); + return remoteLocator; + }).collect(Collectors.toList()); - return Stream.of(localLocator, remoteLocator); - }) - .sorted((first, second) -> { - if (first.weight == 0 && second.weight == 0) { - return 0; - } else if (first.weight == 0) { - return 1; - } else { - return -1; - } - }).toArray(GpeLocator[]::new); + return Stream.of(localLocators,remoteLocators).flatMap(Collection::stream).toArray(GpeLocator[]::new); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java index cc5283b34..2d9041dae 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java @@ -19,8 +19,8 @@ package io.fd.hc2vpp.lisp.gpe.translate.write; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.lisp.gpe.GpeModule; -import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeEntryMappingContext; import io.fd.hc2vpp.lisp.gpe.translate.ctx.GpeLocatorPairMappingContext; import io.fd.hc2vpp.lisp.gpe.translate.service.GpeStateCheckService; import io.fd.honeycomb.translate.impl.write.GenericListWriter; @@ -63,7 +63,7 @@ public class GpeWriterFactory implements WriterFactory { @Inject @Named(GpeModule.GPE_ENTRY_MAPPING_CTX) - private GpeEntryMappingContext gpeEntryMappingContext; + private NamingContext gpeEntryMappingContext; @Inject @Named(GpeModule.GPE_TO_LOCATOR_PAIR_CTX) -- cgit 1.2.3-korg