diff options
Diffstat (limited to 'lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/ctx')
4 files changed, 19 insertions, 354 deletions
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<GpeEntryIdentification, GpeEntryIdentificationKey> - 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<Mappings> 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<Mappings> 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<Mapping, MappingKey> 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 |