From 58359c23e4b69efe057a882e1d50ae752c20a285 Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Thu, 25 Oct 2018 18:40:46 +0200 Subject: [PATCH] Neon MRI changes This patch bumps: - odlparent to 4.0.2 - mdsal to 3.0.1 It also deals with: - adjust dependencies to account for ietf-{inet,yang}-types movement - new checkstyle failures - bump odlparent feature version range from [3.1.0,4) to [4,5) - move to odl-guava instead of the version explicit odl-guava-23 - move blueprints from org/opendaylight to OSGI-INF directory JIRA: LISPMAP-175 Change-Id: Ia065800c9b92362371550f8e9c93eb6f3da57d4e Signed-off-by: Lorand Jakab --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 4 +- features/features-lispflowmapping/pom.xml | 2 +- .../odl-lispflowmapping-inmemorydb/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 4 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-neutron/pom.xml | 4 +- .../odl-lispflowmapping-southbound/pom.xml | 4 +- .../src/main/feature/feature.xml | 4 +- features/pom.xml | 2 +- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 6 +-- mappingservice/dsbackend/pom.xml | 2 +- .../dsbackend/DataStoreBackEndTest.java | 2 +- mappingservice/implementation/pom.xml | 2 +- .../timebucket/containers/TimeBucket.java | 2 +- .../blueprint/mappingservice.xml | 0 .../LispMappingServiceTest.java | 23 +++------- .../implementation/MappingSystemTest.java | 2 +- .../implementation/lisp/MapServerTest.java | 6 +-- .../lisp/MappingServiceTest.java | 4 +- .../timebucket/TimeBucketWheelUnitTest.java | 4 +- mappingservice/inmemorydb/pom.xml | 5 --- .../blueprint/mappingservice-inmemory-db.xml | 0 .../inmemorydb/HashMapDbTest.java | 2 +- mappingservice/lisp-proto/pom.xml | 15 +++---- .../authentication/LispMACAuthentication.java | 2 +- .../lisp/util/MappingRecordUtil.java | 2 +- .../MapRegisterSerializationTest.java | 2 +- mappingservice/mapcache/pom.xml | 5 --- .../mapcache/FlatMapCacheTest.java | 4 +- mappingservice/neutron/pom.xml | 38 ++++++++++++---- .../mappers/HostIdToRlocMapper.java | 2 +- .../blueprint/neutron.xml | 0 .../neutron/PortDataProcessorTest.java | 12 +++++- .../HostInformationManagerTest.java | 2 +- .../PortUuidToPortDataMapperTest.java | 2 +- mappingservice/pom.xml | 43 ++++++++++++++----- .../blueprint/mappingservice-shell.xml | 0 mappingservice/southbound/pom.xml | 9 +--- .../blueprint/mappingservice-southbound.xml | 0 .../southbound/LispSouthboundPluginTest.java | 10 +---- .../southbound/LispSouthboundRpcTest.java | 2 +- .../AuthenticationKeyDataListenerTest.java | 2 +- .../lisp/LispSouthboundHandlerTest.java | 23 ++++++---- .../lisp/LispXtrSouthboundHandlerTest.java | 4 +- 48 files changed, 145 insertions(+), 130 deletions(-) rename mappingservice/implementation/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/mappingservice.xml (100%) rename mappingservice/inmemorydb/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/mappingservice-inmemory-db.xml (100%) rename mappingservice/neutron/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/neutron.xml (100%) rename mappingservice/shell/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/mappingservice-shell.xml (100%) rename mappingservice/southbound/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/mappingservice-southbound.xml (100%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index e60ac97d8..847b852b7 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index eb692a8c6..d0553b2a2 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 3.1.3 + 4.0.2 @@ -50,7 +50,7 @@ org.opendaylight.mdsal mdsal-artifacts - 2.6.0-SNAPSHOT + 3.0.1 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 3b57729e5..1b768289c 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 2449dbdc6..53d7ae438 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index fbd3feeb8..f41b57084 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index ea3eda6cf..c141b1758 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 8fac7f781..198820fdc 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 2.6.0-SNAPSHOT + 3.0.1 pom import diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index efe1e542a..80c160638 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml index 39a16bb1a..0c2178cdc 100644 --- a/features/odl-lispflowmapping-neutron/pom.xml +++ b/features/odl-lispflowmapping-neutron/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 2.6.0-SNAPSHOT + 3.0.1 pom import diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 50be8562a..0e45c9e99 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 @@ -47,7 +47,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent - odl-guava-23 + odl-guava xml features diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml index 9eed6228c..c1081a717 100644 --- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-netty-4 - odl-guava-23 + odl-netty-4 + odl-guava diff --git a/features/pom.xml b/features/pom.xml index ecc51e600..dad0d3ee9 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index 58b5e7e8b..2555b8128 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 3.1.3 + 4.0.2 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 6b49cd2a6..501b8dbc9 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 0.14.0-SNAPSHOT + 3.0.1 @@ -32,8 +32,8 @@ yang-ext - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index b0df3047a..26aa4acdd 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -42,7 +42,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 test diff --git a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java index c59471aae..2ee0a2d95 100644 --- a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java +++ b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java @@ -22,7 +22,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index bf1ec44bc..ceaabf09c 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -50,7 +50,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 test diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucket.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucket.java index 761da43b2..ea25d880f 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucket.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucket.java @@ -48,4 +48,4 @@ public class TimeBucket { mappingSystem.handleSbExpiredMapping(key, null, mappingData); }); } -} \ No newline at end of file +} diff --git a/mappingservice/implementation/src/main/resources/org/opendaylight/blueprint/mappingservice.xml b/mappingservice/implementation/src/main/resources/OSGI-INF/blueprint/mappingservice.xml similarity index 100% rename from mappingservice/implementation/src/main/resources/org/opendaylight/blueprint/mappingservice.xml rename to mappingservice/implementation/src/main/resources/OSGI-INF/blueprint/mappingservice.xml diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java index 6e2197096..cffe326be 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java @@ -23,7 +23,7 @@ import org.mockito.ArgumentMatcher; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.md.sal.binding.api.NotificationService; import org.opendaylight.lispflowmapping.interfaces.lisp.IMapResolverAsync; import org.opendaylight.lispflowmapping.interfaces.lisp.IMapServerAsync; @@ -120,7 +120,6 @@ public class LispMappingServiceTest { public void handleMapRequestTest() { final MapRequest mapRequest = Mockito.mock(MapRequest.class); final MapReply mapReply = new MapReplyBuilder().build(); - Mockito.when(mapRequest.getEidItem()).thenReturn(Lists.newArrayList(EID_ITEM_BUILDER.build())); Mockito.when(tlsMapRequestMock.get()).thenReturn(null); Mockito.when(tlsMapReplyMock.get()).thenReturn(mapReply); @@ -130,7 +129,7 @@ public class LispMappingServiceTest { Mockito.verify(tlsMapRequestMock).get(); Mockito.verifyNoMoreInteractions(tlsMapRequestMock); Mockito.verify(mapResolverMock).handleMapRequest(mapRequest); - Mockito.verify(tlsMapReplyMock).set(Mockito.any(MapReply.class)); + Mockito.verify(tlsMapReplyMock).set(Mockito.any()); Mockito.verify(tlsMapReplyMock).get(); assertEquals(result, mapReply); @@ -147,7 +146,6 @@ public class LispMappingServiceTest { .setMapRequest(pair.getLeft()) .setTransportAddress(pair.getRight()); - Mockito.when(mapRequest.getEidItem()).thenReturn(Lists.newArrayList(EID_ITEM_BUILDER.build())); Mockito.when(tlsMapRequestMock.get()).thenReturn(pair); assertNull(lispMappingService.handleMapRequest(mapRequest)); @@ -162,13 +160,11 @@ public class LispMappingServiceTest { public void handleMapRegisterTest() { final Pair> pairMock = Mockito.mock(Pair.class); - Mockito.when(mapRegisterMock.getMappingRecordItem()) - .thenReturn(Lists.newArrayList(MAPPING_RECORD_ITEM_BUILDER.build())); Mockito.when(tlsMapNotifyMock.get()).thenReturn(pairMock); lispMappingService.handleMapRegister(mapRegisterMock); Mockito.verify(mapServerMock).handleMapRegister(mapRegisterMock); - Mockito.verify(tlsMapNotifyMock).set(Mockito.any(MutablePair.class)); + Mockito.verify(tlsMapNotifyMock).set(Mockito.any()); } /** @@ -182,8 +178,6 @@ public class LispMappingServiceTest { final AddMapping addMapping = Mockito.mock(AddMapping.class); Mockito.when(addMapping.getMapRegister()).thenReturn(mapRegister); - Mockito.when(mapRegister.getMappingRecordItem()) - .thenReturn(Lists.newArrayList(MAPPING_RECORD_ITEM_BUILDER.build())); Mockito.when(tlsMapNotifyMock.get()).thenReturn(getDefaultMapNotifyPair()); lispMappingService.onAddMapping(addMapping); @@ -202,8 +196,6 @@ public class LispMappingServiceTest { final MapNotify mapNotify = new MapNotifyBuilder().setKeyId((short) 1).build(); Mockito.when(addMapping.getMapRegister()).thenReturn(mapRegister); - Mockito.when(mapRegister.getMappingRecordItem()) - .thenReturn(Lists.newArrayList(MAPPING_RECORD_ITEM_BUILDER.build())); Mockito.when(tlsMapNotifyMock.get()).thenReturn(new MutablePair<>(mapNotify, null)); Mockito.when(addMapping.getTransportAddress()).thenReturn(TRANSPORT_ADDRESS_1); @@ -230,7 +222,6 @@ public class LispMappingServiceTest { Mockito.when(requestMapping.getMapRequest()).thenReturn(mapRequest); Mockito.when(requestMapping.getTransportAddress()).thenReturn(TRANSPORT_ADDRESS_1); - Mockito.when(mapRequest.getEidItem()).thenReturn(Lists.newArrayList(EID_ITEM_BUILDER.build())); Mockito.when(tlsMapReplyMock.get()).thenReturn(mapReply); // result @@ -253,7 +244,6 @@ public class LispMappingServiceTest { .maprequestnotification.MapRequest.class); Mockito.when(requestMapping.getMapRequest()).thenReturn(mapRequest); - Mockito.when(mapRequest.getEidItem()).thenReturn(Lists.newArrayList(EID_ITEM_BUILDER.build())); Mockito.when(tlsMapReplyMock.get()).thenReturn(null); lispMappingService.onRequestMapping(requestMapping); @@ -403,10 +393,9 @@ public class LispMappingServiceTest { .setTimestamp(TIMESTAMP).build(); } - class TransportAddressMatch extends ArgumentMatcher { - public boolean matches(Object sendMapNotify) { - final SendMapNotifyInput sendMapNotifyInput = (SendMapNotifyInput) sendMapNotify; - final TransportAddress notifyTransportAddress = sendMapNotifyInput.getTransportAddress(); + class TransportAddressMatch implements ArgumentMatcher { + public boolean matches(SendMapNotifyInput sendMapNotify) { + final TransportAddress notifyTransportAddress = sendMapNotify.getTransportAddress(); return TRANSPORT_ADDRESS_1.equals(notifyTransportAddress) || TRANSPORT_ADDRESS_2.equals(notifyTransportAddress); } diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java index 494aabde1..46cea2dd7 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java @@ -26,7 +26,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.lispflowmapping.config.ConfigIni; diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java index 7e24eaf11..1593a82da 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java @@ -25,7 +25,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.Spy; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.md.sal.binding.api.NotificationService; import org.opendaylight.lispflowmapping.config.ConfigIni; import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys; @@ -172,8 +172,6 @@ public class MapServerTest { @Test public void handleMapRegisterTest_MappingMergeFalse() throws NoSuchFieldException, IllegalAccessException { Mockito.when(mapService.getMapping(MappingOrigin.Southbound, IPV4_EID_1)).thenReturn(OLD_MAPPING_DATA_1); - Mockito.when(mapService.getData(MappingOrigin.Southbound, IPV4_EID_1, SubKeys.SUBSCRIBERS)) - .thenReturn(subscriberSetMock_1); mappingData.setMergeEnabled(false); mapServer.handleMapRegister(mapRegister); @@ -261,8 +259,6 @@ public class MapServerTest { .thenReturn(OLD_MAPPING_DATA_1) .thenReturn(OLD_MAPPING_DATA_2) .thenReturn(getDefaultMappingData(getDefaultMappingRecordBuilder().build())); - Mockito.when(mapService.getData(MappingOrigin.Southbound, IPV4_EID_1, SubKeys.SUBSCRIBERS)) - .thenReturn(subscriberSetMock_1); Mockito.when(mapService.getData(MappingOrigin.Southbound, IPV4_EID_1, SubKeys.SRC_RLOCS)) .thenReturn(DEFAULT_IP_ADDRESS_SET); diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java index 61f721de2..0f3ca539d 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java @@ -18,7 +18,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd; @@ -568,4 +568,4 @@ public class MappingServiceTest { .setRecordTtl(60) .setEid(IPV4_EID); } -} \ No newline at end of file +} diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/timebucket/TimeBucketWheelUnitTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/timebucket/TimeBucketWheelUnitTest.java index f549a0af8..4277ed265 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/timebucket/TimeBucketWheelUnitTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/timebucket/TimeBucketWheelUnitTest.java @@ -17,7 +17,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.lispflowmapping.config.ConfigIni; import org.opendaylight.lispflowmapping.implementation.MappingSystem; import org.opendaylight.lispflowmapping.implementation.timebucket.containers.TimeBucket; @@ -298,4 +298,4 @@ public class TimeBucketWheelUnitTest { .setTimestamp(new Date().getTime()) .setXtrId(XTR_ID_1); } -} \ No newline at end of file +} diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml index aad44188f..e67323c7d 100644 --- a/mappingservice/inmemorydb/pom.xml +++ b/mappingservice/inmemorydb/pom.xml @@ -20,11 +20,6 @@ mappingservice.api ${project.version} - - junit - junit - compile - diff --git a/mappingservice/inmemorydb/src/main/resources/org/opendaylight/blueprint/mappingservice-inmemory-db.xml b/mappingservice/inmemorydb/src/main/resources/OSGI-INF/blueprint/mappingservice-inmemory-db.xml similarity index 100% rename from mappingservice/inmemorydb/src/main/resources/org/opendaylight/blueprint/mappingservice-inmemory-db.xml rename to mappingservice/inmemorydb/src/main/resources/OSGI-INF/blueprint/mappingservice-inmemory-db.xml diff --git a/mappingservice/inmemorydb/src/test/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDbTest.java b/mappingservice/inmemorydb/src/test/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDbTest.java index c0c03843e..41209d85a 100644 --- a/mappingservice/inmemorydb/src/test/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDbTest.java +++ b/mappingservice/inmemorydb/src/test/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDbTest.java @@ -188,11 +188,11 @@ public class HashMapDbTest { new MappingEntry(mapKey2, mapValue2), new MappingEntry(mapKey3, mapValue3)); - Map mapResult = new HashMap<>(); Map mapSample = new HashMap<>(); mapSample.put(mapKey1, mapValue1); mapSample.put(mapKey2, mapValue2); mapSample.put(mapKey3, mapValue3); + Map mapResult = new HashMap<>(); map.getAll((keyId, valueKey, value) -> { Assert.assertEquals(dbEntryKey, keyId); mapResult.put(valueKey, value); diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index b9240a691..e4f59b371 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.14.0-SNAPSHOT + 3.0.1 @@ -30,12 +30,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types org.opendaylight.mdsal.model @@ -61,11 +61,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.4 test - - org.mockito - mockito-core - test - diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispMACAuthentication.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispMACAuthentication.java index f1cc5199c..3de883a9d 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispMACAuthentication.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispMACAuthentication.java @@ -97,4 +97,4 @@ public class LispMACAuthentication implements ILispAuthentication { public void setAlgorithm(String algorithm) { this.algorithm = algorithm; } -} \ No newline at end of file +} diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MappingRecordUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MappingRecordUtil.java index a5b4aeba7..fed3229c3 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MappingRecordUtil.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MappingRecordUtil.java @@ -71,4 +71,4 @@ public final class MappingRecordUtil { LOG.trace("mappingChanged(): FALSE"); return false; } -} \ No newline at end of file +} diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java index ce0eec454..0ccc7d5b3 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java @@ -28,8 +28,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.Ma import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord; -import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord; +import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItem; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder; diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml index a6c1863b0..50011168d 100644 --- a/mappingservice/mapcache/pom.xml +++ b/mappingservice/mapcache/pom.xml @@ -27,10 +27,5 @@ ${project.groupId} mappingservice.lisp-proto - - junit - junit - compile - diff --git a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java index 0b30097fc..4f1f19cc5 100644 --- a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java +++ b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java @@ -8,8 +8,8 @@ package org.opendaylight.lispflowmapping.mapcache; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml index 47ab6bb70..3d45c65a0 100644 --- a/mappingservice/neutron/pom.xml +++ b/mappingservice/neutron/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 0.14.0-SNAPSHOT + 3.0.1 @@ -67,16 +67,16 @@ yang-ext - org.opendaylight.mdsal.model - ietf-interfaces + org.opendaylight.mdsal.binding.model.ietf + rfc8343 - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 + org.opendaylight.mdsal.binding.model.iana + iana-if-type - org.opendaylight.mdsal.model - ietf-ip-2014-06-16 + org.opendaylight.mdsal.binding.model.ietf + rfc7277 org.opendaylight.netconf @@ -85,7 +85,7 @@ org.opendaylight.mdsal mdsal-singleton-common-api - 2.6.0-SNAPSHOT + 3.0.1 @@ -96,12 +96,32 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 + 2.0.0-beta.5 + test + + + org.powermock + powermock-api-support + 2.0.0-beta.5 + test + + + org.powermock + powermock-core + 2.0.0-beta.5 + test + + + org.powermock + powermock-reflect + 2.0.0-beta.5 test org.powermock powermock-module-junit4 + 2.0.0-beta.5 test diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToRlocMapper.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToRlocMapper.java index 726bb22fb..c89033891 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToRlocMapper.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToRlocMapper.java @@ -47,4 +47,4 @@ public class HostIdToRlocMapper { //for now, delete all rlocs mapper.remove(hostId); } -} \ No newline at end of file +} diff --git a/mappingservice/neutron/src/main/resources/org/opendaylight/blueprint/neutron.xml b/mappingservice/neutron/src/main/resources/OSGI-INF/blueprint/neutron.xml similarity index 100% rename from mappingservice/neutron/src/main/resources/org/opendaylight/blueprint/neutron.xml rename to mappingservice/neutron/src/main/resources/OSGI-INF/blueprint/neutron.xml diff --git a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java index 054e88df4..9140c6638 100644 --- a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java +++ b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java @@ -9,6 +9,7 @@ package org.opendaylight.lispflowmapping.neutron; import com.google.common.collect.Lists; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.List; @@ -17,7 +18,6 @@ import java.util.concurrent.Future; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.mockito.internal.util.reflection.Whitebox; import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; import org.opendaylight.lispflowmapping.neutron.mappingmanager.HostInformationManager; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; @@ -68,7 +68,15 @@ public class PortDataProcessorTest { augmentationMock = Mockito.mock(PortBindingExtension.class); future = Mockito.mock(Future.class); rpcResult = Mockito.mock(RpcResult.class); - Whitebox.setInternalState(portDataProcessor, "hostInformationManager", hostInformationManager); + + try { + Field field = portDataProcessor.getClass().getDeclaredField("hostInformationManager"); + field.setAccessible(true); + field.set(portDataProcessor, hostInformationManager); + } catch (Exception e) { + throw new RuntimeException("Unable to set hostInformationManager", e); + } + // common stubbing is called before invocation of each test commonStubbing(); } diff --git a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManagerTest.java b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManagerTest.java index a353a854e..a46aa897e 100644 --- a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManagerTest.java +++ b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManagerTest.java @@ -14,7 +14,7 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; import org.opendaylight.lispflowmapping.neutron.LispUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid; diff --git a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/PortUuidToPortDataMapperTest.java b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/PortUuidToPortDataMapperTest.java index 874a391fc..21986269e 100644 --- a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/PortUuidToPortDataMapperTest.java +++ b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/PortUuidToPortDataMapperTest.java @@ -13,7 +13,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.lispflowmapping.neutron.mappingmanager.mappers.PortUuidToPortDataMapper; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid; import org.powermock.core.classloader.annotations.PrepareForTest; diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 68953d3e9..e62daa6ca 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 3.1.3 + 4.0.2 @@ -39,7 +39,7 @@ org.opendaylight.mdsal mdsal-artifacts - 2.6.0-SNAPSHOT + 3.0.1 pom import @@ -62,17 +62,40 @@ 1.4 test + + + org.powermock + powermock-api-mockito2 + 2.0.0-beta.5 + test + + + org.powermock + powermock-api-support + 2.0.0-beta.5 + test + + + org.powermock + powermock-core + 2.0.0-beta.5 + test + + + org.powermock + powermock-reflect + 2.0.0-beta.5 + test + + + org.powermock + powermock-module-junit4 + 2.0.0-beta.5 + test + - - - org.mockito - mockito-core - test - - - diff --git a/mappingservice/shell/src/main/resources/org/opendaylight/blueprint/mappingservice-shell.xml b/mappingservice/shell/src/main/resources/OSGI-INF/blueprint/mappingservice-shell.xml similarity index 100% rename from mappingservice/shell/src/main/resources/org/opendaylight/blueprint/mappingservice-shell.xml rename to mappingservice/shell/src/main/resources/OSGI-INF/blueprint/mappingservice-shell.xml diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index 529365bf1..03a9bb0da 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -66,13 +66,8 @@ common.unittest.tools - org.powermock - powermock-api-mockito - test - - - org.powermock - powermock-module-junit4 + org.mockito + mockito-inline test diff --git a/mappingservice/southbound/src/main/resources/org/opendaylight/blueprint/mappingservice-southbound.xml b/mappingservice/southbound/src/main/resources/OSGI-INF/blueprint/mappingservice-southbound.xml similarity index 100% rename from mappingservice/southbound/src/main/resources/org/opendaylight/blueprint/mappingservice-southbound.xml rename to mappingservice/southbound/src/main/resources/OSGI-INF/blueprint/mappingservice-southbound.xml diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPluginTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPluginTest.java index 0f201d7bc..40d3af828 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPluginTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPluginTest.java @@ -24,7 +24,6 @@ import java.net.UnknownHostException; import java.nio.ByteBuffer; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -40,12 +39,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev16 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MessageType; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddressBuilder; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -@RunWith(PowerMockRunner.class) -@PrepareForTest(NioDatagramChannel.class) public class LispSouthboundPluginTest { private static NioDatagramChannel channel; @@ -79,8 +73,8 @@ public class LispSouthboundPluginTest { lispSouthboundPlugin.setBindingAddress(ADDRESS_1); lispSouthboundPlugin.setMapRegisterCacheEnabled(false); - channel = PowerMockito.mock(NioDatagramChannel.class); - xtrChannel = PowerMockito.mock(NioDatagramChannel.class); + channel = Mockito.mock(NioDatagramChannel.class); + xtrChannel = Mockito.mock(NioDatagramChannel.class); injectChannel(); injectXtrChannel(); } diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java index 73382eb02..bc0ffd220 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java @@ -18,7 +18,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer; import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer; import org.opendaylight.lispflowmapping.lisp.serializer.MapReplySerializer; diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java index 36a27f7b6..1321c8395 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/AuthenticationKeyDataListenerTest.java @@ -14,7 +14,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java index aae6e3d8e..2df6493a3 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java @@ -36,8 +36,8 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.AdditionalMatchers; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatchers; import org.mockito.InOrder; -import org.mockito.Matchers; import org.mockito.Mockito; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer; @@ -118,22 +118,26 @@ public class LispSouthboundHandlerTest extends BaseTestCase { @BeforeClass public static void initTests() { akdb = Mockito.mock(AuthKeyDb.class); - Mockito.when(akdb.getAuthenticationKey(Matchers.eq(LispAddressUtil.asIpv4PrefixBinaryEid("10.10.10.10/8")))) + Mockito.when(akdb.getAuthenticationKey(ArgumentMatchers.eq(LispAddressUtil.asIpv4PrefixBinaryEid( + "10.10.10.10/8")))) .thenReturn(new MappingAuthkeyBuilder().setKeyType(1).setKeyString("password").build()); - Mockito.when(akdb.getAuthenticationKey(Matchers.eq(LispAddressUtil.asIpv6PrefixBinaryEid( + Mockito.when(akdb.getAuthenticationKey(ArgumentMatchers.eq(LispAddressUtil.asIpv6PrefixBinaryEid( "2610:d0:ffff:192:0:0:0:1/128")))) .thenReturn(new MappingAuthkeyBuilder().setKeyType(1).setKeyString("password").build()); - Mockito.when(akdb.getAuthenticationKey(Matchers.eq(LispAddressUtil.asIpv4PrefixBinaryEid("153.16.254.1/32")))) + Mockito.when(akdb.getAuthenticationKey(ArgumentMatchers.eq(LispAddressUtil.asIpv4PrefixBinaryEid( + "153.16.254.1/32")))) .thenReturn(new MappingAuthkeyBuilder().setKeyType(1).setKeyString("password").build()); - Mockito.when(akdb.getAuthenticationKey(Matchers.eq(LispAddressUtil.asIpv4PrefixBinaryEid("125.124.123.122/8", - new InstanceIdType(21L))))) + Mockito.when(akdb.getAuthenticationKey(ArgumentMatchers.eq(LispAddressUtil.asIpv4PrefixBinaryEid( + "125.124.123.122/8", new InstanceIdType(21L))))) .thenReturn(new MappingAuthkeyBuilder().setKeyType(1).setKeyString("password").build()); - Mockito.when(akdb.getAuthenticationKey(Matchers.eq(LispAddressUtil.asMacEid("0a:0b:0c:0d:0e:0f")))) + Mockito.when(akdb.getAuthenticationKey(ArgumentMatchers.eq(LispAddressUtil.asMacEid( + "0a:0b:0c:0d:0e:0f")))) .thenReturn(new MappingAuthkeyBuilder().setKeyType(1).setKeyString("password").build()); - Mockito.when(akdb.getAuthenticationKey(Matchers.eq(LispAddressUtil.asIpv6PrefixBinaryEid( + Mockito.when(akdb.getAuthenticationKey(ArgumentMatchers.eq(LispAddressUtil.asIpv6PrefixBinaryEid( "f0f:f0f:f0f:f0f:f0f:f0f:f0f:f0f/8")))) .thenReturn(new MappingAuthkeyBuilder().setKeyType(1).setKeyString("password").build()); - Mockito.when(akdb.getAuthenticationKey(Matchers.eq(LispAddressUtil.asIpv4PrefixBinaryEid("172.1.1.2/32")))) + Mockito.when(akdb.getAuthenticationKey(ArgumentMatchers.eq(LispAddressUtil.asIpv4PrefixBinaryEid( + "172.1.1.2/32")))) .thenReturn(new MappingAuthkeyBuilder().setKeyType(1).setKeyString("password").build()); akdl = Mockito.mock(AuthenticationKeyDataListener.class); @@ -611,6 +615,7 @@ public class LispSouthboundHandlerTest extends BaseTestCase { MapRegisterCacheMetadataBuilder cacheMetadataBld = new MapRegisterCacheMetadataBuilder(); cacheMetadataBld.setTimestamp(System.currentTimeMillis() - (cacheRecordTimeouted ? CACHE_RECORD_TIMEOUT : 0L)); cacheMetadataBld.setWantMapNotify(false); + cacheMetadataBld.setEidLispAddress(new ArrayList<>()); MapRegisterCacheValueBuilder cacheValueBld = new MapRegisterCacheValueBuilder(); cacheValueBld.setMapRegisterCacheMetadata(cacheMetadataBld.build()); diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java index 5259536c0..8c77ec184 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier; import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; import org.opendaylight.lispflowmapping.southbound.LispSouthboundPlugin; @@ -241,4 +241,4 @@ public class LispXtrSouthboundHandlerTest { .setSmr(false) .setSmrInvoked(false); } -} \ No newline at end of file +} -- 2.36.6