* 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 org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
import org.opendaylight.mdsal.binding.api.NotificationService;
import org.opendaylight.mdsal.binding.api.NotificationService.CompositeListener;
-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.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.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;
immediate = true, property = "type=default")
public class LispMappingService implements IFlowMapping, IMapRequestResultHandler,
IMapNotifyHandler, AutoCloseable, ClusterSingletonService {
- private static final String LISPFLOWMAPPING_ENTITY_NAME = "lispflowmapping";
- private static final ServiceGroupIdentifier SERVICE_GROUP_IDENTIFIER = ServiceGroupIdentifier.create(
- LISPFLOWMAPPING_ENTITY_NAME);
+ 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 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 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;
+ sendMapRequest = rpcService.getRpc(SendMapRequest.class);
+ sendMapReply = rpcService.getRpc(SendMapReply.class);
+ sendMapNotify = rpcService.getRpc(SendMapNotify.class);
this.notificationService = notificationService;
// initialize
new CompositeListener.Component<>(XtrRequestMapping.class, this::onXtrRequestMapping),
new CompositeListener.Component<>(XtrReplyMapping.class, this::onXtrReplyMapping),
new CompositeListener.Component<>(MappingKeepAlive.class, this::onMappingKeepAlive))));
- rpcRegistration = rpcProviderService.registerRpcImplementation(OdlLispSbService.class, lispSB);
-
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());
}
@VisibleForTesting
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");
}
}
}
- 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
@Override
public void close() throws Exception {
destroy();
- clusterSingletonService.close();
- rpcRegistration.close();
+ cssRegistration.close();
listenerRegistration.close();
}