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 --- .../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 ---------------- 5 files changed, 777 deletions(-) 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/src/test/java/io/fd/honeycomb') 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