* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.lispflowmapping.implementation;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.List;
+import java.util.Set;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapNotifyHandler;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapRequestResultHandler;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapResolverAsync;
-import org.opendaylight.lispflowmapping.interfaces.lisp.IMapServerAsync;
import org.opendaylight.lispflowmapping.interfaces.lisp.ISmrNotificationListener;
import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
import org.opendaylight.mdsal.binding.api.NotificationService;
-import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener;
+import org.opendaylight.mdsal.binding.api.RpcService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
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.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.MapReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRequest;
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.OdlLispProtoListener;
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.XtrId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrReplyMapping;
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.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.osgi.service.component.annotations.Activate;
@Component(service = {IFlowMapping.class, IMapRequestResultHandler.class, IMapNotifyHandler.class},
immediate = true, property = "type=default")
public class LispMappingService implements IFlowMapping, IMapRequestResultHandler,
- IMapNotifyHandler, OdlLispProtoListener, AutoCloseable, ClusterSingletonService {
- private static final String LISPFLOWMAPPING_ENTITY_NAME = "lispflowmapping";
- private static final ServiceGroupIdentifier SERVICE_GROUP_IDENTIFIER = ServiceGroupIdentifier.create(
- LISPFLOWMAPPING_ENTITY_NAME);
+ IMapNotifyHandler, AutoCloseable, ClusterSingletonService {
+ private static final ServiceGroupIdentifier SERVICE_GROUP_IDENTIFIER =
+ new ServiceGroupIdentifier("lispflowmapping");
private static final Logger LOG = LoggerFactory.getLogger(LispMappingService.class);
private volatile boolean smr = ConfigIni.getInstance().smrIsSet();
private volatile String elpPolicy = ConfigIni.getInstance().getElpPolicy();
+ // These are non-final for testing
private ThreadLocal<MapReply> tlsMapReply = new ThreadLocal<>();
private ThreadLocal<Pair<MapNotify, List<TransportAddress>>> tlsMapNotify = new ThreadLocal<>();
private ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequest = new ThreadLocal<>();
-
private IMapResolverAsync mapResolver;
- private IMapServerAsync mapServer;
+ private MapServer mapServer;
+ private SendMapRequest sendMapRequest;
+ private SendMapReply sendMapReply;
+ private SendMapNotify sendMapNotify;
private final IMappingService mapService;
- private final OdlLispSbService lispSB;
- private final ClusterSingletonServiceProvider clusterSingletonService;
- private final RpcProviderService rpcProviderService;
private final NotificationService notificationService;
- private final Registration rpcRegistration;
private final Registration listenerRegistration;
+ private final Registration cssRegistration;
@Inject
@Activate
public LispMappingService(@Reference final IMappingService mappingService,
- @Reference final OdlLispSbService odlLispService,
@Reference final ClusterSingletonServiceProvider clusterSingletonService,
- @Reference final RpcProviderService rpcProviderService,
- @Reference final NotificationService notificationService) {
+ @Reference final RpcService rpcService, @Reference final NotificationService notificationService) {
this.mapService = mappingService;
- this.lispSB = odlLispService;
- this.clusterSingletonService = clusterSingletonService;
- this.rpcProviderService = rpcProviderService;
+ sendMapRequest = rpcService.getRpc(SendMapRequest.class);
+ sendMapReply = rpcService.getRpc(SendMapReply.class);
+ sendMapNotify = rpcService.getRpc(SendMapNotify.class);
this.notificationService = notificationService;
// initialize
- listenerRegistration = notificationService.registerNotificationListener(this);
- rpcRegistration = rpcProviderService.registerRpcImplementation(OdlLispSbService.class, lispSB);
-
+ listenerRegistration = notificationService.registerCompositeListener(new CompositeListener(Set.of(
+ new CompositeListener.Component<>(AddMapping.class, this::onAddMapping),
+ new CompositeListener.Component<>(GotMapNotify.class, this::onGotMapNotify),
+ new CompositeListener.Component<>(RequestMapping.class, this::onRequestMapping),
+ new CompositeListener.Component<>(GotMapReply.class, this::onGotMapReply),
+ new CompositeListener.Component<>(XtrRequestMapping.class, this::onXtrRequestMapping),
+ new CompositeListener.Component<>(XtrReplyMapping.class, this::onXtrReplyMapping),
+ new CompositeListener.Component<>(MappingKeepAlive.class, this::onMappingKeepAlive))));
mapResolver = new MapResolver(mapService, smr, elpPolicy, this);
mapServer = new MapServer(mapService, smr, this, notificationService);
- clusterSingletonService.registerClusterSingletonService(this);
+ cssRegistration = clusterSingletonService.registerClusterSingletonService(this);
mapResolver.setSmrNotificationListener((ISmrNotificationListener) mapServer);
LOG.info("LISP (RFC6830) Mapping Service initialized");
}
SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder();
smrib.setMapRequest(new MapRequestBuilder(tlsMapRequest.get().getLeft()).build());
smrib.setTransportAddress(tlsMapRequest.get().getRight());
- getLispSB().sendMapRequest(smrib.build());
+ sendMapRequest.invoke(smrib.build());
return null;
} else {
return tlsMapReply.get();
SendMapNotifyInputBuilder smnib = new SendMapNotifyInputBuilder();
smnib.setMapNotify(new MapNotifyBuilder(mapNotify).build());
smnib.setTransportAddress(address);
- getLispSB().sendMapNotify(smnib.build());
+ sendMapNotify.invoke(smnib.build());
}
- @Override
- public void onAddMapping(AddMapping mapRegisterNotification) {
+ @VisibleForTesting
+ void onAddMapping(AddMapping mapRegisterNotification) {
Pair<MapNotify, List<TransportAddress>> result = handleMapRegister(mapRegisterNotification.getMapRegister());
if (result != null && result.getLeft() != null) {
MapNotify mapNotify = result.getLeft();
}
}
- @Override
- public void onRequestMapping(RequestMapping mapRequestNotification) {
+ @VisibleForTesting
+ void onRequestMapping(RequestMapping mapRequestNotification) {
MapReply mapReply = handleMapRequest(mapRequestNotification.getMapRequest());
if (mapReply != null) {
SendMapReplyInputBuilder smrib = new SendMapReplyInputBuilder();
smrib.setMapReply(new MapReplyBuilder(mapReply).build());
smrib.setTransportAddress(mapRequestNotification.getTransportAddress());
- getLispSB().sendMapReply(smrib.build());
+ sendMapReply.invoke(smrib.build());
} else {
LOG.debug("handleMapRequest: Got null MapReply");
}
}
- @Override
- public void onGotMapReply(GotMapReply notification) {
+ @VisibleForTesting
+ void onGotMapReply(GotMapReply notification) {
LOG.debug("Received GotMapReply notification, ignoring");
}
- @Override
- public void onGotMapNotify(GotMapNotify notification) {
+ @VisibleForTesting
+ void onGotMapNotify(GotMapNotify notification) {
LOG.debug("Received GotMapNotify notification, ignoring");
}
- @Override
- public void onXtrRequestMapping(XtrRequestMapping notification) {
+ @VisibleForTesting
+ void onXtrRequestMapping(XtrRequestMapping notification) {
LOG.debug("Received XtrRequestMapping notification, ignoring");
}
- @Override
- public void onXtrReplyMapping(XtrReplyMapping notification) {
+ @VisibleForTesting
+ void onXtrReplyMapping(XtrReplyMapping notification) {
LOG.debug("Received XtrReplyMapping notification, ignoring");
}
- @Override
- public void onMappingKeepAlive(MappingKeepAlive notification) {
+ @VisibleForTesting
+ void onMappingKeepAlive(MappingKeepAlive notification) {
final MapRegisterCacheMetadata cacheMetadata = notification.getMapRegisterCacheMetadata();
for (EidLispAddress eidLispAddress : cacheMetadata.nonnullEidLispAddress().values()) {
final Eid eid = eidLispAddress.getEid();
}
}
- private OdlLispSbService getLispSB() {
- return lispSB;
- }
-
@Override
public void handleMapReply(MapReply reply) {
tlsMapReply.set(reply);
SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder();
smrib.setMapRequest(new MapRequestBuilder(smrMapRequest).build());
smrib.setTransportAddress(LispNotificationHelper.getTransportAddressFromRloc(subscriber));
- getLispSB().sendMapRequest(smrib.build());
-
+ sendMapRequest.invoke(smrib.build());
}
@Override
private void destroy() {
LOG.info("LISP (RFC6830) Mapping Service is destroyed!");
mapResolver = null;
- mapServer = null;
+ if (mapServer != null) {
+ mapServer.close();
+ mapServer = null;
+ }
}
@Deactivate
@Override
public void close() throws Exception {
destroy();
- clusterSingletonService.close();
- rpcRegistration.close();
+ cssRegistration.close();
listenerRegistration.close();
}
return SERVICE_GROUP_IDENTIFIER;
}
}
-