import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
+import org.opendaylight.lispflowmapping.config.ConfigIni;
import org.opendaylight.lispflowmapping.implementation.lisp.MapResolver;
import org.opendaylight.lispflowmapping.implementation.lisp.MapServer;
import org.opendaylight.lispflowmapping.implementation.util.LispNotificationHelper;
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.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.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.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.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class LispMappingService implements IFlowMapping, IMapRequestResultHandler,
IMapNotifyHandler, OdlLispProtoListener, AutoCloseable, ClusterSingletonService {
- public static final String LISPFLOWMAPPING_ENTITY_NAME = "lispflowmapping";
- public static final ServiceGroupIdentifier SERVICE_GROUP_IDENTIFIER = ServiceGroupIdentifier.create(
+ private static final String LISPFLOWMAPPING_ENTITY_NAME = "lispflowmapping";
+ private static final ServiceGroupIdentifier SERVICE_GROUP_IDENTIFIER = ServiceGroupIdentifier.create(
LISPFLOWMAPPING_ENTITY_NAME);
- protected static final Logger LOG = LoggerFactory.getLogger(LispMappingService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LispMappingService.class);
private final ClusterSingletonServiceProvider clusterSingletonService;
private volatile boolean smr = ConfigIni.getInstance().smrIsSet();
return this.smr;
}
- public void setShouldUseSmr(boolean smr) {
- this.smr = smr;
+ public void setShouldUseSmr(boolean shouldUseSmr) {
+ this.smr = shouldUseSmr;
if (mapServer != null) {
- mapServer.setSubscriptionService(smr);
+ mapServer.setSubscriptionService(shouldUseSmr);
}
if (mapResolver != null) {
- mapResolver.setSubscriptionService(smr);
+ mapResolver.setSubscriptionService(shouldUseSmr);
}
- ConfigIni.getInstance().setSmr(smr);
+ ConfigIni.getInstance().setSmr(shouldUseSmr);
}
public NotificationService getNotificationService() {
mapResolver = new MapResolver(mapService, smr, elpPolicy, this);
mapServer = new MapServer(mapService, smr, this, notificationService);
this.clusterSingletonService.registerClusterSingletonService(this);
+ mapResolver.setSmrNotificationListener((ISmrNotificationListener) mapServer);
LOG.info("LISP (RFC6830) Mapping Service init finished");
}
public void basicInit() {
mapResolver = new MapResolver(mapService, smr, elpPolicy, this);
mapServer = new MapServer(mapService, smr, this, notificationService);
+ mapResolver.setSmrNotificationListener((ISmrNotificationListener) mapServer);
}
public MapReply handleMapRequest(MapRequest request) {
if (LOG.isDebugEnabled()) {
- LOG.debug("DAO: Retrieving mapping for {}",
+ LOG.debug("LISP: Retrieving mapping for {}",
LispAddressStringifier.getString(request.getEidItem().get(0).getEid()));
}
public Pair<MapNotify, List<TransportAddress>> handleMapRegister(MapRegister mapRegister) {
if (LOG.isDebugEnabled()) {
- LOG.debug("DAO: Adding mapping for {}",
+ LOG.debug("LISP: Adding mapping for {}",
LispAddressStringifier.getString(mapRegister.getMappingRecordItem().get(0)
.getMappingRecord().getEid()));
}
final MapRegisterCacheMetadata cacheMetadata = notification.getMapRegisterCacheMetadata();
for (EidLispAddress eidLispAddress : cacheMetadata.getEidLispAddress()) {
final Eid eid = eidLispAddress.getEid();
+ final XtrId xtrId = cacheMetadata.getXtrId();
final Long timestamp = cacheMetadata.getTimestamp();
LOG.debug("Update map registration for eid {} with timestamp {}", LispAddressStringifier.getString(eid),
timestamp);
- mapService.updateMappingRegistration(MappingOrigin.Southbound, eid, timestamp);
+ mapService.refreshMappingRegistration(eid, xtrId, timestamp);
}
}
}
@Override
- public void handleSMR(MapRequest smr, Rloc subscriber) {
+ public void handleSMR(MapRequest smrMapRequest, Rloc subscriber) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending SMR to {} with Source-EID {} and EID Record {}",
+ LOG.debug("Sending SMR Map-Request to {} with Source-EID {} and EID Record {} (reversed)",
LispAddressStringifier.getString(subscriber),
- LispAddressStringifier.getString(smr.getSourceEid().getEid()),
- LispAddressStringifier.getString(smr.getEidItem().get(0).getEid()));
+ LispAddressStringifier.getString(smrMapRequest.getSourceEid().getEid()),
+ LispAddressStringifier.getString(smrMapRequest.getEidItem().get(0).getEid()));
}
SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder();
- smrib.setMapRequest(new MapRequestBuilder(smr).build());
+ smrib.setMapRequest(new MapRequestBuilder(smrMapRequest).build());
smrib.setTransportAddress(LispNotificationHelper.getTransportAddressFromRloc(subscriber));
getLispSB().sendMapRequest(smrib.build());
tlsMapRequest.set(new MutablePair<MapRequest, TransportAddress>(mapRequest, transportAddress));
}
- public void destroy() {
+ private void destroy() {
LOG.info("LISP (RFC6830) Mapping Service is destroyed!");
mapResolver = null;
mapServer = null;