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 --- .../util/AdjacenciesMappingContextTest.java | 184 --------------------- .../lisp/context/util/EidMappingContextTest.java | 108 ------------ 2 files changed, 292 deletions(-) delete mode 100644 lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContextTest.java delete mode 100644 lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/EidMappingContextTest.java (limited to 'lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util') diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContextTest.java b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContextTest.java deleted file mode 100644 index 4a5302ba6..000000000 --- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/AdjacenciesMappingContextTest.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.lisp.context.util; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableSet; -import io.fd.honeycomb.test.tools.HoneycombTestRunner; -import io.fd.honeycomb.test.tools.annotations.InjectTestData; -import io.fd.honeycomb.test.tools.annotations.InjectablesProcessor; -import io.fd.honeycomb.test.tools.annotations.SchemaContextProvider; -import io.fd.honeycomb.translate.MappingContext; -import io.fd.honeycomb.translate.util.RWUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.$YangModuleInfoImpl; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.AdjacenciesIdentificationContexts; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.adjacencies.identification.contexts.AdjacenciesIdentification; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.adjacencies.identification.contexts.AdjacenciesIdentificationKey; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.adjacencies.identification.contexts.adjacencies.identification.Mappings; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.adjacencies.identification.contexts.adjacencies.identification.mappings.Mapping; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.adjacencies.identification.contexts.adjacencies.identification.mappings.MappingKey; -import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.adjacencies.identification.context.rev160801.adjacencies.identification.context.attributes.adjacencies.identification.contexts.adjacencies.identification.mappings.mapping.EidIdentificatorPair; -import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; - -@RunWith(HoneycombTestRunner.class) -public class AdjacenciesMappingContextTest implements InjectablesProcessor { - - private static final String PARENT_1 = "first"; - private static final String PARENT_2 = "second"; - private static final String PARENT_3 = "third"; - private static final String PARENT_4 = "fourth"; - - private static final String LOCAL_EID_ID_1 = "local-eid-1"; - private static final String LOCAL_EID_ID_2 = "local-eid-2"; - private static final String LOCAL_EID_ID_3 = "local-eid-3"; - - private static final String REMOTE_EID_ID_1 = "remote-eid-1"; - private static final String REMOTE_EID_ID_2 = "remote-eid-2"; - private static final String REMOTE_EID_ID_3 = "remote-eid-3"; - - @Mock - private MappingContext mappingContext; - - @Captor - private ArgumentCaptor mappingArgumentCaptor; - - @Captor - private ArgumentCaptor> keyedInstanceIdentifierArgumentCaptor; - - private AdjacenciesMappingContext adjacenciesMappingContext; - private KeyedInstanceIdentifier - adjacenciesMappingContextId; - - @SchemaContextProvider - public ModuleInfoBackedContext schemaContext() { - return provideSchemaContextFor(ImmutableSet.of($YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.$YangModuleInfoImpl - .getInstance())); - } - - @InjectTestData(resourcePath = "/adjacencies-identification-context.json", id = "/naming-context:contexts" + - "/adjacencies-identification-context:adjacencies-identification-contexts" + - "/adjacencies-identification-context:adjacencies-identification[adjacencies-identification-context:name='context']" + - "/adjacencies-identification-context:mappings") - private Mappings mappings; - - @Before - public void init() { - MockitoAnnotations.initMocks(this); - - adjacenciesMappingContext = new AdjacenciesMappingContext("context"); - adjacenciesMappingContextId = InstanceIdentifier.create(AdjacenciesIdentificationContexts.class).child( - AdjacenciesIdentification.class, new AdjacenciesIdentificationKey("context")); - - when(mappingContext.read(adjacenciesMappingContextId.child(Mappings.class))).thenReturn(Optional.of(mappings)); - when(mappingContext.read(parentKey(PARENT_1))).thenReturn(Optional.of(filterForParent(PARENT_1))); - when(mappingContext.read(parentKey(PARENT_2))).thenReturn(Optional.of(filterForParent(PARENT_2))); - when(mappingContext.read(parentKey(PARENT_3))).thenReturn(Optional.of(filterForParent(PARENT_3))); - } - - private Mapping filterForParent(final String parent) { - return mappings.getMapping().stream() - .filter(mapping -> mapping.getId().equals(parent)) - .collect(RWUtils.singleItemCollector()); - } - - private KeyedInstanceIdentifier parentKey(final String parent) { - return adjacenciesMappingContextId.child(Mappings.class).child(Mapping.class, new MappingKey(parent)); - } - - @Test - public void getAdjacencyId() throws Exception { - assertEquals(PARENT_1, - adjacenciesMappingContext.getAdjacencyId(LOCAL_EID_ID_1, REMOTE_EID_ID_1, mappingContext)); - assertEquals(PARENT_2, - adjacenciesMappingContext.getAdjacencyId(LOCAL_EID_ID_2, REMOTE_EID_ID_2, mappingContext)); - assertEquals(PARENT_3, - adjacenciesMappingContext.getAdjacencyId(LOCAL_EID_ID_3, REMOTE_EID_ID_3, mappingContext)); - } - - @Test - public void containsId() throws Exception { - assertTrue(adjacenciesMappingContext.containsId(LOCAL_EID_ID_1, REMOTE_EID_ID_1, mappingContext)); - assertTrue(adjacenciesMappingContext.containsId(LOCAL_EID_ID_2, REMOTE_EID_ID_2, mappingContext)); - assertTrue(adjacenciesMappingContext.containsId(LOCAL_EID_ID_3, REMOTE_EID_ID_3, mappingContext)); - } - - @Test - public void addEidPair() throws Exception { - adjacenciesMappingContext.addEidPair(PARENT_4, LOCAL_EID_ID_1, REMOTE_EID_ID_3, mappingContext); - verify(mappingContext, times(1)) - .put(keyedInstanceIdentifierArgumentCaptor.capture(), mappingArgumentCaptor.capture()); - - final KeyedInstanceIdentifier key = keyedInstanceIdentifierArgumentCaptor.getValue(); - final Mapping mapping = mappingArgumentCaptor.getValue(); - - assertEquals(PARENT_4, key.getKey().getId()); - assertEquals(PARENT_4, mapping.getId()); - assertEquals(PARENT_4, mapping.getKey().getId()); - - final EidIdentificatorPair pair = mapping.getEidIdentificatorPair(); - assertEquals(LOCAL_EID_ID_1, pair.getLocalEidId().getValue()); - assertEquals(REMOTE_EID_ID_3, pair.getRemoteEidId().getValue()); - } - - @Test - public void removeForIndex() throws Exception { - adjacenciesMappingContext.removeForIndex(PARENT_1, mappingContext); - adjacenciesMappingContext.removeForIndex(PARENT_2, mappingContext); - adjacenciesMappingContext.removeForIndex(PARENT_3, mappingContext); - verify(mappingContext, times(1)).delete(parentKey(PARENT_1)); - verify(mappingContext, times(1)).delete(parentKey(PARENT_2)); - verify(mappingContext, times(1)).delete(parentKey(PARENT_3)); - } - - @Test - public void getEidPair() throws Exception { - final EidIdentificatorPair pair1 = adjacenciesMappingContext.getEidPair(PARENT_1, mappingContext); - final EidIdentificatorPair pair2 = adjacenciesMappingContext.getEidPair(PARENT_2, mappingContext); - final EidIdentificatorPair pair3 = adjacenciesMappingContext.getEidPair(PARENT_3, mappingContext); - - assertEquals(LOCAL_EID_ID_1, pair1.getLocalEidId().getValue()); - assertEquals(REMOTE_EID_ID_1, pair1.getRemoteEidId().getValue()); - assertEquals(LOCAL_EID_ID_2, pair2.getLocalEidId().getValue()); - assertEquals(REMOTE_EID_ID_2, pair2.getRemoteEidId().getValue()); - assertEquals(LOCAL_EID_ID_3, pair3.getLocalEidId().getValue()); - assertEquals(REMOTE_EID_ID_3, pair3.getRemoteEidId().getValue()); - } - - @Test - public void containsEidPairForIndex() throws Exception { - assertTrue(adjacenciesMappingContext.containsEidPairForIndex(PARENT_1, mappingContext)); - assertTrue(adjacenciesMappingContext.containsEidPairForIndex(PARENT_2, mappingContext)); - assertTrue(adjacenciesMappingContext.containsEidPairForIndex(PARENT_3, mappingContext)); - } - -} \ No newline at end of file diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/EidMappingContextTest.java b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/EidMappingContextTest.java deleted file mode 100644 index ccd38292e..000000000 --- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/context/util/EidMappingContextTest.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.honeycomb.lisp.context.util; - - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import io.fd.honeycomb.lisp.util.EidMappingContextHelper; -import io.fd.honeycomb.translate.MappingContext; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.MappingId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.local.mappings.local.mapping.Eid; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.local.mappings.local.mapping.EidBuilder; - -public class EidMappingContextTest implements EidMappingContextHelper { - - private static final String EID_MAPPING_CONTEXT_NAME = "eidMappingContext"; - - @Mock - private MappingContext mappingContext; - - private EidMappingContext eidMappingContext; - private Eid localEid; - private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.Eid - remoteEid; - private org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.eid.mapping.context.rev160801.contexts.eid.mapping.context.mappings.mapping.Eid - mappingEid; - private MappingId mappingId; - - @Before - public void init() { - MockitoAnnotations.initMocks(this); - eidMappingContext = new EidMappingContext(EID_MAPPING_CONTEXT_NAME); - - localEid = - new EidBuilder().setAddress(new Ipv4Builder().setIpv4(new Ipv4Address("192.168.2.1")).build()).build(); - remoteEid = fromLocalToRemoteEid(localEid); - mappingEid = fromLocalToMappingEid(localEid); - mappingId = new MappingId("mapping"); - - defineEidMapping(mappingContext, mappingEid, mappingId, EID_MAPPING_CONTEXT_NAME); - } - - @Test - public void testContainsEid() { - assertTrue(eidMappingContext.containsEid(mappingId, mappingContext)); - org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.eid.mapping.context.rev160801.contexts.eid.mapping.context.mappings.mapping.Eid - loadedEid = eidMappingContext.getEid(mappingId, mappingContext); - - assertEquals("192.168.2.1", ((Ipv4) (loadedEid.getAddress())).getIpv4().getValue()); - } - - @Test - public void testContainsId() { - assertTrue(eidMappingContext.containsId(localEid, mappingContext)); - assertTrue(eidMappingContext.containsId(remoteEid, mappingContext)); - } - - @Test - public void testGetEid() { - assertEquals(mappingEid, eidMappingContext.getEid(mappingId, mappingContext)); - } - - @Test - public void testGetId() { - assertEquals(mappingId, eidMappingContext.getId(localEid, mappingContext)); - assertEquals(mappingId, eidMappingContext.getId(remoteEid, mappingContext)); - } - - private org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.eid.mapping.context.rev160801.contexts.eid.mapping.context.mappings.mapping.Eid fromLocalToMappingEid( - Eid eid) { - return new org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.eid.mapping.context.rev160801.contexts.eid.mapping.context.mappings.mapping.EidBuilder() - .setAddress(eid.getAddress()) - .setAddressType(eid.getAddressType()) - .setVirtualNetworkId(eid.getVirtualNetworkId()) - .build(); - } - - private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.Eid fromLocalToRemoteEid( - Eid eid) { - return new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.dp.subtable.grouping.remote.mappings.remote.mapping.EidBuilder() - .setAddress(eid.getAddress()) - .setAddressType(eid.getAddressType()) - .setVirtualNetworkId(eid.getVirtualNetworkId()) - .build(); - } -} -- cgit 1.2.3-korg