diff options
Diffstat (limited to 'lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write')
18 files changed, 0 insertions, 1968 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java deleted file mode 100755 index b394f2a69..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - - -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType; - -import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext; -import io.fd.honeycomb.lisp.context.util.EidMappingContext; -import io.fd.honeycomb.lisp.translate.util.EidTranslator; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacency; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.adjacencies.grouping.adjacencies.Adjacency; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.adjacencies.grouping.adjacencies.AdjacencyKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.adjacencies.grouping.adjacencies.adjacency.LocalEid; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.adjacencies.grouping.adjacencies.adjacency.RemoteEid; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class AdjacencyCustomizer extends FutureJVppCustomizer - implements ListWriterCustomizer<Adjacency, AdjacencyKey>, ByteDataTranslator, EidTranslator, - JvppReplyConsumer { - - private final EidMappingContext localEidsMappingContext; - private final EidMappingContext remoteEidsMappingContext; - private final AdjacenciesMappingContext adjacenciesMappingContext; - - public AdjacencyCustomizer(@Nonnull final FutureJVppCore futureJvpp, - @Nonnull final EidMappingContext localEidsMappingContext, - @Nonnull final EidMappingContext remoteEidsMappingContext, - @Nonnull final AdjacenciesMappingContext adjacenciesMappingContext) { - super(futureJvpp); - this.localEidsMappingContext = - checkNotNull(localEidsMappingContext, "Eid context for local eid's cannot be null"); - this.remoteEidsMappingContext = - checkNotNull(remoteEidsMappingContext, "Eid context for remote eid's cannot be null"); - this.adjacenciesMappingContext = checkNotNull(adjacenciesMappingContext, "Adjacencies context cannot be null"); - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Adjacency> id, - @Nonnull final Adjacency dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - try { - addDelAdjacency(true, id, dataAfter, writeContext); - } catch (TimeoutException | VppBaseCallException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - - //after successful creation, create mapping - adjacenciesMappingContext.addEidPair(adjacencyId(id), - localEidId(dataAfter, writeContext), - remoteEidId(dataAfter, writeContext), - writeContext.getMappingContext()); - } - - private String remoteEidId(final @Nonnull Adjacency dataAfter, final @Nonnull WriteContext writeContext) { - return remoteEidsMappingContext.getId(toRemoteEid(dataAfter.getRemoteEid()), writeContext.getMappingContext()) - .getValue(); - } - - private String localEidId(final @Nonnull Adjacency dataAfter, final @Nonnull WriteContext writeContext) { - return localEidsMappingContext.getId(toLocalEid(dataAfter.getLocalEid()), writeContext.getMappingContext()) - .getValue(); - } - - private String adjacencyId(final @Nonnull InstanceIdentifier<Adjacency> id) { - return id.firstKeyOf(Adjacency.class).getId(); - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Adjacency> id, - @Nonnull final Adjacency dataBefore, @Nonnull final Adjacency dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new UnsupportedOperationException("Operation not supported"); - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Adjacency> id, - @Nonnull final Adjacency dataBefore, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - try { - addDelAdjacency(false, id, dataBefore, writeContext); - } catch (TimeoutException | VppBaseCallException e) { - throw new WriteFailedException.CreateFailedException(id, dataBefore, e); - } - - //after successful creation, create mapping - adjacenciesMappingContext.removeForIndex(adjacencyId(id), - writeContext.getMappingContext()); - } - - private void addDelAdjacency(boolean add, final InstanceIdentifier<Adjacency> id, final Adjacency data, - final WriteContext writeContext) - throws TimeoutException, VppBaseCallException { - - final int vni = checkNotNull(id.firstKeyOf(VniTable.class), "Unable to find parent VNI for {}", id) - .getVirtualNetworkIdentifier().intValue(); - - // both local and remote eids must be referenced to have respective mapping, - // if there is an attempt to add adjacency. - // In our case its enough to check if local/remote mapping exist for respective eid, - // because such mappings are created while creating mappings - final LocalEid localEid = add - ? verifiedLocalEid(data.getLocalEid(), writeContext) - : data.getLocalEid(); - final RemoteEid remoteEid = add - ? verifiedRemoteEid(data.getRemoteEid(), writeContext) - : data.getRemoteEid(); - final EidType localEidType = getEidType(localEid); - final EidType remoteEidType = getEidType(data.getRemoteEid()); - - checkArgument(localEidType == - remoteEidType, "Local[%s] and Remote[%s] eid types must be the same", localEidType, remoteEidType); - - LispAddDelAdjacency request = new LispAddDelAdjacency(); - - request.isAdd = booleanToByte(add); - request.leid = getEidAsByteArray(localEid); - request.leidLen = getPrefixLength(localEid); - request.reid = getEidAsByteArray(remoteEid); - request.reidLen = getPrefixLength(remoteEid); - request.eidType = (byte) localEidType.getValue(); - request.vni = vni; - - getReply(getFutureJVpp().lispAddDelAdjacency(request).toCompletableFuture()); - } - - private LocalEid verifiedLocalEid(final LocalEid localEid, final WriteContext writeContext) { - if (localEidsMappingContext.containsId(toLocalEid(localEid), writeContext.getMappingContext())) { - return localEid; - } - throw new IllegalStateException( - "Referenced Local Eid[" + localEid + - "] doesn't have local mapping defined, therefore it can't be used in adjacency"); - } - - private RemoteEid verifiedRemoteEid(final RemoteEid remoteEid, final WriteContext writeContext) { - if (remoteEidsMappingContext.containsId(toRemoteEid(remoteEid), writeContext.getMappingContext())) { - return remoteEid; - } - throw new IllegalStateException( - "Referenced Remote Eid[" + remoteEid + - "] doesn't have remote mapping defined, therefore it can't be used in adjacency"); - } - - private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.Eid toRemoteEid( - final RemoteEid remoteEid) { - return newRemoteEidBuilder(remoteEid.getAddressType(), remoteEid.getVirtualNetworkId().getValue().intValue()) - .setAddress(remoteEid.getAddress()).build(); - } - - private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.local.mappings.local.mapping.Eid toLocalEid( - LocalEid localEid) { - return newLocalEidBuilder(localEid.getAddressType(), localEid.getVirtualNetworkId().getValue().intValue()) - .setAddress(localEid.getAddress()).build(); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainSubtableCustomizer.java deleted file mode 100644 index 41e1adc15..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/BridgeDomainSubtableCustomizer.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; - -import io.fd.honeycomb.lisp.translate.write.trait.SubtableWriter; -import io.fd.honeycomb.translate.MappingContext; -import io.fd.honeycomb.translate.spi.write.WriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.vni.table.BridgeDomainSubtable; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class BridgeDomainSubtableCustomizer extends FutureJVppCustomizer - implements WriterCustomizer<BridgeDomainSubtable>, SubtableWriter { - - private static final Logger LOG = LoggerFactory.getLogger(BridgeDomainSubtableCustomizer.class); - - private final NamingContext bridgeDomainContext; - - public BridgeDomainSubtableCustomizer(@Nonnull final FutureJVppCore futureJvpp, - @Nonnull final NamingContext bridgeDomainContext) { - super(futureJvpp); - this.bridgeDomainContext = checkNotNull(bridgeDomainContext, "Bridge domain context cannot be null"); - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<BridgeDomainSubtable> id, - @Nonnull final BridgeDomainSubtable dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - LOG.debug("Writing Id {} ", id); - - try { - addDelSubtableMapping(getFutureJVpp(), true, extractVni(id), - extractBridgeDomainId(dataAfter.getBridgeDomainRef(), writeContext.getMappingContext()), true, LOG); - } catch (TimeoutException | VppBaseCallException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - - LOG.debug("{} successfully written", id); - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<BridgeDomainSubtable> id, - @Nonnull final BridgeDomainSubtable dataBefore, - @Nonnull final BridgeDomainSubtable dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new UnsupportedOperationException("Operation not supported"); - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<BridgeDomainSubtable> id, - @Nonnull final BridgeDomainSubtable dataBefore, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - LOG.debug("Removing Id {}", id); - - try { - addDelSubtableMapping(getFutureJVpp(), false, extractVni(id), - extractBridgeDomainId(dataBefore.getBridgeDomainRef(), writeContext.getMappingContext()), true, - LOG); - } catch (TimeoutException | VppBaseCallException e) { - throw new WriteFailedException.CreateFailedException(id, dataBefore, e); - } - - LOG.debug("{} successfully removed", id); - } - - private int extractBridgeDomainId(final String bridgeDomainName, final MappingContext mappingContext) { - checkState(bridgeDomainContext.containsIndex(bridgeDomainName, mappingContext), - "No mapping for bridge domain name %s", bridgeDomainName); - return bridgeDomainContext.getIndex(bridgeDomainName, mappingContext); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizer.java deleted file mode 100755 index fa477e536..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/InterfaceCustomizer.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; -import static java.nio.charset.StandardCharsets.UTF_8; - -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import java.io.UnsupportedEncodingException; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.locator.sets.LocatorSet; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.locator.sets.locator.set.Interface; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.locator.sets.locator.set.InterfaceKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocator; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Customizer for updating {@link Interface} - * - * @see Interface - */ -public class InterfaceCustomizer extends FutureJVppCustomizer - implements ListWriterCustomizer<Interface, InterfaceKey>, ByteDataTranslator, JvppReplyConsumer { - - private final NamingContext interfaceContext; - - public InterfaceCustomizer(@Nonnull FutureJVppCore futureJvpp, @Nonnull NamingContext interfaceContext) { - super(futureJvpp); - this.interfaceContext = checkNotNull(interfaceContext, "Naming context is null"); - } - - @Override - public void writeCurrentAttributes(InstanceIdentifier<Interface> id, Interface dataAfter, WriteContext writeContext) - throws WriteFailedException { - - checkNotNull(dataAfter, "Interface is null"); - checkNotNull(dataAfter.getPriority(), "Priority is null"); - checkNotNull(dataAfter.getWeight(), "Weight is null"); - checkState(id.firstKeyOf(Interface.class) != null, "Parent interface not found"); - checkState(id.firstKeyOf(LocatorSet.class) != null, "Parent locator set not found"); - - String interfaceName = id.firstKeyOf(Interface.class).getInterfaceRef(); - String locatorSetName = id.firstKeyOf(LocatorSet.class).getName(); - - checkState(interfaceContext.containsIndex(interfaceName, writeContext.getMappingContext()), - "No mapping stored for interface %s", interfaceName); - - try { - addDelInterfaceAndReply(true, dataAfter, - interfaceContext.getIndex(interfaceName, writeContext.getMappingContext()), locatorSetName); - } catch (VppBaseCallException | TimeoutException | UnsupportedEncodingException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - - } - - @Override - public void updateCurrentAttributes(InstanceIdentifier<Interface> id, Interface dataBefore, Interface dataAfter, - WriteContext writeContext) throws WriteFailedException { - throw new UnsupportedOperationException("Operation not supported"); - } - - @Override - public void deleteCurrentAttributes(InstanceIdentifier<Interface> id, Interface dataBefore, - WriteContext writeContext) throws WriteFailedException { - checkNotNull(dataBefore, "Interface is null"); - checkNotNull(dataBefore.getPriority(), "Priority is null"); - checkNotNull(dataBefore.getWeight(), "Weight is null"); - checkState(id.firstKeyOf(Interface.class) != null, "Parent interface not found"); - checkState(id.firstKeyOf(LocatorSet.class) != null, "Parent locator set not found"); - - String interfaceName = id.firstKeyOf(Interface.class).getInterfaceRef(); - String locatorSetName = id.firstKeyOf(LocatorSet.class).getName(); - - checkState(interfaceContext.containsIndex(interfaceName, writeContext.getMappingContext()), - "No mapping stored for interface %s", interfaceName); - try { - addDelInterfaceAndReply(false, dataBefore, - interfaceContext.getIndex(interfaceName, writeContext.getMappingContext()), locatorSetName); - } catch (VppBaseCallException | TimeoutException | UnsupportedEncodingException e) { - throw new WriteFailedException.DeleteFailedException(id, e); - } - } - - private void addDelInterfaceAndReply(boolean add, Interface data, int interfaceIndex, String locatorSetName) - throws VppBaseCallException, TimeoutException, UnsupportedEncodingException { - LispAddDelLocator request = new LispAddDelLocator(); - - request.isAdd = booleanToByte(add); - request.priority = data.getPriority().byteValue(); - request.weight = data.getWeight().byteValue(); - request.swIfIndex = interfaceIndex; - request.locatorSetName = locatorSetName.getBytes(UTF_8); - - getReply(getFutureJVpp().lispAddDelLocator(request).toCompletableFuture()); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java deleted file mode 100644 index 8ba1bcf3f..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - - -import io.fd.honeycomb.translate.spi.write.WriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.itr.remote.locator.sets.grouping.ItrRemoteLocatorSet; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapRequestItrRlocs; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - -public class ItrRemoteLocatorSetCustomizer extends FutureJVppCustomizer implements - WriterCustomizer<ItrRemoteLocatorSet>, ByteDataTranslator, JvppReplyConsumer { - - public ItrRemoteLocatorSetCustomizer(@Nonnull final FutureJVppCore futureJVppCore) { - super(futureJVppCore); - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<ItrRemoteLocatorSet> id, - @Nonnull final ItrRemoteLocatorSet dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - try { - addDelItrRemoteLocatorSet(true, dataAfter); - } catch (TimeoutException | VppBaseCallException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<ItrRemoteLocatorSet> id, - @Nonnull final ItrRemoteLocatorSet dataBefore, - @Nonnull final ItrRemoteLocatorSet dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter, - new UnsupportedOperationException("Operation not supported")); - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<ItrRemoteLocatorSet> id, - @Nonnull final ItrRemoteLocatorSet dataBefore, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - try { - addDelItrRemoteLocatorSet(false, dataBefore); - } catch (TimeoutException | VppBaseCallException e) { - throw new WriteFailedException.DeleteFailedException(id, e); - } - } - - private void addDelItrRemoteLocatorSet(final boolean add, @Nonnull final ItrRemoteLocatorSet data) - throws TimeoutException, VppBaseCallException { - - LispAddDelMapRequestItrRlocs request = new LispAddDelMapRequestItrRlocs(); - request.isAdd = booleanToByte(add); - request.locatorSetName = data.getRemoteLocatorSetName().getBytes(StandardCharsets.UTF_8); - - getReply(getFutureJVpp().lispAddDelMapRequestItrRlocs(request).toCompletableFuture()); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java deleted file mode 100755 index ba2e24038..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LispCustomizer.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import com.google.common.base.Preconditions; -import io.fd.honeycomb.translate.spi.write.WriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import java.util.concurrent.CompletionStage; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.Lisp; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispEnableDisable; -import io.fd.vpp.jvpp.core.dto.LispEnableDisableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Handles updates of {@link Lisp} node. Takes care of LISP enable/disable - */ -public class LispCustomizer extends FutureJVppCustomizer - implements WriterCustomizer<Lisp>, ByteDataTranslator, JvppReplyConsumer { - - public LispCustomizer(final FutureJVppCore vppApi) { - super(vppApi); - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Lisp> id, @Nonnull final Lisp dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - Preconditions.checkNotNull(dataAfter, "Lisp is null"); - - try { - enableDisableLisp(dataAfter.isEnable()); - } catch (VppBaseCallException | TimeoutException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Lisp> id, @Nonnull final Lisp dataBefore, - @Nonnull final Lisp dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - Preconditions.checkNotNull(dataAfter, "Lisp is null"); - - try { - enableDisableLisp(dataAfter.isEnable()); - } catch (VppBaseCallException | TimeoutException e) { - throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter, e); - } - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Lisp> id, @Nonnull final Lisp dataBefore, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - Preconditions.checkNotNull(dataBefore, "Lisp is null"); - - try { - enableDisableLisp(false); - } catch (VppBaseCallException | TimeoutException e) { - throw new WriteFailedException.DeleteFailedException(id, e); - } - - } - - - private void enableDisableLisp(final boolean enable) throws VppBaseCallException, TimeoutException { - final CompletionStage<LispEnableDisableReply> lispEnableDisableReplyCompletionStage = - getFutureJVpp().lispEnableDisable(getRequest(enable)); - getReply(lispEnableDisableReplyCompletionStage.toCompletableFuture()); - } - - private LispEnableDisable getRequest(final boolean enable) { - final LispEnableDisable lispEnableDisable = new LispEnableDisable(); - lispEnableDisable.isEn = booleanToByte(enable); - return lispEnableDisable; - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizer.java deleted file mode 100755 index 93f39f49b..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocalMappingCustomizer.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; -import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV4; -import static io.fd.honeycomb.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType.IPV6; -import static java.nio.charset.StandardCharsets.UTF_8; - -import io.fd.honeycomb.lisp.context.util.EidMappingContext; -import io.fd.honeycomb.lisp.translate.read.trait.MappingProducer; -import io.fd.honeycomb.lisp.translate.util.EidTranslator; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import java.io.UnsupportedEncodingException; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.MappingId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.local.mappings.LocalMapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.local.mappings.LocalMappingKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocalEid; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Customizer that writes changes for {@link LocalMapping} - */ -public class LocalMappingCustomizer extends FutureJVppCustomizer - implements ListWriterCustomizer<LocalMapping, LocalMappingKey>, ByteDataTranslator, EidTranslator, - JvppReplyConsumer, MappingProducer { - - private final EidMappingContext localMappingsContext; - - public LocalMappingCustomizer(@Nonnull FutureJVppCore futureJvpp, @Nonnull EidMappingContext localMappingsContext) { - super(futureJvpp); - this.localMappingsContext = checkNotNull(localMappingsContext, "No local mappings context defined"); - } - - @Override - public void writeCurrentAttributes(InstanceIdentifier<LocalMapping> id, LocalMapping dataAfter, - WriteContext writeContext) throws WriteFailedException { - checkNotNull(dataAfter, "Mapping is null"); - checkNotNull(dataAfter.getEid(), "Eid is null"); - checkNotNull(dataAfter.getLocatorSet(), "Locator set is null"); - checkState(id.firstKeyOf(VniTable.class) != null, "Parent vni table not found"); - checkAllowedCombination(id, dataAfter); - - //checks whether value with specified mapping-id does not exist in mapping allready - final MappingId mappingId = id.firstKeyOf(LocalMapping.class).getId(); - checkState(!localMappingsContext - .containsEid(mappingId, writeContext.getMappingContext()), - "Local mapping with id %s already defined", id); - - - try { - addDelMappingAndReply(true, dataAfter, - id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier().intValue()); - } catch (VppBaseCallException | TimeoutException | UnsupportedEncodingException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - - //adds mapping for id and eid - localMappingsContext.addEid(mappingId, dataAfter.getEid(), writeContext.getMappingContext()); - } - - @Override - public void updateCurrentAttributes(InstanceIdentifier<LocalMapping> id, LocalMapping dataBefore, - LocalMapping dataAfter, WriteContext writeContext) - throws WriteFailedException { - throw new UnsupportedOperationException("Operation not supported"); - } - - @Override - public void deleteCurrentAttributes(InstanceIdentifier<LocalMapping> id, LocalMapping dataBefore, - WriteContext writeContext) throws WriteFailedException { - checkNotNull(dataBefore, "Mapping is null"); - checkNotNull(dataBefore.getEid(), "Eid is null"); - checkNotNull(dataBefore.getLocatorSet(), "LocatorSet is null"); - checkState(id.firstKeyOf(VniTable.class) != null, "Parent vni table not found"); - - //checks whether value with specified mapping-id does exist in mapping,so there is something to delete - MappingId mappingId = id.firstKeyOf(LocalMapping.class).getId(); - checkState(localMappingsContext - .containsEid(mappingId, writeContext.getMappingContext()), - "Local mapping with id %s not present in mapping", id); - - try { - addDelMappingAndReply(false, dataBefore, - id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier().intValue()); - } catch (VppBaseCallException | TimeoutException | UnsupportedEncodingException e) { - throw new WriteFailedException.DeleteFailedException(id, e); - } - - //removes value also from mapping - localMappingsContext.removeEid(mappingId, writeContext.getMappingContext()); - } - - private void addDelMappingAndReply(boolean add, LocalMapping data, int vni) throws VppBaseCallException, - TimeoutException, UnsupportedEncodingException { - - LispAddDelLocalEid request = new LispAddDelLocalEid(); - - request.isAdd = booleanToByte(add); - request.eid = getEidAsByteArray(data.getEid()); - request.eidType = (byte) getEidType(data.getEid()).getValue(); - request.locatorSetName = data.getLocatorSet().getBytes(UTF_8); - request.vni = vni; - - //default prefixes - if (request.eidType == IPV4.getValue()) { - request.prefixLen = 32; - } else if (request.eidType == IPV6.getValue()) { - request.prefixLen = (byte) 128; - } - - getReply(getFutureJVpp().lispAddDelLocalEid(request).toCompletableFuture()); - } - -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java deleted file mode 100755 index 749255836..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; -import static java.nio.charset.StandardCharsets.UTF_8; - -import io.fd.honeycomb.lisp.translate.read.trait.LocatorSetReader; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet; -import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetailsReplyDump; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import java.util.List; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.locator.sets.LocatorSet; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.locator.sets.LocatorSetKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.locator.sets.locator.set.Interface; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - - -/** - * Customizer for {@link LocatorSet} entity. - * - * @see LocatorSet - */ -public class LocatorSetCustomizer extends FutureJVppCustomizer - implements ListWriterCustomizer<LocatorSet, LocatorSetKey>, ByteDataTranslator, - LocatorSetReader { - - private final NamingContext locatorSetContext; - - public LocatorSetCustomizer(@Nonnull final FutureJVppCore futureJvpp, - @Nonnull final NamingContext locatorSetContext) { - super(futureJvpp); - this.locatorSetContext = checkNotNull(locatorSetContext, "Locator set context cannot be null"); - } - - @Override - public void writeCurrentAttributes(@Nonnull InstanceIdentifier<LocatorSet> id, - @Nonnull LocatorSet dataAfter, - @Nonnull WriteContext writeContext) throws WriteFailedException { - checkState(isNonEmptyLocatorSet(writeContext.readAfter(id).get()), - "Creating empty locator-sets is not allowed"); - final String locatorSetName = dataAfter.getName(); - checkState(!locatorSetContext.containsIndex(locatorSetName, writeContext.getMappingContext()), - "Locator set with name %s already defined", locatorSetName); - - final int locatorSetIndex = addDelLocatorSetAndReply(true, dataAfter.getName(), id); - locatorSetContext.addName(locatorSetIndex, locatorSetName, writeContext.getMappingContext()); - } - - private boolean isNonEmptyLocatorSet(final LocatorSet locatorSet) { - final List<Interface> locators = locatorSet.getInterface(); - return locators != null && !locators.isEmpty(); - } - - @Override - public void updateCurrentAttributes(@Nonnull InstanceIdentifier<LocatorSet> id, - @Nonnull LocatorSet dataBefore, - @Nonnull LocatorSet dataAfter, - @Nonnull WriteContext writeContext) throws WriteFailedException { - throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter, - new UnsupportedOperationException("Operation not supported")); - } - - @Override - public void deleteCurrentAttributes(@Nonnull InstanceIdentifier<LocatorSet> id, - @Nonnull LocatorSet dataBefore, - @Nonnull WriteContext writeContext) throws WriteFailedException { - final String locatorSetName = dataBefore.getName(); - addDelLocatorSetAndReply(false, dataBefore.getName(), id); - //removes mapping after successful delete - locatorSetContext.removeName(locatorSetName, writeContext.getMappingContext()); - } - - private int addDelLocatorSetAndReply(final boolean add, final String name, final InstanceIdentifier<LocatorSet> id) - throws WriteFailedException { - - LispAddDelLocatorSet addDelSet = new LispAddDelLocatorSet(); - - addDelSet.isAdd = booleanToByte(add); - addDelSet.locatorSetName = name.getBytes(UTF_8); - - return getReplyForWrite(getFutureJVpp().lispAddDelLocatorSet(addDelSet).toCompletableFuture(), id).lsIndex; - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizer.java deleted file mode 100755 index 42066c442..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/MapResolverCustomizer.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import static com.google.common.base.Preconditions.checkNotNull; - -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.AddressTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.map.resolvers.grouping.map.resolvers.MapResolver; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.map.resolvers.grouping.map.resolvers.MapResolverKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapResolver; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Handles updates of {@link MapResolver} list - */ -public class MapResolverCustomizer extends FutureJVppCustomizer - implements ListWriterCustomizer<MapResolver, MapResolverKey>, AddressTranslator, - JvppReplyConsumer { - - public MapResolverCustomizer(final FutureJVppCore vppApi) { - super(vppApi); - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<MapResolver> id, - @Nonnull final MapResolver dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - - checkNotNull(dataAfter, "Data is null"); - checkNotNull(dataAfter.getIpAddress(), "Address is null"); - - try { - addDelMapResolverAndReply(true, dataAfter); - } catch (VppBaseCallException | TimeoutException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<MapResolver> id, - @Nonnull final MapResolver dataBefore, @Nonnull final MapResolver dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new UnsupportedOperationException("Operation not supported"); - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<MapResolver> id, - @Nonnull final MapResolver dataBefore, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - - checkNotNull(dataBefore, "Data is null"); - checkNotNull(dataBefore.getIpAddress(), "Address is null"); - - try { - addDelMapResolverAndReply(false, dataBefore); - } catch (VppBaseCallException | TimeoutException e) { - throw new WriteFailedException.CreateFailedException(id, dataBefore, e); - } - } - - private void addDelMapResolverAndReply(boolean add, MapResolver data) throws VppBaseCallException, - TimeoutException { - - LispAddDelMapResolver request = new LispAddDelMapResolver(); - request.isAdd = booleanToByte(add); - - - boolean ipv6 = isIpv6(data.getIpAddress()); - - request.isIpv6 = booleanToByte(ipv6); - request.ipAddress = ipAddressToArray(ipv6, data.getIpAddress()); - - getReply(getFutureJVpp().lispAddDelMapResolver(request).toCompletableFuture()); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizer.java deleted file mode 100755 index 035db3c33..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/PitrCfgCustomizer.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import static com.google.common.base.Preconditions.checkNotNull; -import static java.nio.charset.StandardCharsets.UTF_8; - -import io.fd.honeycomb.translate.spi.write.WriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import java.util.concurrent.TimeoutException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.pitr.cfg.grouping.PitrCfg; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispPitrSetLocatorSet; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Customizer for {@code PitrCfg} - */ -public class PitrCfgCustomizer extends FutureJVppCustomizer - implements WriterCustomizer<PitrCfg>, JvppReplyConsumer, ByteDataTranslator { - - private static final String DEFAULT_LOCATOR_SET_NAME = "N/A"; - - public PitrCfgCustomizer(FutureJVppCore futureJvpp) { - super(futureJvpp); - } - - @Override - public void writeCurrentAttributes(InstanceIdentifier<PitrCfg> id, PitrCfg dataAfter, WriteContext writeContext) - throws WriteFailedException { - checkNotNull(dataAfter, "PitrCfg is null"); - checkNotNull(dataAfter.getLocatorSet(), "Locator set name is null"); - - try { - addDelPitrSetLocatorSetAndReply(true, dataAfter); - } catch (VppBaseCallException | TimeoutException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - } - - @Override - public void updateCurrentAttributes(InstanceIdentifier<PitrCfg> id, PitrCfg dataBefore, PitrCfg dataAfter, - WriteContext writeContext) throws WriteFailedException { - checkNotNull(dataAfter, "PitrCfg is null"); - checkNotNull(dataAfter.getLocatorSet(), "Locator set name is null"); - - try { - addDelPitrSetLocatorSetAndReply(true, dataAfter); - } catch (VppBaseCallException | TimeoutException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - } - - @Override - public void deleteCurrentAttributes(InstanceIdentifier<PitrCfg> id, PitrCfg dataBefore, WriteContext writeContext) - throws WriteFailedException { - checkNotNull(dataBefore, "PitrCfg is null"); - checkNotNull(dataBefore.getLocatorSet(), "Locator set name is null"); - - try { - addDelPitrSetLocatorSetAndReply(false, dataBefore); - } catch (VppBaseCallException | TimeoutException e) { - throw new WriteFailedException.CreateFailedException(id, dataBefore, e); - } - } - - private void addDelPitrSetLocatorSetAndReply(boolean add, PitrCfg data) - throws VppBaseCallException, TimeoutException { - - if (DEFAULT_LOCATOR_SET_NAME.equals(data.getLocatorSet())) { - // ignores attempts to write default locator set - // therefore even while its loaded to config data of honeycomb while starting - // you can still enable/disable Lisp without having to define N/A as default pitr-set - return; - } - - LispPitrSetLocatorSet request = new LispPitrSetLocatorSet(); - request.isAdd = booleanToByte(add); - request.lsName = data.getLocatorSet().getBytes(UTF_8); - - getReply(getFutureJVpp().lispPitrSetLocatorSet(request).toCompletableFuture()); - } - -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizer.java deleted file mode 100755 index cb4313bc2..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/RemoteMappingCustomizer.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - - -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; -import static io.fd.honeycomb.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.NEGATIVE; -import static io.fd.honeycomb.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.POSITIVE; - -import com.google.common.base.Preconditions; -import io.fd.honeycomb.lisp.context.util.EidMappingContext; -import io.fd.honeycomb.lisp.translate.read.trait.MappingProducer; -import io.fd.honeycomb.lisp.translate.util.EidTranslator; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.AddressTranslator; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.MapReplyAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.MappingId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.RemoteMapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.RemoteMappingKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.LocatorList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.locator.list.NegativeMapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.locator.list.PositiveMapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.locator.list.positive.mapping.Rlocs; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.locator.list.positive.mapping.rlocs.Locator; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMapping; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Customizer for {@link RemoteMapping} - */ -public class RemoteMappingCustomizer extends FutureJVppCustomizer - implements ListWriterCustomizer<RemoteMapping, RemoteMappingKey>, EidTranslator, - AddressTranslator, JvppReplyConsumer, MappingProducer { - - private final EidMappingContext remoteMappingContext; - - public RemoteMappingCustomizer(@Nonnull final FutureJVppCore futureJvpp, - @Nonnull final EidMappingContext remoteMappingContext) { - super(futureJvpp); - this.remoteMappingContext = remoteMappingContext; - } - - @Override - public void writeCurrentAttributes(InstanceIdentifier<RemoteMapping> id, RemoteMapping dataAfter, - WriteContext writeContext) throws WriteFailedException { - checkNotNull(dataAfter, "Mapping is null"); - checkNotNull(dataAfter.getEid(), "Eid is null"); - checkState(id.firstKeyOf(VniTable.class) != null, "Parent vni table not found"); - checkAllowedCombination(id, dataAfter); - - //checks whether mapping not already contains such key - MappingId mappingId = id.firstKeyOf(RemoteMapping.class).getId(); - checkState(!remoteMappingContext.containsEid(mappingId, writeContext.getMappingContext()), - "Mapping for id %s already defined", mappingId); - - try { - addDelRemoteMappingAndReply(true, dataAfter, - id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier().intValue()); - } catch (VppBaseCallException | TimeoutException | IOException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - - //after successfull adition adds mapping - remoteMappingContext.addEid(mappingId, dataAfter.getEid(), writeContext.getMappingContext()); - } - - @Override - public void updateCurrentAttributes(InstanceIdentifier<RemoteMapping> id, RemoteMapping dataBefore, - RemoteMapping dataAfter, WriteContext writeContext) - throws WriteFailedException { - throw new UnsupportedOperationException("Operation not supported"); - } - - @Override - public void deleteCurrentAttributes(InstanceIdentifier<RemoteMapping> id, RemoteMapping dataBefore, - WriteContext writeContext) throws WriteFailedException { - checkNotNull(dataBefore, "Mapping is null"); - checkNotNull(dataBefore.getEid(), "Eid is null"); - - //checks whether mapping already contains such key - MappingId mappingId = id.firstKeyOf(RemoteMapping.class).getId(); - checkState(remoteMappingContext.containsEid(mappingId, writeContext.getMappingContext()), - "Mapping for id %s is not existing,nothing to remove", mappingId); - - try { - addDelRemoteMappingAndReply(false, dataBefore, - id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier().intValue()); - } catch (VppBaseCallException | TimeoutException | IOException e) { - throw new WriteFailedException.DeleteFailedException(id, e); - } - - //remote mapping after successfull remove of data - remoteMappingContext.removeEid(mappingId, writeContext.getMappingContext()); - } - - private void addDelRemoteMappingAndReply(boolean add, RemoteMapping data, int vni) - throws VppBaseCallException, TimeoutException, IOException { - - LispAddDelRemoteMapping request = new LispAddDelRemoteMapping(); - - request.isAdd = booleanToByte(add); - request.vni = vni; - request.eidType = (byte) getEidType(data.getEid()).getValue(); - request.eid = getEidAsByteArray(data.getEid()); - - //this is not length of eid array,but prefix length(bad naming by vpp) - request.eidLen = getPrefixLength(data.getEid()); - - if (LocatorListType.NEGATIVE - .equals(resolveType(data.getLocatorList()))) { - request.action = (byte) extractAction(data.getLocatorList()).getIntValue(); - } else { - Rlocs rlocs = extractRemoteLocators(data.getLocatorList()); - - checkArgument(rlocs != null, "No remote locators set for Positive mapping"); - - request.rlocs = locatorsToBinaryData(rlocs.getLocator()); - request.rlocNum = Integer.valueOf(rlocs.getLocator().size()).byteValue(); - } - - getReply(getFutureJVpp().lispAddDelRemoteMapping(request).toCompletableFuture()); - } - - private static LocatorListType resolveType(LocatorList locatorList) { - checkNotNull(locatorList, "Locator List cannot be null"); - - if (locatorList instanceof PositiveMapping) { - return POSITIVE; - } else { - return NEGATIVE; - } - } - - private static MapReplyAction extractAction(LocatorList locatorList) { - checkNotNull(locatorList, "Locator List cannot be null"); - Preconditions.checkArgument(NEGATIVE.equals(resolveType(locatorList)), - "Action can be extracted only from Negative Mapping"); - - return ((NegativeMapping) locatorList).getMapReply().getMapReplyAction(); - } - - private static Rlocs extractRemoteLocators(LocatorList locatorList) { - checkNotNull(locatorList, "Locator List cannot be null"); - Preconditions.checkArgument(POSITIVE.equals(resolveType(locatorList)), - "RLocs can be extracted only from Positive Mapping"); - - return ((PositiveMapping) locatorList).getRlocs(); - } - - //cant be static because of use of default methods from traits - private byte[] locatorsToBinaryData(List<Locator> locators) throws IOException { - checkNotNull(locators, "Cannot convert null list"); - - ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - - DataOutputStream out = new DataOutputStream(byteArrayOut); - - - for (Locator locator : locators) { - boolean isIpv4; - byte[] address; - - //first byte says that its v4/v6 - isIpv4 = !isIpv6(locator.getAddress()); - out.writeByte(booleanToByte(isIpv4)); - - //then writes priority - out.write(locator.getPriority()); - - //and weight - out.write(locator.getWeight()); - - if (isIpv4) { - //vpp in this case needs address as 16 byte array,regardless if it is ivp4 or ipv6 - address = Arrays.copyOf( - - ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(locator.getAddress().getIpv4Address())), - 16); - - out.write(address); - } else { - out.write( - ipv6AddressNoZoneToArray(new Ipv6AddressNoZone(locator.getAddress().getIpv6Address()))); - } - } - - return byteArrayOut.toByteArray(); - } - - public enum LocatorListType { - - /** - * Represents locator list as negative mapping - */ - NEGATIVE, - - /** - * Represents locator list as positive mapping - */ - POSITIVE - } - -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizer.java deleted file mode 100755 index 005b336d6..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VniTableCustomizer.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import static com.google.common.base.Preconditions.checkState; - -import com.google.common.base.Optional; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.util.RWUtils; - -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTableKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * This customizer serves only as a check if user is not trying to define VniTable <br> - * without mapping to vrf/bd - */ -public class VniTableCustomizer extends FutureJVppCustomizer implements ListWriterCustomizer<VniTable, VniTableKey> { - - private static final Logger LOG = LoggerFactory.getLogger(VniTableCustomizer.class); - - public VniTableCustomizer(FutureJVppCore futureJvpp) { - super(futureJvpp); - } - - @Override - public void writeCurrentAttributes(InstanceIdentifier<VniTable> id, VniTable dataAfter, WriteContext writeContext) - throws WriteFailedException { - checkAtLeastOnChildExists(id, writeContext, false); - } - - @Override - public void updateCurrentAttributes(InstanceIdentifier<VniTable> id, VniTable dataBefore, VniTable dataAfter, - WriteContext writeContext) throws WriteFailedException { - throw new UnsupportedOperationException("Operation not supported"); - } - - @Override - public void deleteCurrentAttributes(InstanceIdentifier<VniTable> id, VniTable dataBefore, WriteContext writeContext) - throws WriteFailedException { - checkAtLeastOnChildExists(id, writeContext, true); - } - - private void checkAtLeastOnChildExists(final InstanceIdentifier<VniTable> id, final WriteContext writeContext, - final boolean before) { - - Optional<VniTable> optData; - final InstanceIdentifier<VniTable> trimmedId = RWUtils.cutId(id, InstanceIdentifier.create(VniTable.class)); - if (before) { - optData = writeContext.readBefore(trimmedId); - } else { - optData = writeContext.readAfter(trimmedId); - } - - checkState(optData.isPresent(), "Illegal after-write state"); - - final VniTable dataAfter = optData.get(); - checkState(dataAfter.getVrfSubtable() != null || dataAfter.getBridgeDomainSubtable() != null, - "At least one of VrfSubtable/BridgeDomainSubtable must be defined"); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizer.java deleted file mode 100644 index a977871b5..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/VrfSubtableCustomizer.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write; - -import io.fd.honeycomb.lisp.translate.write.trait.SubtableWriter; -import io.fd.honeycomb.translate.spi.write.WriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.vni.table.VrfSubtable; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class VrfSubtableCustomizer extends FutureJVppCustomizer - implements WriterCustomizer<VrfSubtable>, SubtableWriter { - - private static final Logger LOG = LoggerFactory.getLogger(VrfSubtableCustomizer.class); - - public VrfSubtableCustomizer(@Nonnull final FutureJVppCore futureJvpp) { - super(futureJvpp); - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<VrfSubtable> id, - @Nonnull final VrfSubtable dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - - LOG.debug("Writing Id[{}]/Data[{}]", id, dataAfter); - - try { - addDelSubtableMapping(getFutureJVpp(), true, extractVni(id), dataAfter.getTableId().intValue(), false, LOG); - } catch (TimeoutException | VppBaseCallException e) { - throw new WriteFailedException.CreateFailedException(id, dataAfter, e); - } - - LOG.debug("{} successfully written", id); - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<VrfSubtable> id, - @Nonnull final VrfSubtable dataBefore, @Nonnull final VrfSubtable dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new UnsupportedOperationException("Operation not supported"); - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<VrfSubtable> id, - @Nonnull final VrfSubtable dataBefore, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - - LOG.debug("Removing Id[{}]/Data[{}]", id, dataBefore); - - try { - addDelSubtableMapping(getFutureJVpp(), false, extractVni(id), dataBefore.getTableId().intValue(), false, - LOG); - } catch (TimeoutException | VppBaseCallException e) { - throw new WriteFailedException.CreateFailedException(id, dataBefore, e); - } - - LOG.debug("{} successfully removed", id); - } - -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java deleted file mode 100644 index 366caf846..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/AbstractLispWriterFactoryBase.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write.factory; - -import static com.google.common.base.Preconditions.checkNotNull; - -import io.fd.honeycomb.lisp.context.util.EidMappingContext; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.Lisp; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Basic attributes for lisp writer factories - */ -abstract class AbstractLispWriterFactoryBase { - - protected final InstanceIdentifier<Lisp> lispInstanceIdentifier; - protected final FutureJVppCore vppApi; - protected NamingContext interfaceContext; - protected NamingContext locatorSetContext; - protected EidMappingContext localMappingContext; - protected EidMappingContext remoteMappingContext; - - protected AbstractLispWriterFactoryBase(@Nonnull final InstanceIdentifier<Lisp> lispInstanceIdentifier, - @Nonnull final FutureJVppCore vppApi, - NamingContext interfaceContext) { - this.lispInstanceIdentifier = checkNotNull(lispInstanceIdentifier, "Lisp identifier is null"); - this.vppApi = checkNotNull(vppApi, "VPP Api refference is null"); - this.interfaceContext = interfaceContext; - } - - protected AbstractLispWriterFactoryBase(@Nonnull final InstanceIdentifier<Lisp> lispInstanceIdentifier, - @Nonnull final FutureJVppCore vppApi, - NamingContext interfaceContext, - NamingContext locatorSetContext) { - this.lispInstanceIdentifier = checkNotNull(lispInstanceIdentifier, "Lisp identifier is null"); - this.vppApi = checkNotNull(vppApi, "VPP Api refference is null"); - this.interfaceContext = interfaceContext; - this.locatorSetContext = locatorSetContext; - } - - protected AbstractLispWriterFactoryBase(@Nonnull final InstanceIdentifier<Lisp> lispInstanceIdentifier, - @Nonnull final FutureJVppCore vppApi, - EidMappingContext localMappingContext, - EidMappingContext remoteMappingContext) { - this.lispInstanceIdentifier = checkNotNull(lispInstanceIdentifier, "Lisp identifier is null"); - this.vppApi = checkNotNull(vppApi, "VPP Api refference is null"); - this.localMappingContext = localMappingContext; - this.remoteMappingContext = remoteMappingContext; - } - - protected AbstractLispWriterFactoryBase(@Nonnull final InstanceIdentifier<Lisp> lispInstanceIdentifier, - @Nonnull final FutureJVppCore vppApi, - NamingContext interfaceContext, - NamingContext locatorSetContext, - EidMappingContext localMappingContext, - EidMappingContext remoteMappingContext) { - this.lispInstanceIdentifier = checkNotNull(lispInstanceIdentifier, "Lisp identifier is null"); - this.vppApi = checkNotNull(vppApi, "VPP Api refference is null"); - this.interfaceContext = interfaceContext; - this.locatorSetContext = locatorSetContext; - this.localMappingContext = localMappingContext; - this.remoteMappingContext = remoteMappingContext; - } - - protected AbstractLispWriterFactoryBase(@Nonnull final InstanceIdentifier<Lisp> lispInstanceIdentifier, - @Nonnull final FutureJVppCore vppApi, - NamingContext interfaceContext, - EidMappingContext localMappingContext, - EidMappingContext remoteMappingContext) { - this.lispInstanceIdentifier = checkNotNull(lispInstanceIdentifier, "Lisp identifier is null"); - this.vppApi = checkNotNull(vppApi, "VPP Api refference is null"); - this.interfaceContext = interfaceContext; - this.localMappingContext = localMappingContext; - this.remoteMappingContext = remoteMappingContext; - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LispWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LispWriterFactory.java deleted file mode 100755 index 055aa72b9..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LispWriterFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write.factory; - - -import static com.google.common.base.Preconditions.checkNotNull; -import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.ADJACENCIES_IDENTIFICATION_CONTEXT; -import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.INTERFACE_CONTEXT; -import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCAL_MAPPING_CONTEXT; -import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT; -import static io.fd.honeycomb.lisp.cfgattrs.LispConfiguration.REMOTE_MAPPING_CONTEXT; - -import com.google.inject.Inject; -import com.google.inject.name.Named; -import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext; -import io.fd.honeycomb.lisp.context.util.EidMappingContext; -import io.fd.honeycomb.lisp.translate.write.LispCustomizer; -import io.fd.honeycomb.lisp.translate.write.PitrCfgCustomizer; -import io.fd.honeycomb.translate.impl.write.GenericWriter; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -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.rev161214.Lisp; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.lisp.feature.data.grouping.LispFeatureData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.pitr.cfg.grouping.PitrCfg; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - - -/** - * Initialize writers for {@link Lisp} - */ -public final class LispWriterFactory extends AbstractLispWriterFactoryBase implements WriterFactory { - - private final NamingContext bridgeDomainContext; - private final AdjacenciesMappingContext adjacenciesMappingContext; - - @Inject - public LispWriterFactory(final FutureJVppCore vppApi, - @Named(INTERFACE_CONTEXT) final NamingContext interfaceContext, - @Named(LOCATOR_SET_CONTEXT) final NamingContext locatorSetContext, - @Named("bridge-domain-context") final NamingContext bridgeDomainContext, - @Named(LOCAL_MAPPING_CONTEXT) final EidMappingContext localMappingContext, - @Named(REMOTE_MAPPING_CONTEXT) final EidMappingContext remoteMappingContext, - @Named(ADJACENCIES_IDENTIFICATION_CONTEXT) final AdjacenciesMappingContext adjacenciesMappingContext) { - super(InstanceIdentifier.create(Lisp.class), vppApi, interfaceContext, locatorSetContext, localMappingContext, - remoteMappingContext); - this.bridgeDomainContext = checkNotNull(bridgeDomainContext, "Bridge domain context cannot be null"); - this.adjacenciesMappingContext = - checkNotNull(adjacenciesMappingContext, "Adjacencies mapping context cannot be null"); - } - - @Override - public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { - registry.add(new GenericWriter<>(lispInstanceIdentifier, new LispCustomizer(vppApi))); - - VniTableWriterFactory.newInstance(lispInstanceIdentifier, vppApi, localMappingContext, remoteMappingContext, - bridgeDomainContext, adjacenciesMappingContext) - .init(registry); - LocatorSetsWriterFactory.newInstance(lispInstanceIdentifier, vppApi, interfaceContext, locatorSetContext) - .init(registry); - MapResolversWriterFactory.newInstance(lispInstanceIdentifier, vppApi).init(registry); - - registry.add(new GenericWriter<>(lispInstanceIdentifier.child(LispFeatureData.class).child(PitrCfg.class), - new PitrCfgCustomizer(vppApi))); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LocatorSetsWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LocatorSetsWriterFactory.java deleted file mode 100755 index eabdfe27d..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/LocatorSetsWriterFactory.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write.factory; - -import io.fd.honeycomb.lisp.translate.write.InterfaceCustomizer; -import io.fd.honeycomb.lisp.translate.write.LocatorSetCustomizer; -import io.fd.honeycomb.translate.impl.write.GenericListWriter; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.Lisp; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.lisp.feature.data.grouping.LispFeatureData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.LocatorSets; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.locator.sets.LocatorSet; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.locator.sets.grouping.locator.sets.locator.set.Interface; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Factory producing writers for {@code LocatorSets} - */ -final class LocatorSetsWriterFactory extends AbstractLispWriterFactoryBase implements WriterFactory { - - private LocatorSetsWriterFactory(final InstanceIdentifier<Lisp> lispInstanceIdentifier, - final FutureJVppCore vppApi, - final NamingContext interfaceContext, - final NamingContext locatorSetContext) { - super(lispInstanceIdentifier, vppApi, interfaceContext, locatorSetContext); - } - - public static LocatorSetsWriterFactory newInstance( - @Nonnull final InstanceIdentifier<Lisp> lispInstanceIdentifier, - @Nonnull final FutureJVppCore vppApi, - @Nonnull final NamingContext interfaceContext, - @Nonnull final NamingContext locatorSetContext) { - return new LocatorSetsWriterFactory(lispInstanceIdentifier, vppApi, interfaceContext, locatorSetContext); - } - - @Override - public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { - InstanceIdentifier<LocatorSet> locatorSetId = - lispInstanceIdentifier.child(LispFeatureData.class).child(LocatorSets.class).child(LocatorSet.class); - - registry.add(new GenericListWriter<>(locatorSetId, new LocatorSetCustomizer(vppApi, locatorSetContext))); - registry.add(new GenericListWriter<>(locatorSetId.child(Interface.class), - new InterfaceCustomizer(vppApi, interfaceContext))); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/MapResolversWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/MapResolversWriterFactory.java deleted file mode 100755 index 0586f88cd..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/MapResolversWriterFactory.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write.factory; - - -import io.fd.honeycomb.lisp.translate.write.MapResolverCustomizer; -import io.fd.honeycomb.translate.impl.write.GenericListWriter; -import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.Lisp; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.lisp.feature.data.grouping.LispFeatureData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.map.resolvers.grouping.MapResolvers; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.map.resolvers.grouping.map.resolvers.MapResolver; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; - - -/** - * Factory responsible for producing writers for {@code MapResolvers} - */ -final class MapResolversWriterFactory extends AbstractLispWriterFactoryBase implements WriterFactory { - - private MapResolversWriterFactory(final InstanceIdentifier<Lisp> lispInstanceIdentifier, - final FutureJVppCore vppApi) { - super(lispInstanceIdentifier, vppApi, null); - } - - public static MapResolversWriterFactory newInstance( - @Nonnull final InstanceIdentifier<Lisp> lispInstanceIdentifier, - @Nonnull final FutureJVppCore vppApi) { - return new MapResolversWriterFactory(lispInstanceIdentifier, vppApi); - } - - @Override - public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { - registry.add(new GenericListWriter<>( - lispInstanceIdentifier.child(LispFeatureData.class).child(MapResolvers.class).child(MapResolver.class), - new MapResolverCustomizer(vppApi))); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/VniTableWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/VniTableWriterFactory.java deleted file mode 100755 index 9e9152ce0..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/factory/VniTableWriterFactory.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write.factory; - -import static com.google.common.base.Preconditions.checkNotNull; - -import com.google.common.collect.ImmutableSet; -import io.fd.honeycomb.lisp.context.util.AdjacenciesMappingContext; -import io.fd.honeycomb.lisp.context.util.EidMappingContext; -import io.fd.honeycomb.lisp.translate.write.AdjacencyCustomizer; -import io.fd.honeycomb.lisp.translate.write.BridgeDomainSubtableCustomizer; -import io.fd.honeycomb.lisp.translate.write.LocalMappingCustomizer; -import io.fd.honeycomb.lisp.translate.write.RemoteMappingCustomizer; -import io.fd.honeycomb.lisp.translate.write.VniTableCustomizer; -import io.fd.honeycomb.lisp.translate.write.VrfSubtableCustomizer; -import io.fd.honeycomb.translate.impl.write.GenericListWriter; -import io.fd.honeycomb.translate.impl.write.GenericWriter; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -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.rev161214.Lisp; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.adjacencies.grouping.Adjacencies; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.adjacencies.grouping.adjacencies.Adjacency; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.adjacencies.grouping.adjacencies.adjacency.LocalEid; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.adjacencies.grouping.adjacencies.adjacency.RemoteEid; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.LocalMappings; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.RemoteMappings; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.local.mappings.LocalMapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.RemoteMapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.locator.list.negative.mapping.MapReply; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.locator.list.positive.mapping.Rlocs; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.locator.list.positive.mapping.rlocs.Locator; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.EidTable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.vni.table.BridgeDomainSubtable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.vni.table.VrfSubtable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.lisp.feature.data.grouping.LispFeatureData; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - - -//TODO - HONEYCOMB-282 - refactor this and other factories for better readability - -/** - * Factory for producing writers for {@code EidTable} - */ -final class VniTableWriterFactory extends AbstractLispWriterFactoryBase implements WriterFactory { - - private final NamingContext bridgeDomainContext; - private final AdjacenciesMappingContext adjacenciesMappingContext; - - private VniTableWriterFactory(final InstanceIdentifier<Lisp> lispInstanceIdentifier, - final FutureJVppCore vppApi, - final EidMappingContext localMappingContext, - final EidMappingContext remoteMappingContext, - final NamingContext bridgeDomainContext, - final AdjacenciesMappingContext adjacenciesMappingContext) { - super(lispInstanceIdentifier, vppApi, localMappingContext, remoteMappingContext); - this.bridgeDomainContext = checkNotNull(bridgeDomainContext, "Bridge domain context cannot be null"); - this.adjacenciesMappingContext = - checkNotNull(adjacenciesMappingContext, "Adjacencies mapping context cannot be null"); - } - - public static VniTableWriterFactory newInstance( - @Nonnull final InstanceIdentifier<Lisp> lispInstanceIdentifier, - @Nonnull final FutureJVppCore vppApi, - @Nonnull final EidMappingContext localMappingContext, - @Nonnull final EidMappingContext remoteMappingContext, - @Nonnull final NamingContext bridgeDomainContext, - @Nonnull final AdjacenciesMappingContext adjacenciesMappingContext) { - return new VniTableWriterFactory(lispInstanceIdentifier, vppApi, localMappingContext, remoteMappingContext, - bridgeDomainContext, adjacenciesMappingContext); - } - - @Override - public void init(final ModifiableWriterRegistryBuilder registry) { - final InstanceIdentifier<VniTable> vniTableId = - lispInstanceIdentifier.child(LispFeatureData.class).child(EidTable.class).child(VniTable.class); - - final InstanceIdentifier<VrfSubtable> vrfSubtableId = vniTableId.child(VrfSubtable.class); - final InstanceIdentifier<BridgeDomainSubtable> bridgeDomainSubtableId = - vniTableId.child(BridgeDomainSubtable.class); - - registry.add(new GenericListWriter<>(vniTableId, new VniTableCustomizer(vppApi))); - - registry.add(new GenericWriter<>(vrfSubtableId, new VrfSubtableCustomizer(vppApi))); - registry.add(new GenericWriter<>(bridgeDomainSubtableId, - new BridgeDomainSubtableCustomizer(vppApi, bridgeDomainContext))); - - //VniTable - > VrfSubtable -> LocalMappings - > LocalMapping - final InstanceIdentifier<LocalMapping> localMappingSubtreeId = InstanceIdentifier.create(LocalMapping.class); - registry.subtreeAdd(ImmutableSet.of(localMappingSubtreeId - .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.local.mappings.local.mapping.Eid.class)), - new GenericListWriter<>( - vrfSubtableId.child(LocalMappings.class).child(LocalMapping.class), - new LocalMappingCustomizer(vppApi, localMappingContext))); - //VniTable - > BridgeDomainSubtable -> LocalMappings - > LocalMapping - registry.subtreeAdd(ImmutableSet.of(localMappingSubtreeId - .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.local.mappings.local.mapping.Eid.class)), - new GenericListWriter<>(bridgeDomainSubtableId.child(LocalMappings.class) - .child(LocalMapping.class), - new LocalMappingCustomizer(vppApi, localMappingContext))); - - //VniTable - > VrfSubtable -> RemoteMappings - > RemoteMapping - final InstanceIdentifier<RemoteMapping> remoteMappingSubtreeId = InstanceIdentifier.create(RemoteMapping.class); - registry.subtreeAdd(ImmutableSet.of(remoteMappingSubtreeId - .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.Eid.class), - remoteMappingSubtreeId.child(Rlocs.class), - remoteMappingSubtreeId.child(Rlocs.class).child(Locator.class), - remoteMappingSubtreeId.child(MapReply.class)), - new GenericListWriter<>( - vrfSubtableId.child(RemoteMappings.class).child(RemoteMapping.class), - new RemoteMappingCustomizer(vppApi, remoteMappingContext))); - //VniTable - > BridgeDomainSubtable -> RemoteMappings - > RemoteMapping - registry.subtreeAdd(ImmutableSet.of(remoteMappingSubtreeId - .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.Eid.class), - remoteMappingSubtreeId.child(Rlocs.class), - remoteMappingSubtreeId.child(Rlocs.class).child(Locator.class), - remoteMappingSubtreeId.child(MapReply.class)), - new GenericListWriter<>(bridgeDomainSubtableId.child(RemoteMappings.class) - .child(RemoteMapping.class), - new RemoteMappingCustomizer(vppApi, remoteMappingContext))); - - //VniTable - > VrfSubtable -> RemoteMappings - > RemoteMapping - > Adjacencies - > Adjacency - final InstanceIdentifier<Adjacency> adjacencySubtreeId = InstanceIdentifier.create(Adjacency.class); - registry.subtreeAdd(ImmutableSet.of(adjacencySubtreeId - .child(LocalEid.class), adjacencySubtreeId.child(RemoteEid.class)), - new GenericListWriter<>( - vrfSubtableId.child(RemoteMappings.class).child(RemoteMapping.class) - .child(Adjacencies.class).child(Adjacency.class), - new AdjacencyCustomizer(vppApi, localMappingContext, remoteMappingContext, - adjacenciesMappingContext))); - //VniTable - > BridgeDomainSubtable -> RemoteMappings - > RemoteMapping - > Adjacencies - > Adjacency - registry.subtreeAdd(ImmutableSet.of(adjacencySubtreeId - .child(LocalEid.class), adjacencySubtreeId.child(RemoteEid.class)), - new GenericListWriter<>( - bridgeDomainSubtableId.child(RemoteMappings.class) - .child(RemoteMapping.class) - .child(Adjacencies.class).child(Adjacency.class), - new AdjacencyCustomizer(vppApi, localMappingContext, remoteMappingContext, - adjacenciesMappingContext))); - } -} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriter.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriter.java deleted file mode 100644 index b00bfc09f..000000000 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/trait/SubtableWriter.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2016 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.honeycomb.lisp.translate.write.trait; - - -import static com.google.common.base.Preconditions.checkNotNull; - -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.VniTable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.vni.table.BridgeDomainSubtable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.eid.table.grouping.eid.table.vni.table.VrfSubtable; -import org.opendaylight.yangtools.yang.binding.ChildOf; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispEidTableAddDelMap; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import org.slf4j.Logger; - -/** - * Trait providing logic for writing subtables - */ -public interface SubtableWriter extends ByteDataTranslator, JvppReplyConsumer { - int DEFAULT_VNI = 0; - - /** - * Writes mapping from {@link VniTable} - * to {@link VrfSubtable} or - * {@link BridgeDomainSubtable} - * - * @param addDel true if add,delete otherwise - * @param vni {@link VniTable} ID - * @param tableId if <b>isL2</b> is true, than bridge domain subtable id,else vrf subtable id - * @param isL2 indicates whether (false) writing to L3 vrfSubtrable of (true) L2 bridgeDomainSubtrable - */ - default void addDelSubtableMapping(@Nonnull final FutureJVppCore vppApi, final boolean addDel, final int vni, - final int tableId, - final boolean isL2, - final Logger logger) throws TimeoutException, VppBaseCallException { - - if (vni == DEFAULT_VNI) { - // attempt to write subtable with default vni mapping(it does'nt make sense and it should'nt be possible) - // also allows to enable lisp without defining default mapping in request - logger.info("An attempt to write subtable[id = {}] with default vni {} was detected, ignoring write", - tableId, DEFAULT_VNI); - return; - } - - checkNotNull(vppApi, "VPP Api refference cannot be null"); - - LispEidTableAddDelMap request = new LispEidTableAddDelMap(); - - request.isAdd = booleanToByte(addDel); - request.vni = vni; - request.dpTable = tableId; - request.isL2 = booleanToByte(isL2); - - getReply(vppApi.lispEidTableAddDelMap(request).toCompletableFuture()); - } - - default int extractVni(@Nonnull final InstanceIdentifier<? extends ChildOf<VniTable>> id) { - return checkNotNull( - checkNotNull(id, "Identifier cannot be null").firstKeyOf(VniTable.class), - "Parent VNI id not defined").getVirtualNetworkIdentifier().intValue(); - } -} |