package org.opendaylight.lispflowmapping.implementation;
-import java.net.InetAddress;
+import java.util.concurrent.Future;
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.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+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.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.inventory.IAdSalLispInventoryService;
import org.opendaylight.lispflowmapping.implementation.lisp.MapResolver;
import org.opendaylight.lispflowmapping.implementation.lisp.MapServer;
import org.opendaylight.lispflowmapping.implementation.serializer.LispMessage;
import org.opendaylight.lispflowmapping.interfaces.dao.ILispTypeConverter;
import org.opendaylight.lispflowmapping.interfaces.dao.IRowVisitor;
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.lispflowmapping.rev131031.AddMapping;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LispflowmappingService;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.MapNotify;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.MapRegister;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.MapReply;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.MapRequest;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.RequestMapping;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.SendMapNotifyInputBuilder;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.SendMapReplyInputBuilder;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.SendMapRequestInputBuilder;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.LispAddressContainer;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.LispAddressContainerBuilder;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.Address;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.mapnotifymessage.MapNotifyBuilder;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.mapreplymessage.MapReplyBuilder;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequestmessage.MapRequestBuilder;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.transportaddress.TransportAddress;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.transportaddress.TransportAddressBuilder;
+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.EidToLocatorRecord;
+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.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.AddKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.AddKeyOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.AddMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.AddMappingOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.GetKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.GetKeyOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.GetKeyWithRefInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.GetKeyWithRefOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.GetMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.GetMappingOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.GetMappingWithRefInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.GetMappingWithRefOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.LfmMappingDatabaseService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.RemoveKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.RemoveKeyWithRefInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.RemoveMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.RemoveMappingWithRefInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.UpdateKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.UpdateKeyWithRefInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.UpdateMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.UpdateMappingWithRefInput;
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.opendaylight.yangtools.yang.common.RpcResult;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class LispMappingService implements CommandProvider, IFlowMapping, BindingAwareConsumer, //
- IMapRequestResultHandler, IMapNotifyHandler {
- protected static final Logger logger = LoggerFactory.getLogger(LispMappingService.class);
+public class LispMappingService implements CommandProvider, IFlowMapping, IFlowMappingShell, BindingAwareProvider,
+ IMapRequestResultHandler, IMapNotifyHandler, LfmMappingDatabaseService {
+ protected static final Logger LOG = LoggerFactory.getLogger(LispMappingService.class);
private static final ConfigIni configIni = new ConfigIni();
private ILispDAO lispDao = null;
private ThreadLocal<MapNotify> tlsMapNotify = new ThreadLocal<MapNotify>();
private ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequest = new ThreadLocal<Pair<MapRequest, TransportAddress>>();
- private LispflowmappingService lispSB = null;
+ private LfmControlPlaneService lispSB = null;
- private ConsumerContext session;
+ private ProviderContext session;
private NotificationService notificationService;
- private IAdSalLispInventoryService inventoryService;
class LispIpv4AddressInMemoryConverter implements ILispTypeConverter<Ipv4Address, Integer> {
}
class MappingServiceNoMaskKeyConvertor implements ILispTypeConverter<MappingServiceNoMaskKey, Integer> {
}
- public IAdSalLispInventoryService getInventoryService() {
- return inventoryService;
- }
-
- public void setInventoryService(IAdSalLispInventoryService inventoryService) {
- logger.debug("Setting inventoryService");
- this.inventoryService = inventoryService;
- }
-
- public void unsetInventoryService(IAdSalLispInventoryService inventoryService) {
- logger.debug("Unsetting inventoryService");
- if (this.inventoryService == inventoryService) {
- this.inventoryService = null;
- }
- }
-
void setBindingAwareBroker(BindingAwareBroker bindingAwareBroker) {
- logger.debug("BindingAwareBroker set!");
+ LOG.trace("BindingAwareBroker set!");
BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
- bindingAwareBroker.registerConsumer(this, bundleContext);
+ bindingAwareBroker.registerProvider(this, bundleContext);
}
void unsetBindingAwareBroker(BindingAwareBroker bindingAwareBroker) {
- logger.debug("BindingAwareBroker was unset in LispMappingService");
+ LOG.debug("BindingAwareBroker was unset in LispMappingService");
}
public void basicInit(ILispDAO dao) {
}
void setLispDao(ILispDAO dao) {
- logger.debug("LispDAO set in LispMappingService");
+ LOG.trace("LispDAO set in LispMappingService");
basicInit(dao);
}
void unsetLispDao(ILispDAO dao) {
- logger.debug("LispDAO was unset in LispMappingService");
+ LOG.trace("LispDAO was unset in LispMappingService");
mapServer = null;
mapResolver = null;
lispDao = null;
public void init() {
try {
registerWithOSGIConsole();
- logger.info("LISP (RFC6830) Mapping Service init finished");
- } catch (Throwable t) {
- logger.error(t.getStackTrace().toString());
+ LOG.info("LISP (RFC6830) Mapping Service init finished");
+ } catch (Exception e) {
+ LOG.error(e.getStackTrace().toString());
}
}
}
public void destroy() {
- logger.info("LISP (RFC6830) Mapping Service is destroyed!");
+ LOG.info("LISP (RFC6830) Mapping Service is destroyed!");
mapResolver = null;
mapServer = null;
}
public void _removeEid(final CommandInterpreter ci) {
- lispDao.remove(LispAFIConvertor.asIPAfiAddress(ci.nextArgument()));
+ LispAddressContainer eid = LispAFIConvertor.getIPContainer(ci.nextArgument());
+ lispDao.remove(MappingServiceKeyUtil.generateMappingServiceKey(eid));
}
public void _dumpAll(final CommandInterpreter ci) {
- ci.println("EID\tRLOCs");
+ ci.print(printMappings());
+ }
+
+ public String printMappings() {
+ final StringBuffer sb = new StringBuffer();
+ sb.append("EID\tRLOCs\n");
lispDao.getAll(new IRowVisitor() {
String lastKey = "";
public void visitRow(Object keyId, String valueKey, Object value) {
String key = keyId.getClass().getSimpleName() + "#" + keyId;
if (!lastKey.equals(key)) {
- ci.println();
- ci.print(key + "\t");
+ sb.append("\n" + key + "\t");
}
- ci.print(valueKey + "=" + value + "\t");
+ sb.append(valueKey + "=" + value + "\t");
lastKey = key;
}
});
- ci.println();
- return;
+ sb.append("\n");
+ return sb.toString();
}
public void _setShouldOverwriteRlocs(final CommandInterpreter ci) {
}
public void _addDefaultPassword(final CommandInterpreter ci) {
- LispAddressContainerBuilder builder = new LispAddressContainerBuilder();
- builder.setAddress((Address) (new Ipv4Builder().setIpv4Address(new Ipv4Address("0.0.0.0")).build()));
- addAuthenticationKey(builder.build(), 0, "password");
+ 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 mapping\n");
- help.append("\t removeEid - Remove a single LispIPv4Address Eid\n");
- help.append("\t setShouldOverwritingRloc(true/false) - set the map server's behaivior regarding existing RLOCs\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();
}
mapServer.addAuthenticationKey(address, maskLen, key);
}
+ public void removeMapping(LispAddressContainer address, int maskLen) {
+ mapServer.removeMapping(address, maskLen, smr, this);
+ }
+
public boolean shouldIterateMask() {
return this.shouldIterateMask;
}
return shouldAuthenticate;
}
- public void onSessionInitialized(ConsumerContext session) {
- logger.info("Lisp Consumer session initialized!");
+ @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());
+ session.addRpcImplementation(LfmMappingDatabaseService.class, this);
this.session = session;
}
@Override
public void onNotification(AddMapping mapRegisterNotification) {
- MapRegister mapRegister = mapRegisterNotification.getMapRegister();
- InetAddress address = LispNotificationHelper.getInetAddressFromIpAddress(mapRegisterNotification.getTransportAddress().getIpAddress());
- if (mapRegister.isXtrSiteIdPresent()) {
- byte[] xtrId = mapRegister.getXtrId();
- inventoryService.addNode(address, xtrId);
- } else {
- inventoryService.addNode(address, null);
- }
-
- MapNotify mapNotify = handleMapRegister(mapRegister, smr);
+ MapNotify mapNotify = handleMapRegister(mapRegisterNotification.getMapRegister(), smr);
if (mapNotify != null) {
TransportAddressBuilder tab = new TransportAddressBuilder();
tab.setIpAddress(mapRegisterNotification.getTransportAddress().getIpAddress());
smnib.setTransportAddress(tab.build());
getLispSB().sendMapNotify(smnib.build());
} else {
- logger.warn("got null map notify");
+ LOG.warn("got null map notify");
}
}
smrib.setTransportAddress(mapRequestNotification.getTransportAddress());
getLispSB().sendMapReply(smrib.build());
} else {
- logger.warn("got null map reply");
+ LOG.warn("got null map reply");
}
}
}
- private LispflowmappingService getLispSB() {
+ private LfmControlPlaneService getLispSB() {
if (lispSB == null) {
- lispSB = session.getRpcService(LispflowmappingService.class);
+ lispSB = session.getRpcService(LfmControlPlaneService.class);
}
return lispSB;
}
}
public void handleSMR(MapRequest smr, LispAddressContainer subscriber) {
- logger.debug("Sending SMR to " + subscriber.toString());
+ LOG.debug("Sending SMR to " + subscriber.toString());
SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder();
smrib.setMapRequest(new MapRequestBuilder(smr).build());
smrib.setTransportAddress(LispNotificationHelper.getTransportAddressFromContainer(subscriber));
mapServer.setOverwrite(overwrite);
}
+ @Override
+ public Future<RpcResult<AddKeyOutput>> addKey(AddKeyInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<AddMappingOutput>> addMapping(AddMappingInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<GetKeyOutput>> getKey(GetKeyInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<GetKeyWithRefOutput>> getKeyWithRef(
+ GetKeyWithRefInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<GetMappingOutput>> getMapping(GetMappingInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<GetMappingWithRefOutput>> getMappingWithRef(
+ GetMappingWithRefInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<Void>> removeKey(RemoveKeyInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<Void>> removeKeyWithRef(RemoveKeyWithRefInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<Void>> removeMapping(RemoveMappingInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<Void>> removeMappingWithRef(
+ RemoveMappingWithRefInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<Void>> updateKey(UpdateKeyInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<Void>> updateKeyWithRef(UpdateKeyWithRefInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<Void>> updateMapping(UpdateMappingInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Future<RpcResult<Void>> updateMappingWithRef(
+ UpdateMappingWithRefInput input) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Code Review / lispflowmapping.git / blobdiff