import static org.junit.Assert.assertNull;
import com.google.common.collect.Lists;
-
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.mockito.junit.MockitoJUnitRunner;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapResolverAsync;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapServerAsync;
import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
+import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.AddMapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapNotify;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapNotify;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRegister;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MappingKeepAlive;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.RequestMapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrRequestMapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.list.EidItemBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRegister;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
- .MapRegisterCacheMetadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
- .MapRegisterCacheMetadataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
- .map.register.cache.metadata.EidLispAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
- .map.register.cache.metadata.EidLispAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.MapRegisterCacheMetadata;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.MapRegisterCacheMetadataBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapnotifymessage.MapNotifyBuilder;
-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.
- MappingRecordItemBuilder;
+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.MappingRecordItemBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapreplymessage.MapReplyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequest.SourceEidBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequestmessage.MapRequest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapNotifyInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapReplyInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapRequestInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
+import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.Uint16;
@RunWith(MockitoJUnitRunner.class)
public class LispMappingServiceTest {
@Mock private static MapRegister mapRegisterMock;
- @Mock(name = "lispSB") private static OdlLispSbService lispSBMock;
@Mock(name = "mapServer") private static IMapServerAsync mapServerMock;
- @Mock(name = "mapService") private static IMappingService iMappingServiceMock;
@Mock(name = "mapResolver") private static IMapResolverAsync mapResolverMock;
@Mock(name = "tlsMapReply") private static ThreadLocal<MapReply> tlsMapReplyMock;
- @Mock(name = "notificationService") private static NotificationService notificationServiceMock;
@Mock(name = "tlsMapNotify") private static ThreadLocal<Pair<MapNotify, List<TransportAddress>>> tlsMapNotifyMock;
@Mock(name = "tlsMapRequest") private static ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequestMock;
- @InjectMocks private static LispMappingService lispMappingService;
+ @Mock private static Registration rpcRegistration;
+ @Mock(name = "listenerRegistration") private static Registration listenerRegistration;
+
+ private final NotificationService notificationService = Mockito.mock(NotificationService.class);
+ private final RpcProviderService rpcProviderService = Mockito.mock(RpcProviderService.class);
+ private final IMappingService mappingService = Mockito.mock(IMappingService.class);
+ private final OdlLispSbService odlLispSbService = Mockito.mock(OdlLispSbService.class);
+ private final ClusterSingletonServiceProvider clusterSingletonService = Mockito.mock(
+ ClusterSingletonServiceProvider.class);
+
+ @InjectMocks
+ private final LispMappingService lispMappingService = new LispMappingService(
+ mappingService, odlLispSbService, clusterSingletonService, rpcProviderService, notificationService);
private static final byte[] IPV4_BYTES_1 = new byte[] {1, 2, 3, 0};
private static final byte[] IPV4_BYTES_2 = new byte[] {1, 2, 4, 0};
private static final TransportAddress TRANSPORT_ADDRESS_1 = new TransportAddressBuilder()
.setIpAddress(new IpAddressBinary(new Ipv4AddressBinary(IPV4_BYTES_1)))
- .setPort(new PortNumber(9999)).build();
+ .setPort(new PortNumber(Uint16.valueOf(9999))).build();
private static final TransportAddress TRANSPORT_ADDRESS_2 = new TransportAddressBuilder()
.setIpAddress(new IpAddressBinary(new Ipv4AddressBinary(IPV4_BYTES_2)))
- .setPort(new PortNumber(8888)).build();
+ .setPort(new PortNumber(Uint16.valueOf(8888))).build();
private static final TransportAddress TRANSPORT_ADDRESS = new TransportAddressBuilder()
.setIpAddress(new IpAddressBinary(new Ipv4AddressBinary(IPV4_BYTES_1)))
- .setPort(new PortNumber(LispMessage.PORT_NUM)).build();
+ .setPort(new PortNumber(LispMessage.PORT_NUMBER)).build();
/**
* Tests {@link LispMappingService#handleMapRequest} method.
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);
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);
.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));
- Mockito.verify(lispSBMock).sendMapRequest(smrib.build());
+ Mockito.verify(odlLispSbService).sendMapRequest(smrib.build());
}
/**
public void handleMapRegisterTest() {
final Pair<MapNotify, List<TransportAddress>> 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());
}
/**
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);
- Mockito.verify(lispSBMock, Mockito.times(2)).sendMapNotify(Mockito.argThat(new TransportAddressMatch()));
+ Mockito.verify(odlLispSbService, Mockito.times(2)).sendMapNotify(Mockito.argThat(new TransportAddressMatch()));
}
/**
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);
.setTransportAddress(TRANSPORT_ADDRESS);
lispMappingService.onAddMapping(addMapping);
- Mockito.verify(lispSBMock).sendMapNotify(smnib.build());
+ Mockito.verify(odlLispSbService).sendMapNotify(smnib.build());
}
/**
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
.setTransportAddress(TRANSPORT_ADDRESS_1);
lispMappingService.onRequestMapping(requestMapping);
- Mockito.verify(lispSBMock).sendMapReply(smrib.build());
+ Mockito.verify(odlLispSbService).sendMapReply(smrib.build());
}
/**
.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);
- Mockito.verifyZeroInteractions(lispSBMock);
+ Mockito.verifyZeroInteractions(odlLispSbService);
}
/**
Mockito.when(mappingKeepAlive.getMapRegisterCacheMetadata()).thenReturn(getDefaultMapRegisterCacheMetadata());
lispMappingService.onMappingKeepAlive(mappingKeepAlive);
- Mockito.verify(iMappingServiceMock).updateMappingRegistration(MappingOrigin.Southbound, IPV4_EID_1, TIMESTAMP);
- Mockito.verify(iMappingServiceMock).updateMappingRegistration(MappingOrigin.Southbound, IPV4_EID_2, TIMESTAMP);
+ Mockito.verify(mappingService).refreshMappingRegistration(IPV4_EID_1, null, TIMESTAMP);
+ Mockito.verify(mappingService).refreshMappingRegistration(IPV4_EID_2, null, TIMESTAMP);
}
/**
.setTransportAddress(TRANSPORT_ADDRESS);
lispMappingService.handleSMR(mapRequest, subscriber);
- Mockito.verify(lispSBMock).sendMapRequest(smrib.build());
+ Mockito.verify(odlLispSbService).sendMapRequest(smrib.build());
}
/**
*/
@Test
public void closeTest() throws Exception {
+ setMock("rpcRegistration", rpcRegistration);
+ setMock("listenerRegistration", listenerRegistration);
lispMappingService.close();
-
+ Mockito.verify(rpcRegistration).close();
+ Mockito.verify(listenerRegistration).close();
+ Mockito.verify(clusterSingletonService).close();
assertNull(getField("mapResolver"));
assertNull(getField("mapServer"));
}
*/
@Test
public void otherTest() throws Exception {
- assertEquals(notificationServiceMock, lispMappingService.getNotificationService());
+ assertEquals(notificationService, lispMappingService.getNotificationService());
assertEquals(true, lispMappingService.shouldUseSmr());
- BindingAwareBroker brokerMock = Mockito.mock(BindingAwareBroker.class);
- lispMappingService.setBindingAwareBroker(brokerMock);
- assertEquals(brokerMock, getField("broker"));
-
- NotificationService otherNotificationServiceMock = Mockito.mock(NotificationService.class);
- lispMappingService.setNotificationService(otherNotificationServiceMock);
- assertEquals(otherNotificationServiceMock, getField("notificationService"));
-
- ProviderContext sessionMock = Mockito.mock(ProviderContext.class);
- lispMappingService.onSessionInitiated(sessionMock);
- assertEquals(sessionMock, getField("session"));
-
lispMappingService.setShouldAuthenticate(true);
Mockito.verify(mapResolverMock).setShouldAuthenticate(true);
- IMappingService mappingServiceMock = Mockito.mock(IMappingService.class);
- lispMappingService.setMappingService(mappingServiceMock);
- assertEquals(mappingServiceMock, getField("mapService"));
-
lispMappingService.onGotMapReply(Mockito.mock(GotMapReply.class));
lispMappingService.onGotMapNotify(Mockito.mock(GotMapNotify.class));
lispMappingService.onXtrRequestMapping(Mockito.mock(XtrRequestMapping.class));
lispMappingService.onXtrReplyMapping(Mockito.mock(XtrReplyMapping.class));
}
+ private void setMock(final String fieldName, final Object value)
+ throws IllegalAccessException, NoSuchFieldException {
+ final Field field = LispMappingService.class.getDeclaredField(fieldName);
+ field.setAccessible(true);
+ field.set(lispMappingService, value);
+ }
+
@SuppressWarnings("unchecked")
- private static <T> T getField(String fieldName) throws NoSuchFieldException, IllegalAccessException {
+ private <T> T getField(String fieldName) throws NoSuchFieldException, IllegalAccessException {
final Field field = LispMappingService.class.getDeclaredField(fieldName);
field.setAccessible(true);
.setEid(IPV4_EID_2).build();
return new MapRegisterCacheMetadataBuilder()
- .setEidLispAddress(Lists.newArrayList(eidLispAddress_1, eidLispAddress_2))
+ .setEidLispAddress(BindingMap.ordered(eidLispAddress_1, eidLispAddress_2))
.setTimestamp(TIMESTAMP).build();
}
- class TransportAddressMatch extends ArgumentMatcher<SendMapNotifyInput> {
- public boolean matches(Object sendMapNotify) {
- final SendMapNotifyInput sendMapNotifyInput = (SendMapNotifyInput) sendMapNotify;
- final TransportAddress notifyTransportAddress = sendMapNotifyInput.getTransportAddress();
+ class TransportAddressMatch implements ArgumentMatcher<SendMapNotifyInput> {
+ @Override
+ public boolean matches(SendMapNotifyInput sendMapNotify) {
+ final TransportAddress notifyTransportAddress = sendMapNotify.getTransportAddress();
return TRANSPORT_ADDRESS_1.equals(notifyTransportAddress)
|| TRANSPORT_ADDRESS_2.equals(notifyTransportAddress);
}
Code Review / lispflowmapping.git / blobdiff