package org.opendaylight.lispflowmapping.implementation;
+import java.util.List;
+
import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.commons.lang3.tuple.Pair;
-import org.eclipse.osgi.framework.console.CommandInterpreter;
-import org.eclipse.osgi.framework.console.CommandProvider;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
import org.opendaylight.controller.sal.binding.api.NotificationListener;
import org.opendaylight.controller.sal.binding.api.NotificationService;
+import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
-import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceKey;
-import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceKeyUtil;
-import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceNoMaskKey;
import org.opendaylight.lispflowmapping.implementation.lisp.MapResolver;
import org.opendaylight.lispflowmapping.implementation.lisp.MapServer;
import org.opendaylight.lispflowmapping.implementation.mdsal.AuthenticationKeyDataListener;
+import org.opendaylight.lispflowmapping.implementation.mdsal.DataStoreBackEnd;
import org.opendaylight.lispflowmapping.implementation.mdsal.MappingDataListener;
-import org.opendaylight.lispflowmapping.implementation.serializer.LispMessage;
-import org.opendaylight.lispflowmapping.implementation.util.LispAFIConvertor;
import org.opendaylight.lispflowmapping.implementation.util.LispNotificationHelper;
+import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
-import org.opendaylight.lispflowmapping.interfaces.dao.ILispTypeConverter;
import org.opendaylight.lispflowmapping.interfaces.dao.IRowVisitor;
+import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys;
import org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMapping;
import org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMappingShell;
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.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.AddMapping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.LfmControlPlaneService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.MapNotify;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.MapRegister;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.MapReply;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.MapRequest;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.RequestMapping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.SendMapNotifyInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.SendMapReplyInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.SendMapRequestInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.LispAddressContainer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.address.ipv4.Ipv4AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.mapnotifymessage.MapNotifyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.mapreplymessage.MapReplyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.maprequestmessage.MapRequestBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.transportaddress.TransportAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.transportaddress.TransportAddressBuilder;
+import org.opendaylight.lispflowmapping.lisp.util.LispAFIConvertor;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
+import org.opendaylight.lispflowmapping.lisp.util.MapServerMapResolverUtil;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.LispProtoService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.AddMapping;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.MapNotify;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.MapRegister;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.MapReply;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.MapRequest;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.RequestMapping;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.SendMapNotifyInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.SendMapReplyInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.SendMapRequestInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.lispaddress.LispAddressContainer;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.lispaddress.lispaddresscontainer.address.ipv4.Ipv4AddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.mapnotifymessage.MapNotifyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.mapreplymessage.MapReplyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.maprequestmessage.MapRequestBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.transportaddress.TransportAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev150820.transportaddress.TransportAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.MappingserviceService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.MappingOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.db.instance.AuthenticationKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.db.instance.Mapping;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
import org.opendaylight.yangtools.yang.binding.Notification;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class LispMappingService implements CommandProvider, IFlowMapping, IFlowMappingShell, BindingAwareProvider,
- IMapRequestResultHandler, IMapNotifyHandler {
+public class LispMappingService implements IFlowMapping, IFlowMappingShell, BindingAwareProvider,
+ IMapRequestResultHandler, IMapNotifyHandler, AutoCloseable {
protected static final Logger LOG = LoggerFactory.getLogger(LispMappingService.class);
private static final ConfigIni configIni = new ConfigIni();
private ThreadLocal<MapNotify> tlsMapNotify = new ThreadLocal<MapNotify>();
private ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequest = new ThreadLocal<Pair<MapRequest, TransportAddress>>();
- private LfmControlPlaneService lispSB = null;
-
+ private LispProtoService lispSB = null;
private ProviderContext session;
+ private DataStoreBackEnd dsbe;
private NotificationService notificationService;
private static LispMappingService lfmService = null;
+ private BindingAwareBroker.RpcRegistration<MappingserviceService> lfmDbRpc;
+ private DataBroker dataBrokerService;
+ private RpcProviderRegistry rpcRegistry;
+ private BindingAwareBroker broker;
- class LispIpv4AddressInMemoryConverter implements ILispTypeConverter<Ipv4Address, Integer> {
+ public LispMappingService() {
+ LOG.debug("LispMappingService Module starting!");
+ lfmService = this;
}
- class LispIpv6AddressInMemoryConverter implements ILispTypeConverter<Ipv6Address, Integer> {
+ public void setDataBrokerService(DataBroker dataBrokerService) {
+ this.dataBrokerService = dataBrokerService;
}
- class MappingServiceKeyConvertor implements ILispTypeConverter<MappingServiceKey, Integer> {
+ public void setRpcProviderRegistry(RpcProviderRegistry rpcRegistry) {
+ this.rpcRegistry = rpcRegistry;
}
- class MappingServiceNoMaskKeyConvertor implements ILispTypeConverter<MappingServiceNoMaskKey, Integer> {
+ public void setBindingAwareBroker(BindingAwareBroker broker) {
+ this.broker = broker;
}
- public static LispMappingService getLispMappingService() {
- return lfmService;
+ public void initialize() {
+ broker.registerProvider(this);
+
+ LfmMappingDatabaseRpc mappingDbProviderRpc = new LfmMappingDatabaseRpc(dataBrokerService);
+ lfmDbRpc = rpcRegistry.addRpcImplementation(MappingserviceService.class, mappingDbProviderRpc);
+ dsbe = new DataStoreBackEnd(dataBrokerService);
+ restoreDaoFromDatastore();
}
- void setBindingAwareBroker(BindingAwareBroker bindingAwareBroker) {
- LOG.debug("BindingAwareBroker set!");
- BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
- bindingAwareBroker.registerProvider(this, bundleContext);
- lfmService = this;
+ @Override
+ public void onSessionInitiated(ProviderContext session) {
+ LOG.info("Lisp Consumer session initialized!");
+ notificationService = session.getSALService(NotificationService.class);
+ registerNotificationListener(AddMapping.class, new MapRegisterNotificationHandler());
+ registerNotificationListener(RequestMapping.class, new MapRequestNotificationHandler());
+ registerDataListeners(session.getSALService(DataBroker.class));
+ this.session = session;
+ LOG.info("LISP (RFC6830) Mapping Service init finished");
}
- void unsetBindingAwareBroker(BindingAwareBroker bindingAwareBroker) {
- LOG.debug("BindingAwareBroker was unset in LispMappingService");
- lfmService = null;
+ public static LispMappingService getLispMappingService() {
+ return lfmService;
}
public void basicInit(ILispDAO dao) {
mapServer = new MapServer(dao);
}
- void setLispDao(ILispDAO dao) {
+ public void setLispDao(ILispDAO dao) {
LOG.trace("LispDAO set in LispMappingService");
basicInit(dao);
}
lispDao = null;
}
- public void init() {
- try {
- registerWithOSGIConsole();
- LOG.info("LISP (RFC6830) Mapping Service init finished");
- } catch (Exception e) {
- LOG.error(e.getStackTrace().toString());
+ private void restoreDaoFromDatastore() {
+ List<Mapping> mappings = dsbe.getAllMappings();
+ List<AuthenticationKey> authKeys = dsbe.getAllAuthenticationKeys();
+
+ LOG.info("Restoring {} mappings and {} keys from datastore into DAO", mappings.size(), authKeys.size());
+
+ // restore southbound registered entries first ...
+ for (Mapping mapping : mappings) {
+ if (mapping.getOrigin() == MappingOrigin.Southbound) {
+ MapRegister register = MapServerMapResolverUtil.getMapRegister(mapping);
+ handleMapRegister(register, false);
+ }
+ }
+
+ // because northbound registrations have priority
+ for (Mapping mapping : mappings) {
+ if (mapping.getOrigin() == MappingOrigin.Northbound) {
+ MapRegister register = MapServerMapResolverUtil.getMapRegister(mapping);
+ handleMapRegister(register, false);
+ }
}
- }
- private void registerWithOSGIConsole() {
- BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
- bundleContext.registerService(CommandProvider.class.getName(), this, null);
+ for (AuthenticationKey authKey : authKeys) {
+ addAuthenticationKey(authKey.getLispAddressContainer(), authKey.getAuthkey());
+ }
}
public void destroy() {
closeDataListeners();
}
- public void _removeEid(final CommandInterpreter ci) {
- LispAddressContainer eid = LispAFIConvertor.getIPContainer(ci.nextArgument());
- lispDao.remove(MappingServiceKeyUtil.generateMappingServiceKey(eid));
- }
-
- public void _dumpAll(final CommandInterpreter ci) {
- ci.print(printMappings());
- }
-
public String printMappings() {
final StringBuffer sb = new StringBuffer();
sb.append("EID\tRLOCs\n");
+ final IRowVisitor innerVisitor = (new IRowVisitor() {
+ String lastKey = "";
+
+ public void visitRow(Object keyId, String valueKey, Object value) {
+ String key = keyId.getClass().getSimpleName() + "#" + keyId;
+ if (!lastKey.equals(key)) {
+ sb.append(key + "\t");
+ }
+ if (!(valueKey.equals(SubKeys.LCAF_SRCDST))) {
+ sb.append(valueKey + "=" + value + "\t");
+ }
+ lastKey = key;
+ }
+ });
lispDao.getAll(new IRowVisitor() {
String lastKey = "";
if (!lastKey.equals(key)) {
sb.append("\n" + key + "\t");
}
- sb.append(valueKey + "=" + value + "\t");
+ if (valueKey.equals(SubKeys.LCAF_SRCDST)) {
+ sb.append(valueKey + "= { ");
+ ((ILispDAO)value).getAll(innerVisitor);
+ sb.append("}\t");
+ } else {
+ sb.append(valueKey + "=" + value + "\t");
+ }
lastKey = key;
}
});
return sb.toString();
}
- public void _setShouldOverwriteRlocs(final CommandInterpreter ci) {
- try {
- boolean shouldOverwriteRloc = Boolean.parseBoolean(ci.nextArgument());
- setOverwrite(shouldOverwriteRloc);
- } catch (Exception e) {
- ci.println("Bad Usage!!");
- }
-
- }
-
- public void _addDefaultPassword(final CommandInterpreter ci) {
- addDefaultKeyIPv4();
- }
-
public void addDefaultKeyIPv4() {
LispAddressContainer address = LispAFIConvertor.toContainer(
- new Ipv4AddressBuilder().setIpv4Address(new Ipv4Address("0.0.0.0")).build());
- addAuthenticationKey(address, 0, "password");
- }
-
- public String getHelp() {
- StringBuffer help = new StringBuffer();
- help.append("---LISP Mapping Service---\n");
- help.append("\t dumpAll - Dump all current EID -> RLOC mappings\n");
- help.append("\t removeEid <EID> - Remove a single EID (/32 or /128)\n");
- help.append("\t setShouldOverwriteRlocs <true|false> - Set the map server's behavior regarding existing RLOCs\n");
- help.append("\t addDefaultPassword - Add \"password\" as default password for IPv4 EIDs");
- return help.toString();
+ new Ipv4AddressBuilder().setIpv4Address(new Ipv4Address("0.0.0.0")).setMask((short)0).build());
+ addAuthenticationKey(address, "password");
}
public MapReply handleMapRequest(MapRequest request) {
}
public MapReply handleMapRequest(MapRequest request, boolean smr) {
- LOG.debug("DAO: Retrieving mapping for {}/{}",
- LispAFIConvertor.toString(request.getEidRecord().get(0).getLispAddressContainer()),
- request.getEidRecord().get(0).getMask());
+ LOG.debug("DAO: Retrieving mapping for {}",
+ LispAddressStringifier.getString(request.getEidRecord().get(0).getLispAddressContainer()));
tlsMapReply.set(null);
tlsMapRequest.set(null);
mapResolver.handleMapRequest(request, smr, this);
- // After this invocation we assume that the thread local is filled with
- // the reply
+ // After this invocation we assume that the thread local is filled with the reply
if (tlsMapRequest.get() != null) {
SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder();
new MapRequestBuilder(tlsMapRequest.get().getLeft());
}
public MapNotify handleMapRegister(MapRegister mapRegister, boolean smr) {
- LOG.debug("DAO: Adding mapping for {}/{}",
- LispAFIConvertor.toString(mapRegister.getEidToLocatorRecord().get(0).getLispAddressContainer()),
- mapRegister.getEidToLocatorRecord().get(0).getMaskLength());
+ LOG.debug("DAO: Adding mapping for {}",
+ LispAddressStringifier.getString(mapRegister.getEidToLocatorRecord().get(0).getLispAddressContainer()));
tlsMapNotify.set(null);
mapServer.handleMapRegister(mapRegister, smr, this);
- // After this invocation we assume that the thread local is filled with
- // the reply
+ // After this invocation we assume that the thread local is filled with the reply
return tlsMapNotify.get();
}
- public String getAuthenticationKey(LispAddressContainer address, int maskLen) {
- LOG.debug("DAO: Retrieving authentication key for {}/{}", LispAFIConvertor.toString(address), maskLen);
- return mapServer.getAuthenticationKey(address, maskLen);
+ public String getAuthenticationKey(LispAddressContainer address) {
+ LOG.debug("DAO: Retrieving authentication key for {}", LispAddressStringifier.getString(address));
+ return mapServer.getAuthenticationKey(address);
}
- public void removeAuthenticationKey(LispAddressContainer address, int maskLen) {
- LOG.debug("DAO: Removing authentication key for {}/{}", LispAFIConvertor.toString(address), maskLen);
- mapServer.removeAuthenticationKey(address, maskLen);
+ public void removeAuthenticationKey(LispAddressContainer address) {
+ LOG.debug("DAO: Removing authentication key for {}", LispAddressStringifier.getString(address));
+ mapServer.removeAuthenticationKey(address);
}
- public void addAuthenticationKey(LispAddressContainer address, int maskLen, String key) {
- LOG.debug("DAO: Adding authentication key '{}' for {}/{}", key, LispAFIConvertor.toString(address), maskLen);
- mapServer.addAuthenticationKey(address, maskLen, key);
+ public void addAuthenticationKey(LispAddressContainer address, String key) {
+ LOG.debug("DAO: Adding authentication key '{}' for {}", key,
+ LispAddressStringifier.getString(address));
+ mapServer.addAuthenticationKey(address, key);
}
- public void removeMapping(LispAddressContainer address, int maskLen) {
- LOG.debug("DAO: Removing mapping for {}/{}", LispAFIConvertor.toString(address), maskLen);
- mapServer.removeMapping(address, maskLen, smr, this);
+ public void removeMapping(LispAddressContainer address) {
+ LOG.debug("DAO: Removing mapping for {}", LispAddressStringifier.getString(address));
+ mapServer.removeMapping(address, smr, this);
}
public boolean shouldIterateMask() {
return shouldAuthenticate;
}
- @Override
- public void onSessionInitiated(ProviderContext session) {
- LOG.info("Lisp Consumer session initialized!");
- notificationService = session.getSALService(NotificationService.class);
- registerNotificationListener(AddMapping.class, new MapRegisterNotificationHandler());
- registerNotificationListener(RequestMapping.class, new MapRequestNotificationHandler());
- registerDataListeners(session.getSALService(DataBroker.class));
- this.session = session;
- }
-
private void registerDataListeners(DataBroker broker) {
keyListener = new AuthenticationKeyDataListener(broker, this);
mappingListener = new MappingDataListener(broker, this);
public void onNotification(AddMapping mapRegisterNotification) {
MapNotify mapNotify = handleMapRegister(mapRegisterNotification.getMapRegister(), smr);
if (mapNotify != null) {
+ // store mappings in md-sal datastore only if we have a MapNotify
+ // XXX: this assumes that null MapNotifys are equivalent to authentication/registration errors
+ // however notifies may be disabled with a flag (by the registering router). This should
+ // be solved by moving southbound authentication of registrations out of handleMapRegister().
+ List<Mapping> mappings = LispNotificationHelper.getMapping(mapRegisterNotification);
+ for (Mapping mapping : mappings) {
+ dsbe.updateMapping(mapping);
+ }
+
TransportAddressBuilder tab = new TransportAddressBuilder();
tab.setIpAddress(mapRegisterNotification.getTransportAddress().getIpAddress());
tab.setPort(new PortNumber(LispMessage.PORT_NUM));
}
}
- private LfmControlPlaneService getLispSB() {
+ private LispProtoService getLispSB() {
if (lispSB == null) {
- lispSB = session.getRpcService(LfmControlPlaneService.class);
+ lispSB = session.getRpcService(LispProtoService.class);
}
return lispSB;
}
}
public void handleSMR(MapRequest smr, LispAddressContainer subscriber) {
- LOG.debug("Sending SMR to " + subscriber.toString());
+ LOG.debug("Sending SMR to {} with Source-EID {} and EID Record {}",
+ LispAddressStringifier.getString(subscriber),
+ LispAddressStringifier.getString(smr.getSourceEid().getLispAddressContainer()),
+ LispAddressStringifier.getString(smr.getEidRecord().get(0).getLispAddressContainer()));
SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder();
smrib.setMapRequest(new MapRequestBuilder(smr).build());
smrib.setTransportAddress(LispNotificationHelper.getTransportAddressFromContainer(subscriber));
public void setOverwrite(boolean overwrite) {
mapServer.setOverwrite(overwrite);
}
+
+ @Override
+ public void close() throws Exception {
+ lfmDbRpc.close();
+ destroy();
+ }
}
Code Review / lispflowmapping.git / blobdiff