import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
import org.opendaylight.mdsal.binding.api.NotificationService;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.binding.api.RpcService;
+import org.opendaylight.mdsal.singleton.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.rloc.container.Rloc;
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.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.OdlLispSbService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapNotify;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapNotifyInput;
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.SendMapReply;
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.SendMapRequest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapRequestInputBuilder;
import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.yang.binding.util.BindingMap;
@Mock(name = "tlsMapRequest") private static ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequestMock;
@Mock(name = "listenerRegistration") private static Registration listenerRegistration;
@Mock(name = "cssRegistration") private static Registration cssRegistration;
- @Mock(name = "lispSB") private static OdlLispSbService odlLispSbService;
+ @Mock(name = "sendMapRequest") private static SendMapRequest sendMapRequest;
+ @Mock(name = "sendMapReply") private static SendMapReply sendMapReply;
+ @Mock(name = "sendMapNotify") private static SendMapNotify sendMapNotify;
private final NotificationService notificationService = Mockito.mock(NotificationService.class);
- private final RpcConsumerRegistry rpcService = Mockito.mock(RpcConsumerRegistry.class);
+ private final RpcService rpcService = Mockito.mock(RpcService.class);
private final IMappingService mappingService = Mockito.mock(IMappingService.class);
private final ClusterSingletonServiceProvider clusterSingletonService = Mockito.mock(
ClusterSingletonServiceProvider.class);
Mockito.when(tlsMapRequestMock.get()).thenReturn(pair);
assertNull(lispMappingService.handleMapRequest(mapRequest));
- Mockito.verify(odlLispSbService).sendMapRequest(smrib.build());
+ Mockito.verify(sendMapRequest).invoke(smrib.build());
}
/**
Mockito.when(tlsMapNotifyMock.get()).thenReturn(getDefaultMapNotifyPair());
lispMappingService.onAddMapping(addMapping);
- Mockito.verify(odlLispSbService, Mockito.times(2)).sendMapNotify(Mockito.argThat(new TransportAddressMatch()));
+ Mockito.verify(sendMapNotify, Mockito.times(2)).invoke(Mockito.argThat(new TransportAddressMatch()));
}
/**
.setTransportAddress(TRANSPORT_ADDRESS);
lispMappingService.onAddMapping(addMapping);
- Mockito.verify(odlLispSbService).sendMapNotify(smnib.build());
+ Mockito.verify(sendMapNotify).invoke(smnib.build());
}
/**
.setTransportAddress(TRANSPORT_ADDRESS_1);
lispMappingService.onRequestMapping(requestMapping);
- Mockito.verify(odlLispSbService).sendMapReply(smrib.build());
+ Mockito.verify(sendMapReply).invoke(smrib.build());
}
/**
Mockito.when(tlsMapReplyMock.get()).thenReturn(null);
lispMappingService.onRequestMapping(requestMapping);
- Mockito.verifyZeroInteractions(odlLispSbService);
+ Mockito.verifyZeroInteractions(sendMapReply);
}
/**
.setTransportAddress(TRANSPORT_ADDRESS);
lispMappingService.handleSMR(mapRequest, subscriber);
- Mockito.verify(odlLispSbService).sendMapRequest(smrib.build());
+ Mockito.verify(sendMapRequest).invoke(smrib.build());
}
/**
.setTimestamp(TIMESTAMP).build();
}
- class TransportAddressMatch implements ArgumentMatcher<SendMapNotifyInput> {
+ static class TransportAddressMatch implements ArgumentMatcher<SendMapNotifyInput> {
@Override
- public boolean matches(final SendMapNotifyInput sendMapNotify) {
- final TransportAddress notifyTransportAddress = sendMapNotify.getTransportAddress();
+ public boolean matches(final SendMapNotifyInput argument) {
+ final TransportAddress notifyTransportAddress = argument.getTransportAddress();
return TRANSPORT_ADDRESS_1.equals(notifyTransportAddress)
|| TRANSPORT_ADDRESS_2.equals(notifyTransportAddress);
}