From 8e0c7007906730fe4547b0265a895ad8a322a7dc Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Thu, 10 Nov 2016 12:22:28 +0100 Subject: Remove hc2vpp codebase Moved to a dedicated hc2vpp project in fd.io Change-Id: I03dc3b3029f21b127a00c69a86bcd8e467896241 Signed-off-by: Maros Marsalek --- nsh/impl/asciidoc/Readme.adoc | 3 - nsh/impl/pom.xml | 130 ------------- .../io/fd/honeycomb/vppnsh/impl/VppNshModule.java | 73 ------- .../impl/config/NshEntryWriterCustomizer.java | 151 --------------- .../vppnsh/impl/config/NshMapWriterCustomizer.java | 138 ------------- .../vppnsh/impl/config/VppNshWriterFactory.java | 81 -------- .../vppnsh/impl/oper/NshEntryReaderCustomizer.java | 214 --------------------- .../vppnsh/impl/oper/NshMapReaderCustomizer.java | 205 -------------------- .../vppnsh/impl/oper/VppNshReaderFactory.java | 78 -------- .../vppnsh/impl/util/FutureJVppNshCustomizer.java | 44 ----- .../vppnsh/impl/util/JVppNshProvider.java | 60 ------ .../fd/honeycomb/vppnsh/impl/VppNshModuleTest.java | 111 ----------- .../impl/config/NshEntryWriterCustomizerTest.java | 185 ------------------ .../impl/config/NshMapWriterCustomizerTest.java | 181 ----------------- .../impl/oper/NshEntryReaderCustomizerTest.java | 154 --------------- .../impl/oper/NshMapReaderCustomizerTest.java | 146 -------------- 16 files changed, 1954 deletions(-) delete mode 100644 nsh/impl/asciidoc/Readme.adoc delete mode 100644 nsh/impl/pom.xml delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java delete mode 100755 nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java delete mode 100644 nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java delete mode 100644 nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java delete mode 100644 nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java delete mode 100644 nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java delete mode 100644 nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java (limited to 'nsh/impl') diff --git a/nsh/impl/asciidoc/Readme.adoc b/nsh/impl/asciidoc/Readme.adoc deleted file mode 100644 index 5c0fb4705..000000000 --- a/nsh/impl/asciidoc/Readme.adoc +++ /dev/null @@ -1,3 +0,0 @@ -= vppnsh-impl - -Overview of vppnsh-impl \ No newline at end of file diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml deleted file mode 100644 index 8cd0dabbb..000000000 --- a/nsh/impl/pom.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - io.fd.honeycomb.common - impl-parent - 1.16.12-SNAPSHOT - ../../common/impl-parent - - - 4.0.0 - io.fd.honeycomb.vppnsh - vppnsh-impl - ${project.artifactId} - 1.16.12-SNAPSHOT - bundle - - - 4.1.0 - 1.2.0 - - - - - ${project.groupId} - vppnsh-api - ${project.version} - - - - com.google.inject - guice - ${guice.version} - - - net.jmob - guice.conf - ${guice.config.version} - - - com.google.inject.extensions - guice-multibindings - ${guice.version} - - - com.google.inject.extensions - guice-testlib - test - - - org.hamcrest - hamcrest-all - test - - - - io.fd.honeycomb - translate-impl - ${project.version} - - - io.fd.honeycomb - translate-api - ${project.version} - - - io.fd.honeycomb - notification-api - ${project.version} - - - io.fd.honeycomb - cfg-init - ${project.version} - - - io.fd.vpp - jvpp-registry - 16.12-SNAPSHOT - - - io.fd.nsh_sfc - nsh-sfc - 16.12-SNAPSHOT - - - io.fd.honeycomb.vpp - vpp-translate-utils - ${project.version} - - - io.fd.honeycomb.vpp - vpp-translate-test - ${project.version} - - - io.fd.honeycomb - minimal-distribution - ${project.version} - - - io.fd.honeycomb.v3po - v3po2vpp - ${project.version} - - - junit - junit - test - - - org.mockito - mockito-core - test - - - diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java deleted file mode 100755 index 90c826dc7..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/VppNshModule.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl; - -import com.google.common.annotations.VisibleForTesting; -import com.google.inject.AbstractModule; -import com.google.inject.Provider; -import com.google.inject.Singleton; -import com.google.inject.multibindings.Multibinder; -import com.google.inject.name.Names; -import io.fd.honeycomb.translate.read.ReaderFactory; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.honeycomb.vppnsh.impl.config.VppNshWriterFactory; -import io.fd.honeycomb.vppnsh.impl.oper.VppNshReaderFactory; -import io.fd.honeycomb.vppnsh.impl.util.JVppNshProvider; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * This is some glue code necessary for Honeycomb distribution to pick up the plugin classes - */ -public final class VppNshModule extends AbstractModule { - - private static final Logger LOG = LoggerFactory.getLogger(VppNshModule.class); - private final Class> jvppNshProviderClass; - - public VppNshModule() { - this(JVppNshProvider.class); - } - @VisibleForTesting - VppNshModule(Class> jvppNshProvider) { - this.jvppNshProviderClass = jvppNshProvider; - } - - @Override - protected void configure() { - LOG.debug("Installing NSH module"); - - // Naming contexts - bind(NamingContext.class) - .annotatedWith(Names.named("nsh-entry-context")) - .toInstance(new NamingContext("nsh-entry-", "nsh-entry-context")); - - bind(NamingContext.class) - .annotatedWith(Names.named("nsh-map-context")) - .toInstance(new NamingContext("nsh-map-", "nsh-map-context")); - - // Bind to Plugin's JVPP. - bind(FutureJVppNsh.class).toProvider(jvppNshProviderClass).in(Singleton.class); - - // Below are classes picked up by HC framework - Multibinder.newSetBinder(binder(), WriterFactory.class).addBinding().to(VppNshWriterFactory.class); - Multibinder.newSetBinder(binder(), ReaderFactory.class).addBinding().to(VppNshReaderFactory.class); - LOG.info("Module NSH successfully configured"); - } -} diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java deleted file mode 100755 index 795e8b9ad..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizer.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl.config; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; - -import io.fd.honeycomb.translate.MappingContext; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -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 io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import java.util.concurrent.CompletionStage; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv4; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv6; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.MdType1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1Augment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Writer customizer responsible for NshEntry create/delete. - */ -public class NshEntryWriterCustomizer extends FutureJVppNshCustomizer - implements ListWriterCustomizer, ByteDataTranslator, JvppReplyConsumer { - - private static final Logger LOG = LoggerFactory.getLogger(NshEntryWriterCustomizer.class); - private final NamingContext nshEntryContext; - - public NshEntryWriterCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh, - @Nonnull final NamingContext nshEntryContext) { - super(futureJVppNsh); - this.nshEntryContext = checkNotNull(nshEntryContext, "nshEntryContext should not be null"); - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final NshEntry dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - LOG.debug("Creating nsh entry: iid={} dataAfter={}", id, dataAfter); - final int newEntryIndex = - nshAddDelEntry(true, id, dataAfter, ~0 /* value not present */, writeContext.getMappingContext()); - // Add nsh entry name <-> vpp index mapping to the naming context: - nshEntryContext.addName(newEntryIndex, dataAfter.getName(), writeContext.getMappingContext()); - LOG.debug("Successfully created nsh entry(id={]): iid={} dataAfter={}", newEntryIndex, id, dataAfter); - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final NshEntry dataBefore, @Nonnull final NshEntry dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new UnsupportedOperationException("Nsh entry update is not supported"); - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final NshEntry dataBefore, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - LOG.debug("Removing nsh entry: iid={} dataBefore={}", id, dataBefore); - final String entryName = dataBefore.getName(); - checkState(nshEntryContext.containsIndex(entryName, writeContext.getMappingContext()), - "Removing nsh entry {}, but index could not be found in the nsh entry context", entryName); - - final int entryIndex = nshEntryContext.getIndex(entryName, writeContext.getMappingContext()); - nshAddDelEntry(false, id, dataBefore, entryIndex, writeContext.getMappingContext()); - - // Remove deleted interface from interface context: - nshEntryContext.removeName(dataBefore.getName(), writeContext.getMappingContext()); - LOG.debug("Successfully removed nsh entry(id={]): iid={} dataAfter={}", entryIndex, id, dataBefore); - } - - private int nshAddDelEntry(final boolean isAdd, @Nonnull final InstanceIdentifier id, - @Nonnull final NshEntry entry, final int entryId, final MappingContext ctx) - throws WriteFailedException { - final CompletionStage createNshEntryReplyCompletionStage = - getFutureJVppNsh().nshAddDelEntry(getNshAddDelEntryRequest(isAdd, entryId, entry, ctx)); - - final NshAddDelEntryReply reply = - getReplyForWrite(createNshEntryReplyCompletionStage.toCompletableFuture(), id); - return reply.entryIndex; - - } - - private void getNshEntryMdType1Request(@Nonnull final NshEntry entry, - @Nonnull NshAddDelEntry request) { - final NshMdType1Augment nshMdType1Augment = entry.getAugmentation(NshMdType1Augment.class); - if (nshMdType1Augment != null) { - request.c1 = (int) nshMdType1Augment.getC1().longValue(); - request.c2 = (int) nshMdType1Augment.getC2().longValue(); - request.c3 = (int) nshMdType1Augment.getC3().longValue(); - request.c4 = (int) nshMdType1Augment.getC4().longValue(); - } - } - - private NshAddDelEntry getNshAddDelEntryRequest(final boolean isAdd, final int entryIndex, - @Nonnull final NshEntry entry, - @Nonnull final MappingContext ctx) { - final NshAddDelEntry request = new NshAddDelEntry(); - request.isAdd = booleanToByte(isAdd); - - request.verOC = (byte) entry.getVersion().shortValue(); - request.length = (byte) entry.getLength().intValue(); - if (entry.getNextProtocol() == Ipv4.class) { - request.nextProtocol = 1; - } else if (entry.getNextProtocol() == Ipv6.class) { - request.nextProtocol = 2; - } else if (entry.getNextProtocol() == Ethernet.class) { - request.nextProtocol = 3; - } else { - request.nextProtocol = 0; - } - - if (entry.getMdType() == MdType1.class) { - request.mdType = 1; - getNshEntryMdType1Request(entry, request); - } else if (entry.getMdType() == MdType1.class) { - request.mdType = 2; - } else { - request.mdType = 0; - } - - request.nspNsi = (entry.getNsp().intValue() << 8) | entry.getNsi(); - - return request; - } -} diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java deleted file mode 100755 index 701475936..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizer.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl.config; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; - -import io.fd.honeycomb.translate.MappingContext; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -import io.fd.honeycomb.translate.vpp.util.ByteDataTranslator; -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 io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import java.util.concurrent.CompletionStage; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Pop; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Push; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Swap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Writer customizer responsible for NshMap create/delete. - */ -public class NshMapWriterCustomizer extends FutureJVppNshCustomizer - implements ListWriterCustomizer, ByteDataTranslator, JvppReplyConsumer { - - private static final Logger LOG = LoggerFactory.getLogger(NshMapWriterCustomizer.class); - private final NamingContext nshMapContext; - private final NamingContext interfaceContext; - - public NshMapWriterCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh, - @Nonnull final NamingContext nshMapContext, - @Nonnull final NamingContext interfaceContext) { - super(futureJVppNsh); - this.nshMapContext = checkNotNull(nshMapContext, "nshMapContext should not be null"); - this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null"); - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final NshMap dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - LOG.debug("Creating nsh map: iid={} dataAfter={}", id, dataAfter); - final int newMapIndex = - nshAddDelMap(true, id, dataAfter, ~0 /* value not present */, writeContext.getMappingContext()); - - // Add nsh map name <-> vpp index mapping to the naming context: - nshMapContext.addName(newMapIndex, dataAfter.getName(), writeContext.getMappingContext()); - LOG.debug("Successfully created nsh map(id={]): iid={} dataAfter={}", newMapIndex, id, dataAfter); - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final NshMap dataBefore, @Nonnull final NshMap dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new UnsupportedOperationException("Nsh map update is not supported"); - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final NshMap dataBefore, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - LOG.debug("Removing nsh map: iid={} dataBefore={}", id, dataBefore); - final String mapName = dataBefore.getName(); - checkState(nshMapContext.containsIndex(mapName, writeContext.getMappingContext()), - "Removing nsh map {}, but index could not be found in the nsh map context", mapName); - - final int mapIndex = nshMapContext.getIndex(mapName, writeContext.getMappingContext()); - nshAddDelMap(false, id, dataBefore, mapIndex, writeContext.getMappingContext()); - - // Remove deleted interface from interface context: - nshMapContext.removeName(dataBefore.getName(), writeContext.getMappingContext()); - LOG.debug("Successfully removed nsh map(id={]): iid={} dataAfter={}", mapIndex, id, dataBefore); - } - - private int nshAddDelMap(final boolean isAdd, @Nonnull final InstanceIdentifier id, - @Nonnull final NshMap map, final int mapId, final MappingContext ctx) - throws WriteFailedException { - final CompletionStage createNshMapReplyCompletionStage = - getFutureJVppNsh().nshAddDelMap(getNshAddDelMapRequest(isAdd, mapId, map, ctx)); - - final NshAddDelMapReply reply = getReplyForWrite(createNshMapReplyCompletionStage.toCompletableFuture(), id); - return reply.mapIndex; - - } - - private NshAddDelMap getNshAddDelMapRequest(final boolean isAdd, final int mapIndex, - @Nonnull final NshMap map, - @Nonnull final MappingContext ctx) { - final NshAddDelMap request = new NshAddDelMap(); - request.isAdd = booleanToByte(isAdd); - - request.nspNsi = (map.getNsp().intValue() << 8) | map.getNsi(); - request.mappedNspNsi = (map.getMappedNsp().intValue() << 8) | map.getMappedNsi(); - - if (map.getNshAction() == Swap.class) { - request.nshAction = 0; - } else if (map.getNshAction() == Push.class) { - request.nshAction = 1; - } else if (map.getNshAction() == Pop.class) { - request.nshAction = 2; - } - - if (map.getEncapType() == VxlanGpe.class) { - request.nextNode = 2; - } - - checkState(interfaceContext.containsIndex(map.getEncapIfName(), ctx), - "Mapping does not contains mapping for provider interface Name ".concat(map.getEncapIfName())); - request.swIfIndex = interfaceContext.getIndex(map.getEncapIfName(), ctx); - - return request; - } -} diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java deleted file mode 100755 index 61c442e18..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/config/VppNshWriterFactory.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl.config; - -import com.google.common.collect.Sets; -import com.google.inject.Inject; -import com.google.inject.name.Named; -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 io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1Augment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType2Augment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNsh; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshEntries; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshMaps; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class VppNshWriterFactory implements WriterFactory { - - @Nonnull - private final FutureJVppNsh jvppNsh; - private final NamingContext nshEntryContext; - private final NamingContext nshMapContext; - private final NamingContext interfaceContext; - - @Inject - public VppNshWriterFactory(@Nonnull final FutureJVppNsh jvppNsh, - @Named("nsh-entry-context") @Nonnull final NamingContext nshEntryContext, - @Named("nsh-map-context") @Nonnull final NamingContext nshMapContext, - @Named("interface-context") @Nonnull final NamingContext interfaceContext) { - this.jvppNsh = jvppNsh; - this.nshEntryContext = nshEntryContext; - this.nshMapContext = nshMapContext; - this.interfaceContext = interfaceContext; - } - - @Override - public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { - // WriterFactory is intended for registering Writers into HC framework - // Writers handle ONLY config (config "true") data coming from upper layers and propagate them into lower layer/device - // they are triggered when RESTCONF PUT/POST on config is invoked or when NETCONF edit-config + commit operation is executed - - // VppNsh has no handlers - // NshEntries has no handlers - // NshEntry = - final InstanceIdentifier nshEntriesId = InstanceIdentifier.create(VppNsh.class).child(NshEntries.class); - final InstanceIdentifier nshEntryId = nshEntriesId.child(NshEntry.class); - registry.subtreeAdd( - Sets.newHashSet( - InstanceIdentifier.create(NshEntry.class).augmentation(NshMdType1Augment.class), - InstanceIdentifier.create(NshEntry.class).augmentation(NshMdType2Augment.class)), - new GenericListWriter<>(nshEntryId, new NshEntryWriterCustomizer(jvppNsh, nshEntryContext))); - - // VppNsh has no handlers - // NshMaps has no handlers - // NshMap = - final InstanceIdentifier nshMapId = - InstanceIdentifier.create(VppNsh.class).child(NshMaps.class).child(NshMap.class); - registry.add(new GenericListWriter<>(nshMapId, new NshMapWriterCustomizer(jvppNsh, nshMapContext, interfaceContext))); - - } -} diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java deleted file mode 100755 index 066fb103d..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizer.java +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl.oper; - -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; - -import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.honeycomb.translate.spi.read.Initialized; -import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CompletionStage; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv4; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv6; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.MdType1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1StateAugment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1StateAugmentBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNsh; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntriesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntryBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntryKey; -import org.opendaylight.yangtools.concepts.Builder; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Reader customizer responsible for nsh entry read.
to VPP. - */ -public class NshEntryReaderCustomizer extends FutureJVppNshCustomizer - implements InitializingListReaderCustomizer, JvppReplyConsumer { - - private static final Logger LOG = LoggerFactory.getLogger(NshEntryReaderCustomizer.class); - private final NamingContext nshEntryContext; - - public NshEntryReaderCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh, - @Nonnull final NamingContext nshEntryContext) { - super(futureJVppNsh); - this.nshEntryContext = checkNotNull(nshEntryContext, "nshEntryContext should not be null"); - } - - @Override - public void merge(@Nonnull final Builder builder, - @Nonnull final List readData) { - ((NshEntriesBuilder) builder).setNshEntry(readData); - } - - @Nonnull - @Override - public NshEntryBuilder getBuilder(@Nonnull final InstanceIdentifier id) { - return new NshEntryBuilder(); - } - - private void setNshEntryMdType1Augment(@Nonnull final NshEntryBuilder builder, - @Nonnull NshEntryDetails nshEntryDetails) { - final NshMdType1StateAugmentBuilder augmentBuilder = new NshMdType1StateAugmentBuilder(); - augmentBuilder.setC1((long) nshEntryDetails.c1); - augmentBuilder.setC2((long) nshEntryDetails.c2); - augmentBuilder.setC3((long) nshEntryDetails.c3); - augmentBuilder.setC4((long) nshEntryDetails.c4); - - builder.addAugmentation(NshMdType1StateAugment.class, augmentBuilder.build()); - } - - @Override - public void readCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final NshEntryBuilder builder, @Nonnull final ReadContext ctx) - throws ReadFailedException { - LOG.debug("Reading attributes for nsh entry: {}", id); - final NshEntryKey key = id.firstKeyOf(NshEntry.class); - checkArgument(key != null, "could not find NshEntry key in {}", id); - final NshEntryDump request = new NshEntryDump(); - - final String entryName = key.getName(); - if (!nshEntryContext.containsIndex(entryName, ctx.getMappingContext())) { - LOG.debug("Could not find nsh entry {} in the naming context", entryName); - return; - } - request.entryIndex = nshEntryContext.getIndex(entryName, ctx.getMappingContext()); - - final CompletionStage nshEntryDetailsReplyDumpCompletionStage = - getFutureJVppNsh().nshEntryDump(request); - final NshEntryDetailsReplyDump reply = - getReplyForRead(nshEntryDetailsReplyDumpCompletionStage.toCompletableFuture(), id); - - if (reply == null || reply.nshEntryDetails == null || reply.nshEntryDetails.isEmpty()) { - LOG.debug("Has no Nsh Entry {} in VPP. ", key.getName()); - return; - } - - LOG.trace("Nsh Entry : {} attributes returned from VPP: {}", key.getName(), reply); - - final NshEntryDetails nshEntryDetails = reply.nshEntryDetails.get(0); - builder.setName(entryName); - builder.setKey(key); - builder.setVersion((short) nshEntryDetails.verOC); - builder.setLength((short) nshEntryDetails.length); - - switch (nshEntryDetails.nextProtocol) { - case 1: - builder.setNextProtocol(Ipv4.class); - break; - case 2: - builder.setNextProtocol(Ipv6.class); - break; - case 3: - builder.setNextProtocol(Ethernet.class); - break; - default: - LOG.trace("Unsupported next protocol for nsh entry: {}", nshEntryDetails.nextProtocol); - return; - } - - switch (nshEntryDetails.mdType) { - case 1: { - builder.setMdType(MdType1.class); - setNshEntryMdType1Augment(builder, nshEntryDetails); - break; - } - case 2: { - builder.setMdType(MdType1.class); - break; - } - default: - LOG.trace("Unsupported Mdtype for nsh entry: {}", nshEntryDetails.mdType); - return; - } - - builder.setNsp((long) ((nshEntryDetails.nspNsi >> 8) & 0xFFFFFF)); - builder.setNsi((short) (nshEntryDetails.nspNsi & 0xFF)); - - if (LOG.isTraceEnabled()) { - LOG.trace("Attributes for nsh entry {} successfully read: {}", id, builder.build()); - } - } - - @Nonnull - @Override - public List getAllIds(@Nonnull final InstanceIdentifier id, - @Nonnull final ReadContext context) throws ReadFailedException { - LOG.debug("Reading list of keys for nsh entry: {}", id); - - final NshEntryDump request = new NshEntryDump(); - request.entryIndex = -1; // dump call - - NshEntryDetailsReplyDump reply; - try { - reply = getFutureJVppNsh().nshEntryDump(request).toCompletableFuture().get(); - } catch (Exception e) { - throw new IllegalStateException("Nsh Entry dump failed", e); - } - - if (reply == null || reply.nshEntryDetails == null) { - return Collections.emptyList(); - } - - final int nIdsLength = reply.nshEntryDetails.size(); - LOG.debug("vppstate.NshEntryCustomizer.getAllIds: nIds.length={}", nIdsLength); - if (nIdsLength == 0) { - return Collections.emptyList(); - } - - final List allIds = new ArrayList<>(nIdsLength); - for (NshEntryDetails detail : reply.nshEntryDetails) { - final String nshName = nshEntryContext.getName(detail.entryIndex, context.getMappingContext()); - LOG.debug("vppstate.NshEntryCustomizer.getAllIds: nName={}", nshName); - allIds.add(new NshEntryKey(nshName)); - } - - return allIds; - } - - @Override - public Initialized init( - @Nonnull final InstanceIdentifier id, @Nonnull final NshEntry readValue, - @Nonnull final ReadContext ctx) { - return Initialized.create( - InstanceIdentifier.create(VppNsh.class).child( - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshEntries.class).child( - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry.class, - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryKey(id.firstKeyOf(NshEntry.class).getName())), - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryBuilder(readValue) - .setName(readValue.getName()) - .build()); - } -} diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java deleted file mode 100755 index 75ff21f27..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl.oper; - -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 io.fd.honeycomb.translate.read.ReadContext; -import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.honeycomb.translate.spi.read.Initialized; -import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; -import io.fd.honeycomb.translate.vpp.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetails; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshMapDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CompletionStage; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Pop; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Push; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Swap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNsh; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMapsBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapKey; -import org.opendaylight.yangtools.concepts.Builder; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Reader customizer responsible for nsh map read.
to VPP. - */ -public class NshMapReaderCustomizer extends FutureJVppNshCustomizer - implements InitializingListReaderCustomizer, JvppReplyConsumer { - - private static final Logger LOG = LoggerFactory.getLogger(NshMapReaderCustomizer.class); - private final NamingContext nshMapContext; - private final NamingContext interfaceContext; - - public NshMapReaderCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh, - @Nonnull final NamingContext nshMapContext, - @Nonnull final NamingContext interfaceContext) { - super(futureJVppNsh); - this.nshMapContext = checkNotNull(nshMapContext, "nshMapContext should not be null"); - this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null"); - } - - - @Override - public void merge(@Nonnull final Builder builder, - @Nonnull final List readData) { - ((NshMapsBuilder) builder).setNshMap(readData); - } - - @Nonnull - @Override - public NshMapBuilder getBuilder(@Nonnull final InstanceIdentifier id) { - return new NshMapBuilder(); - } - - @Override - public void readCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final NshMapBuilder builder, @Nonnull final ReadContext ctx) - throws ReadFailedException { - LOG.debug("Reading attributes for nsh map: {}", id); - final NshMapKey key = id.firstKeyOf(NshMap.class); - checkArgument(key != null, "could not find NshMap key in {}", id); - final NshMapDump request = new NshMapDump(); - - final String mapName = key.getName(); - if (!nshMapContext.containsIndex(mapName, ctx.getMappingContext())) { - LOG.debug("Could not find nsh map {} in the naming context", mapName); - return; - } - request.mapIndex = nshMapContext.getIndex(mapName, ctx.getMappingContext()); - - final CompletionStage nshMapDetailsReplyDumpCompletionStage = - getFutureJVppNsh().nshMapDump(request); - final NshMapDetailsReplyDump reply = - getReplyForRead(nshMapDetailsReplyDumpCompletionStage.toCompletableFuture(), id); - - if (reply == null || reply.nshMapDetails == null || reply.nshMapDetails.isEmpty()) { - LOG.debug("Has no Nsh Map {} in VPP. ", key.getName()); - return; - } - - LOG.trace("Nsh Map : {} attributes returned from VPP: {}", key.getName(), reply); - - final NshMapDetails nshMapDetails = reply.nshMapDetails.get(0); - builder.setName(mapName); - builder.setKey(key); - - builder.setNsp((long) ((nshMapDetails.nspNsi >> 8) & 0xFFFFFF)); - builder.setNsi((short) (nshMapDetails.nspNsi & 0xFF)); - - builder.setMappedNsp((long) ((nshMapDetails.mappedNspNsi >> 8) & 0xFFFFFF)); - builder.setMappedNsi((short) (nshMapDetails.mappedNspNsi & 0xFF)); - - switch (nshMapDetails.nshAction) { - case 0: - builder.setNshAction(Swap.class); - break; - case 1: - builder.setNshAction(Push.class); - break; - case 2: - builder.setNshAction(Pop.class); - break; - default: - LOG.trace("Unsupported nsh_action for nsh map: {}", nshMapDetails.nshAction); - return; - } - - switch (nshMapDetails.nextNode) { - case 2: - builder.setEncapType(VxlanGpe.class); - break; - default: - LOG.trace("Unsupported encap type for nsh map: {}", nshMapDetails.nextNode); - return; - } - - checkState(interfaceContext.containsName(nshMapDetails.swIfIndex, ctx.getMappingContext()), - "Mapping does not contains mapping for provider interface Index "); - final String interfaceName = interfaceContext.getName(nshMapDetails.swIfIndex, ctx.getMappingContext()); - builder.setEncapIfName(interfaceName); - - if (LOG.isTraceEnabled()) { - LOG.trace("Attributes for nsh map {} successfully read: {}", id, builder.build()); - } - } - - @Nonnull - @Override - public List getAllIds(@Nonnull final InstanceIdentifier id, - @Nonnull final ReadContext context) throws ReadFailedException { - LOG.debug("Reading list of keys for nsh map: {}", id); - - final NshMapDump request = new NshMapDump(); - request.mapIndex = -1; // dump call - - NshMapDetailsReplyDump reply; - try { - reply = getFutureJVppNsh().nshMapDump(request).toCompletableFuture().get(); - } catch (Exception e) { - throw new IllegalStateException("Nsh Map dump failed", e); - } - - if (reply == null || reply.nshMapDetails == null) { - return Collections.emptyList(); - } - - final int nIdsLength = reply.nshMapDetails.size(); - LOG.debug("vppstate.NshMapCustomizer.getAllIds: nIds.length={}", nIdsLength); - if (nIdsLength == 0) { - return Collections.emptyList(); - } - - final List allIds = new ArrayList<>(nIdsLength); - for (NshMapDetails detail : reply.nshMapDetails) { - final String nshName = nshMapContext.getName(detail.mapIndex, context.getMappingContext()); - LOG.debug("vppstate.NshMapCustomizer.getAllIds: nName={}", nshName); - allIds.add(new NshMapKey(nshName)); - } - - return allIds; - } - - @Override - public Initialized init( - @Nonnull final InstanceIdentifier id, - @Nonnull final NshMap readValue, - @Nonnull final ReadContext ctx) { - return Initialized.create( - InstanceIdentifier.create(VppNsh.class).child( - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshMaps.class).child( - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap.class, - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapKey(id.firstKeyOf(NshMap.class).getName())), - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapBuilder(readValue).setName(readValue.getName()).build()); - } -} diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java deleted file mode 100755 index 5eb54669a..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/VppNshReaderFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl.oper; - -import com.google.inject.Inject; -import com.google.inject.name.Named; -import io.fd.honeycomb.translate.impl.read.GenericInitListReader; -import io.fd.honeycomb.translate.read.ReaderFactory; -import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNshState; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNshStateBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntries; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntriesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMaps; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMapsBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMap; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class VppNshReaderFactory implements ReaderFactory { - - private final FutureJVppNsh jvppNsh; - private final NamingContext nshEntryContext; - private final NamingContext nshMapContext; - private final NamingContext interfaceContext; - - @Inject - public VppNshReaderFactory(final FutureJVppNsh jvppNsh, - @Named("nsh-entry-context") final NamingContext nshEntryContext, - @Named("nsh-map-context") final NamingContext nshMapContext, - @Named("interface-context") @Nonnull final NamingContext interfaceContext) { - this.jvppNsh = jvppNsh; - this.nshEntryContext = nshEntryContext; - this.nshMapContext = nshMapContext; - this.interfaceContext = interfaceContext; - } - @Override - public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) { - // ReaderFactory is intended for registering Readers into HC framework - // Readers provide ONLY operational (config "false") data straight from underlying device/layer - // they are triggered when RESTCONF GET on operational is invoked or when NETCONF get operation is executed - - // VppNshState(Structural) - final InstanceIdentifier vppNshStateId = InstanceIdentifier.create(VppNshState.class); - registry.addStructuralReader(vppNshStateId, VppNshStateBuilder.class); - - // NshENtries(Structural) - final InstanceIdentifier nshEntriesId = vppNshStateId.child(NshEntries.class); - registry.addStructuralReader(nshEntriesId, NshEntriesBuilder.class); - // NshENtry - final InstanceIdentifier nshEntryId = nshEntriesId.child(NshEntry.class); - registry.add(new GenericInitListReader<>(nshEntryId, new NshEntryReaderCustomizer(jvppNsh, nshEntryContext))); - - // NshMaps(Structural) - final InstanceIdentifier nshMapsId = vppNshStateId.child(NshMaps.class); - registry.addStructuralReader(nshMapsId, NshMapsBuilder.class); - // NshMap - final InstanceIdentifier nshMapId = nshMapsId.child(NshMap.class); - registry.add(new GenericInitListReader<>(nshMapId, new NshMapReaderCustomizer(jvppNsh, nshMapContext, interfaceContext))); - } -} diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java deleted file mode 100755 index f9b0b3b98..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/FutureJVppNshCustomizer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl.util; - -import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import javax.annotation.Nonnull; - -/** - * Abstract utility to hold the NshApi reference. - */ -@Beta -public abstract class FutureJVppNshCustomizer { - - private final FutureJVppNsh futureJVppNsh; - - public FutureJVppNshCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh) { - this.futureJVppNsh = Preconditions.checkNotNull(futureJVppNsh, "futureJVppNsh should not be null"); - } - - /** - * Get NshApi reference - * - * @return NshApi reference - */ - public FutureJVppNsh getFutureJVppNsh() { - return futureJVppNsh; - } -} diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java deleted file mode 100755 index 6778bae2a..000000000 --- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/util/JVppNshProvider.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016 Intel and 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.vppnsh.impl.util; - -import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.nsh.JVppNshImpl; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; -import java.io.IOException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Provides future API for jvpp-nsh plugin. Must be a singleton due to shutdown hook usage. - * Registers shutdown hook to free plugin's resources on shutdown. - */ -public final class JVppNshProvider extends ProviderTrait { - - private static final Logger LOG = LoggerFactory.getLogger(JVppNshProvider.class); - - @Inject - private JVppRegistry registry; - - @Override - protected FutureJVppNshFacade create() { - try { - final JVppNshImpl jVppNsh = new JVppNshImpl(); - // Free jvpp-nsh plugin's resources on shutdown - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - LOG.info("Unloading jvpp-nsh plugin"); - jVppNsh.close(); - LOG.info("Successfully unloaded jvpp-nsh plugin"); - } - }); - - LOG.info("Successfully loaded jvpp-nsh plugin"); - return new FutureJVppNshFacade(registry, jVppNsh); - } catch (IOException e) { - throw new IllegalStateException("Unable to open VPP management connection", e); - } - } -} - diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java deleted file mode 100644 index 0da2c1bc4..000000000 --- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/VppNshModuleTest.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2016 Intel 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.vppnsh.impl; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.empty; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.MockitoAnnotations.initMocks; - -import com.google.inject.Guice; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.name.Named; -import com.google.inject.testing.fieldbinder.Bind; -import com.google.inject.testing.fieldbinder.BoundFieldModule; -import io.fd.honeycomb.translate.read.ReaderFactory; -import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder; -import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.vpp.jvpp.JVppRegistry; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNshFacade; -import java.util.HashSet; -import java.util.Set; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; - -public class VppNshModuleTest { - - @Named("honeycomb-context") - @Bind - @Mock - private DataBroker honeycombContext; - - @Named("honeycomb-initializer") - @Bind - @Mock - private DataBroker honeycombInitializer; - - @Named("interface-context") - @Bind - private NamingContext interfaceContext; - - @Bind - @Mock - private JVppRegistry registry; - - @Inject - private Set readerFactories = new HashSet<>(); - - @Inject - private Set writerFactories = new HashSet<>(); - - @Before - public void setUp() throws Exception { - - initMocks(this); - - interfaceContext = new NamingContext("interface-", "interface-context"); - - Guice.createInjector(new VppNshModule(MockJVppNshProvider.class), BoundFieldModule.of(this)).injectMembers(this); - } - - @Test - public void testReaderFactories() throws Exception { - assertThat(readerFactories, is(not(empty()))); - - // Test registration process (all dependencies present, topological order of readers does exist, etc.) - final CompositeReaderRegistryBuilder registryBuilder = new CompositeReaderRegistryBuilder(); - readerFactories.forEach(factory -> factory.init(registryBuilder)); - assertNotNull(registryBuilder.build()); - } - - @Test - public void testWriterFactories() throws Exception { - assertThat(writerFactories, is(not(empty()))); - - // Test registration process (all dependencies present, topological order of writers does exist, etc.) - final FlatWriterRegistryBuilder registryBuilder = new FlatWriterRegistryBuilder(); - writerFactories.forEach(factory -> factory.init(registryBuilder)); - assertNotNull(registryBuilder.build()); - } - - private static final class MockJVppNshProvider implements Provider { - - @Override - public FutureJVppNshFacade get() { - return mock(FutureJVppNshFacade.class); - } - } -} - diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java deleted file mode 100644 index 23f861073..000000000 --- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshEntryWriterCustomizerTest.java +++ /dev/null @@ -1,185 +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.vppnsh.impl.config; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.verify; - -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntry; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelEntryReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import org.junit.Test; -import org.mockito.Mock; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.MdType1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1Augment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1AugmentBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshEntries; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.entries.NshEntryKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class NshEntryWriterCustomizerTest extends WriterCustomizerTest { - - private static final String ENTRY_CTX_NAME = "nsh-entry-instance"; - private static final int ENTRY_INDEX = 1; - private static final String ENTRY_NAME = "entry1"; - - @Mock - protected FutureJVppNsh jvppNsh; - - private NamingContext nshContext; - - private NshEntryWriterCustomizer customizer; - - @Override - public void setUp() throws Exception { - nshContext = new NamingContext("nsh_entry", ENTRY_CTX_NAME); - defineMapping(mappingContext, ENTRY_NAME, ENTRY_INDEX, ENTRY_CTX_NAME); - - customizer = new NshEntryWriterCustomizer(jvppNsh, nshContext); - } - - private static NshEntry generateNshEntry(final String name) { - final NshEntryBuilder builder = new NshEntryBuilder(); - builder.setName(name); - builder.setKey(new NshEntryKey(name)); - builder.setVersion((short) 0); - builder.setLength((short) 6); - builder.setMdType(MdType1.class); - builder.setNextProtocol(Ethernet.class); - builder.setNsp(123L); - builder.setNsi((short) 4); - - final NshMdType1AugmentBuilder augmentBuilder = new NshMdType1AugmentBuilder(); - augmentBuilder.setC1((long) 1); - augmentBuilder.setC2((long) 2); - augmentBuilder.setC3((long) 3); - augmentBuilder.setC4((long) 4); - builder.addAugmentation(NshMdType1Augment.class, augmentBuilder.build()); - - return builder.build(); - } - - private static InstanceIdentifier getNshEntryId(final String name) { - return InstanceIdentifier.create(NshEntries.class) - .child(NshEntry.class, new NshEntryKey(name)); - } - - private void whenNshAddDelEntryThenSuccess() { - final NshAddDelEntryReply reply = new NshAddDelEntryReply(); - reply.entryIndex = ENTRY_INDEX; - doReturn(future(reply)).when(jvppNsh).nshAddDelEntry(any(NshAddDelEntry.class)); - } - - private void whenNshAddDelEntryThenFailure() { - doReturn(failedFuture()).when(jvppNsh).nshAddDelEntry(any(NshAddDelEntry.class)); - } - - private static NshAddDelEntry generateNshAddDelEntry(final byte isAdd) { - final NshAddDelEntry request = new NshAddDelEntry(); - request.isAdd = isAdd; - request.verOC = 0; - request.length = 6; - request.mdType = 1; - request.nextProtocol = 3; - request.nspNsi = 123<<8 | 4; - request.c1 = 1; - request.c2 = 2; - request.c3 = 3; - request.c4 = 4; - - return request; - } - - @Test - public void testCreate() throws Exception { - final NshEntry nshEntry = generateNshEntry(ENTRY_NAME); - final InstanceIdentifier id = getNshEntryId(ENTRY_NAME); - - whenNshAddDelEntryThenSuccess(); - - customizer.writeCurrentAttributes(id, nshEntry, writeContext); - - verify(jvppNsh).nshAddDelEntry(generateNshAddDelEntry((byte) 1)); - - } - - @Test - public void testCreateFailed() throws Exception { - final NshEntry nshEntry = generateNshEntry(ENTRY_NAME); - final InstanceIdentifier id = getNshEntryId(ENTRY_NAME); - - whenNshAddDelEntryThenFailure(); - - try { - customizer.writeCurrentAttributes(id, nshEntry, writeContext); - } catch (WriteFailedException e) { - assertTrue(e.getCause() instanceof VppBaseCallException); - verify(jvppNsh).nshAddDelEntry(generateNshAddDelEntry((byte) 1)); - - return; - } - fail("WriteFailedException.CreateFailedException was expected"); - } - - @Test - public void testDelete() throws Exception { - final NshEntry nshEntry = generateNshEntry(ENTRY_NAME); - final InstanceIdentifier id = getNshEntryId(ENTRY_NAME); - - whenNshAddDelEntryThenSuccess(); - - customizer.deleteCurrentAttributes(id, nshEntry, writeContext); - - verify(jvppNsh).nshAddDelEntry(generateNshAddDelEntry((byte) 0)); - } - - @Test - public void testDeleteFailed() throws Exception { - final NshEntry nshEntry = generateNshEntry(ENTRY_NAME); - final InstanceIdentifier id = getNshEntryId(ENTRY_NAME); - - whenNshAddDelEntryThenFailure(); - - try { - customizer.deleteCurrentAttributes(id, nshEntry, writeContext); - } catch (WriteFailedException e) { - assertTrue(e.getCause() instanceof VppBaseCallException); - verify(jvppNsh).nshAddDelEntry(generateNshAddDelEntry((byte) 0)); - return; - } - fail("WriteFailedException.DeleteFailedException was expected"); - - customizer.deleteCurrentAttributes(id, nshEntry, writeContext); - } - - @Test(expected = UnsupportedOperationException.class) - public void testUpdate() throws Exception { - final NshEntry nshEntryBefore = generateNshEntry(ENTRY_NAME); - final InstanceIdentifier id = getNshEntryId(ENTRY_NAME); - customizer.updateCurrentAttributes(id, nshEntryBefore, new NshEntryBuilder().build(), writeContext); - } -} \ No newline at end of file diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java deleted file mode 100644 index 39297d427..000000000 --- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/config/NshMapWriterCustomizerTest.java +++ /dev/null @@ -1,181 +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.vppnsh.impl.config; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.verify; - -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMap; -import io.fd.vpp.jvpp.nsh.dto.NshAddDelMapReply; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import org.junit.Test; -import org.mockito.Mock; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Swap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.NshMaps; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.nsh.maps.NshMapKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class NshMapWriterCustomizerTest extends WriterCustomizerTest { - - private static final String MAP_CTX_NAME = "nsh-map-instance"; - private static final int MAP_INDEX = 1; - private static final String MAP_NAME = "map"; - - private static final String INT_CTX_NAME = "interface-instance"; - private static final int ITF_INDEX = 3; - private static final String ITF_NAME = "vxlanGpeTun3"; - - @Mock - protected FutureJVppNsh jvppNsh; - - private NamingContext nshContext; - - private NamingContext interfaceContext; - - private NshMapWriterCustomizer customizer; - - @Override - public void setUp() throws Exception { - nshContext = new NamingContext("nsh_map", MAP_CTX_NAME); - defineMapping(mappingContext, MAP_NAME, MAP_INDEX, MAP_CTX_NAME); - interfaceContext = new NamingContext("interface", INT_CTX_NAME); - defineMapping(mappingContext, ITF_NAME, ITF_INDEX, INT_CTX_NAME); - - customizer = new NshMapWriterCustomizer(jvppNsh, nshContext, interfaceContext); - } - - private static NshMap generateNshMap(final String name) { - final NshMapBuilder builder = new NshMapBuilder(); - builder.setName(name); - builder.setKey(new NshMapKey(name)); - builder.setNsp(184L); - builder.setNsi((short) 255); - builder.setMappedNsp(183L); - builder.setMappedNsi((short) 254); - builder.setNshAction(Swap.class); - builder.setEncapType(VxlanGpe.class); - builder.setEncapIfName("vxlanGpeTun3"); - - return builder.build(); - } - - private static InstanceIdentifier getNshMapId(final String name) { - return InstanceIdentifier.create(NshMaps.class) - .child(NshMap.class, new NshMapKey(name)); - } - - private void whenNshAddDelMapThenSuccess() { - final NshAddDelMapReply reply = new NshAddDelMapReply(); - reply.mapIndex = MAP_INDEX; - doReturn(future(reply)).when(jvppNsh).nshAddDelMap(any(NshAddDelMap.class)); - } - - private void whenNshAddDelMapThenFailure() { - doReturn(failedFuture()).when(jvppNsh).nshAddDelMap(any(NshAddDelMap.class)); - } - - private static NshAddDelMap generateNshAddDelMap(final byte isAdd) { - final NshAddDelMap request = new NshAddDelMap(); - request.isAdd = isAdd; - request.nspNsi = 184<<8 | 255; - request.mappedNspNsi = 183<<8 | 254; - request.nshAction = 0; - request.swIfIndex = ITF_INDEX; - request.nextNode = 2; - - return request; - } - - @Test - public void testCreate() throws Exception { - final NshMap nshMap = generateNshMap(MAP_NAME); - final InstanceIdentifier id = getNshMapId(MAP_NAME); - - whenNshAddDelMapThenSuccess(); - - customizer.writeCurrentAttributes(id, nshMap, writeContext); - - verify(jvppNsh).nshAddDelMap(generateNshAddDelMap((byte) 1)); - - } - - @Test - public void testCreateFailed() throws Exception { - final NshMap nshMap = generateNshMap(MAP_NAME); - final InstanceIdentifier id = getNshMapId(MAP_NAME); - - whenNshAddDelMapThenFailure(); - - try { - customizer.writeCurrentAttributes(id, nshMap, writeContext); - } catch (WriteFailedException e) { - assertTrue(e.getCause() instanceof VppBaseCallException); - verify(jvppNsh).nshAddDelMap(generateNshAddDelMap((byte) 1)); - - return; - } - fail("WriteFailedException.CreateFailedException was expected"); - } - - @Test - public void testDelete() throws Exception { - final NshMap nshMap = generateNshMap(MAP_NAME); - final InstanceIdentifier id = getNshMapId(MAP_NAME); - - whenNshAddDelMapThenSuccess(); - - customizer.deleteCurrentAttributes(id, nshMap, writeContext); - - verify(jvppNsh).nshAddDelMap(generateNshAddDelMap((byte) 0)); - } - - @Test - public void testDeleteFailed() throws Exception { - final NshMap nshMap = generateNshMap(MAP_NAME); - final InstanceIdentifier id = getNshMapId(MAP_NAME); - - whenNshAddDelMapThenFailure(); - - try { - customizer.deleteCurrentAttributes(id, nshMap, writeContext); - } catch (WriteFailedException e) { - assertTrue(e.getCause() instanceof VppBaseCallException); - verify(jvppNsh).nshAddDelMap(generateNshAddDelMap((byte) 0)); - return; - } - fail("WriteFailedException.DeleteFailedException was expected"); - - customizer.deleteCurrentAttributes(id, nshMap, writeContext); - } - - @Test(expected = UnsupportedOperationException.class) - public void testUpdate() throws Exception { - final NshMap nshMapBefore = generateNshMap(MAP_NAME); - final InstanceIdentifier id = getNshMapId(MAP_NAME); - customizer.updateCurrentAttributes(id, nshMapBefore, new NshMapBuilder().build(), writeContext); - } -} \ No newline at end of file diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java deleted file mode 100644 index 2921d07dd..000000000 --- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java +++ /dev/null @@ -1,154 +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.vppnsh.impl.oper; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.verify; - -import com.google.common.collect.Lists; -import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetails; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshEntryDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import java.util.List; -import org.junit.Test; -import org.mockito.Mock; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.MdType1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.NshMdType1StateAugment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntries; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshEntriesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntryBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.entries.NshEntryKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - - -public class NshEntryReaderCustomizerTest extends - ListReaderCustomizerTest { - - private static final String ENTRY_CTX_NAME = "nsh-entry-instance"; - private static final int ENTRY_INDEX_1 = 1; - private static final String ENTRY_NAME_1 = "entry1"; - private static final int ENTRY_INDEX_2 = 2; - private static final String ENTRY_NAME_2 = "entry2"; - - @Mock - protected FutureJVppNsh jvppNsh; - - private NamingContext nshContext; - - public NshEntryReaderCustomizerTest() { - super(NshEntry.class, NshEntriesBuilder.class); - } - - @Override - protected ReaderCustomizer initCustomizer() { - return new NshEntryReaderCustomizer(jvppNsh, nshContext); - } - - private static InstanceIdentifier getNshEntryId(final String name) { - return InstanceIdentifier.create(NshEntries.class) - .child(NshEntry.class, new NshEntryKey(name)); - } - - @Override - public void setUp() throws VppBaseCallException { - nshContext = new NamingContext("nsh_entry", ENTRY_CTX_NAME); - defineMapping(mappingContext, ENTRY_NAME_1, ENTRY_INDEX_1, ENTRY_CTX_NAME); - defineMapping(mappingContext, ENTRY_NAME_2, ENTRY_INDEX_2, ENTRY_CTX_NAME); - - final NshEntryDetailsReplyDump reply = new NshEntryDetailsReplyDump(); - final NshEntryDetails nshEntryDetails = new NshEntryDetails(); - nshEntryDetails.verOC = 0; - nshEntryDetails.length = 6; - nshEntryDetails.mdType = 1; - nshEntryDetails.nextProtocol = 3; - nshEntryDetails.nspNsi = (123<<8 | 4); - nshEntryDetails.c1 = 1; - nshEntryDetails.c2 = 2; - nshEntryDetails.c3 = 3; - nshEntryDetails.c4 = 4; - reply.nshEntryDetails = Lists.newArrayList(nshEntryDetails); - doReturn(future(reply)).when(jvppNsh).nshEntryDump(any(NshEntryDump.class)); - } - - @Test - public void testreadCurrentAttributes() throws ReadFailedException { - - NshEntryBuilder builder = new NshEntryBuilder(); - getCustomizer().readCurrentAttributes(getNshEntryId(ENTRY_NAME_1), builder, ctx); - - assertEquals(0, builder.getVersion().intValue()); - assertEquals(6, builder.getLength().intValue()); - assertEquals(MdType1.class, builder.getMdType()); - assertEquals(Ethernet.class, builder.getNextProtocol()); - assertEquals(123, builder.getNsp().intValue()); - assertEquals(4, builder.getNsi().intValue()); - assertEquals(1, builder.getAugmentation(NshMdType1StateAugment.class).getC1().intValue()); - assertEquals(2, builder.getAugmentation(NshMdType1StateAugment.class).getC2().intValue()); - assertEquals(3, builder.getAugmentation(NshMdType1StateAugment.class).getC3().intValue()); - assertEquals(4, builder.getAugmentation(NshMdType1StateAugment.class).getC4().intValue()); - - verify(jvppNsh).nshEntryDump(any(NshEntryDump.class)); - } - - @Test - public void testGetAllIds() throws ReadFailedException { - final NshEntryDetailsReplyDump reply = new NshEntryDetailsReplyDump(); - - final NshEntryDetails nshEntryDetails_1 = new NshEntryDetails(); - nshEntryDetails_1.entryIndex = ENTRY_INDEX_1; - nshEntryDetails_1.verOC = 0; - nshEntryDetails_1.length = 6; - nshEntryDetails_1.mdType = 1; - nshEntryDetails_1.nextProtocol = 3; - nshEntryDetails_1.nspNsi = (123<<8 | 4); - nshEntryDetails_1.c1 = 1; - nshEntryDetails_1.c2 = 2; - nshEntryDetails_1.c3 = 3; - nshEntryDetails_1.c4 = 4; - reply.nshEntryDetails = Lists.newArrayList(nshEntryDetails_1); - - final NshEntryDetails nshEntryDetails_2 = new NshEntryDetails(); - nshEntryDetails_2.entryIndex = ENTRY_INDEX_2; - nshEntryDetails_2.verOC = 0; - nshEntryDetails_2.length = 6; - nshEntryDetails_2.mdType = 1; - nshEntryDetails_2.nextProtocol = 2; - nshEntryDetails_2.nspNsi = (223<<8 | 24); - nshEntryDetails_2.c1 = 21; - nshEntryDetails_2.c2 = 22; - nshEntryDetails_2.c3 = 23; - nshEntryDetails_2.c4 = 24; - reply.nshEntryDetails = Lists.newArrayList(nshEntryDetails_2); - - doReturn(future(reply)).when(jvppNsh).nshEntryDump(any(NshEntryDump.class)); - - final List allIds = getCustomizer().getAllIds(getNshEntryId(ENTRY_NAME_1), ctx); - - assertEquals(reply.nshEntryDetails.size(), allIds.size()); - - } -} diff --git a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java deleted file mode 100644 index 868f851a3..000000000 --- a/nsh/impl/src/test/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizerTest.java +++ /dev/null @@ -1,146 +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.vppnsh.impl.oper; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.verify; - -import com.google.common.collect.Lists; -import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; -import io.fd.honeycomb.translate.vpp.util.NamingContext; -import io.fd.honeycomb.vpp.test.read.ListReaderCustomizerTest; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetails; -import io.fd.vpp.jvpp.nsh.dto.NshMapDetailsReplyDump; -import io.fd.vpp.jvpp.nsh.dto.NshMapDump; -import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh; -import java.util.List; -import org.junit.Test; -import org.mockito.Mock; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Swap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMaps; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMapsBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - - -public class NshMapReaderCustomizerTest extends - ListReaderCustomizerTest { - - private static final String MAP_CTX_NAME = "nsh-map-instance"; - private static final int MAP_INDEX_1 = 1; - private static final String MAP_NAME_1 = "map1"; - - private static final int MAP_INDEX_2 = 2; - private static final String MAP_NAME_2 = "map2"; - - private static final String INT_CTX_NAME = "interface-instance"; - private static final int ITF_INDEX = 3; - private static final String ITF_NAME = "vxlanGpeTun3"; - - @Mock - protected FutureJVppNsh jvppNsh; - - private NamingContext nshContext; - - private NamingContext interfaceContext; - - public NshMapReaderCustomizerTest() { - super(NshMap.class, NshMapsBuilder.class); - } - - @Override - protected ReaderCustomizer initCustomizer() { - return new NshMapReaderCustomizer(jvppNsh, nshContext, interfaceContext); - } - - private static InstanceIdentifier getNshMapId(final String name) { - return InstanceIdentifier.create(NshMaps.class) - .child(NshMap.class, new NshMapKey(name)); - } - - @Override - public void setUp() throws VppBaseCallException { - nshContext = new NamingContext("nsh_map", MAP_CTX_NAME); - defineMapping(mappingContext, MAP_NAME_1, MAP_INDEX_1, MAP_CTX_NAME); - defineMapping(mappingContext, MAP_NAME_2, MAP_INDEX_2, MAP_CTX_NAME); - - interfaceContext = new NamingContext("interface", INT_CTX_NAME); - defineMapping(mappingContext, ITF_NAME, ITF_INDEX, INT_CTX_NAME); - - final NshMapDetailsReplyDump reply = new NshMapDetailsReplyDump(); - final NshMapDetails nshMapDetails = new NshMapDetails(); - nshMapDetails.nspNsi = (184<<8 | 255); - nshMapDetails.mappedNspNsi = (183<<8 | 254); - nshMapDetails.nshAction = 0; - nshMapDetails.swIfIndex = ITF_INDEX; - nshMapDetails.nextNode = 2; - reply.nshMapDetails = Lists.newArrayList(nshMapDetails); - doReturn(future(reply)).when(jvppNsh).nshMapDump(any(NshMapDump.class)); - } - - @Test - public void testreadCurrentAttributes() throws ReadFailedException { - - NshMapBuilder builder = new NshMapBuilder(); - getCustomizer().readCurrentAttributes(getNshMapId(MAP_NAME_1), builder, ctx); - - assertEquals(184, builder.getNsp().intValue()); - assertEquals(255, builder.getNsi().intValue()); - assertEquals(183, builder.getMappedNsp().intValue()); - assertEquals(254, builder.getMappedNsi().intValue()); - assertEquals(Swap.class, builder.getNshAction()); - assertEquals(VxlanGpe.class, builder.getEncapType()); - assertEquals("vxlanGpeTun3", builder.getEncapIfName()); - - verify(jvppNsh).nshMapDump(any(NshMapDump.class)); - } - - @Test - public void testGetAllIds() throws ReadFailedException { - final NshMapDetailsReplyDump reply = new NshMapDetailsReplyDump(); - - final NshMapDetails nshMapDetails_1 = new NshMapDetails(); - nshMapDetails_1.mapIndex = MAP_INDEX_1; - nshMapDetails_1.nspNsi = (184<<8 | 255); - nshMapDetails_1.mappedNspNsi = (183<<8 | 254); - nshMapDetails_1.swIfIndex = ITF_INDEX; - nshMapDetails_1.nextNode = 2; - reply.nshMapDetails = Lists.newArrayList(nshMapDetails_1); - - final NshMapDetails nshMapDetails_2 = new NshMapDetails(); - nshMapDetails_2.mapIndex = MAP_INDEX_2; - nshMapDetails_2.nspNsi = (84<<8 | 255); - nshMapDetails_2.mappedNspNsi = (83<<8 | 254); - nshMapDetails_2.swIfIndex = ITF_INDEX; - nshMapDetails_2.nextNode = 1; - reply.nshMapDetails = Lists.newArrayList(nshMapDetails_2); - - doReturn(future(reply)).when(jvppNsh).nshMapDump(any(NshMapDump.class)); - - final List allIds = getCustomizer().getAllIds(getNshMapId(MAP_NAME_1), ctx); - - assertEquals(reply.nshMapDetails.size(), allIds.size()); - - } -} -- cgit 1.2.3-korg