Bug 3112: Add SB registrations to MD-SAL datastore
[lispflowmapping.git] / mappingservice / implementation / src / main / java / org / opendaylight / lispflowmapping / implementation / LispMappingService.java
index 3f3773a2482370046329a375626cfb0671e916a1..7305a610ece0f510a4c41e3e3678b95368dc7329 100644 (file)
@@ -8,77 +8,91 @@
 
 package org.opendaylight.lispflowmapping.implementation;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+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.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.dao.InMemoryDAO;
+import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
+import org.opendaylight.lispflowmapping.implementation.dao.HashMapDb;
 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.interfaces.dao.ILispDAO;
 import org.opendaylight.lispflowmapping.interfaces.dao.ILispTypeConverter;
-import org.opendaylight.lispflowmapping.interfaces.dao.IQueryAll;
 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.lispflowmapping.type.sbplugin.ILispSouthboundPlugin;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.AddMapping;
-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.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.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.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.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;
 
-import com.google.common.net.InetAddresses;
-
-public class LispMappingService implements CommandProvider, IFlowMapping, BindingAwareConsumer, //
+public class LispMappingService implements CommandProvider, IFlowMapping, IFlowMappingShell, BindingAwareProvider,
         IMapRequestResultHandler, IMapNotifyHandler {
-    protected static final Logger logger = LoggerFactory.getLogger(LispMappingService.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(LispMappingService.class);
 
+    private static final ConfigIni configIni = new ConfigIni();
+    private AuthenticationKeyDataListener keyListener;
+    private MappingDataListener mappingListener;
     private ILispDAO lispDao = null;
     private IMapResolverAsync mapResolver;
     private IMapServerAsync mapServer;
     private volatile boolean shouldIterateMask;
     private volatile boolean shouldAuthenticate;
-    private volatile boolean shouldOverwriteRLocs;
+    private volatile boolean smr = configIni.smrIsSet();
     private ThreadLocal<MapReply> tlsMapReply = new ThreadLocal<MapReply>();
     private ThreadLocal<MapNotify> tlsMapNotify = new ThreadLocal<MapNotify>();
-    private ThreadLocal<Pair<MapRequest, InetAddress>> tlsMapRequest = new ThreadLocal<Pair<MapRequest, InetAddress>>();
+    private ThreadLocal<Pair<MapRequest, TransportAddress>> tlsMapRequest = new ThreadLocal<Pair<MapRequest, TransportAddress>>();
 
-    private ILispSouthboundPlugin lispSB = null;
+    private LfmControlPlaneService lispSB = null;
 
-    private ConsumerContext session;
+    private ProviderContext session;
 
-    public static void main(String[] args) throws Exception {
-        LispMappingService serv = new LispMappingService();
-        serv.setLispDao(new InMemoryDAO());
-        serv.init();
-    }
+    private DataStoreBackEnd dsbe;
+    private NotificationService notificationService;
+    private static LispMappingService lfmService = null;
 
     class LispIpv4AddressInMemoryConverter implements ILispTypeConverter<Ipv4Address, Integer> {
     }
@@ -92,14 +106,25 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
     class MappingServiceNoMaskKeyConvertor implements ILispTypeConverter<MappingServiceNoMaskKey, Integer> {
     }
 
+    public static LispMappingService getLispMappingService() {
+        return lfmService;
+    }
+
     void setBindingAwareBroker(BindingAwareBroker bindingAwareBroker) {
-        logger.trace("BindingAwareBroker set!");
+        LOG.debug("BindingAwareBroker set!");
         BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
-        bindingAwareBroker.registerConsumer(this, bundleContext);
+        bindingAwareBroker.registerProvider(this, bundleContext);
+
+        // For the time being we initialize variables here. But once we remove the activator, these should
+        // be moved to the constructor.
+        lfmService = this;
+        setLispDao(new HashMapDb());
     }
 
     void unsetBindingAwareBroker(BindingAwareBroker bindingAwareBroker) {
-        logger.debug("BindingAwareBroker was unset in LispMappingService");
+        LOG.debug("BindingAwareBroker was unset in LispMappingService");
+        lfmService = null;
+        unsetLispDao(lispDao);
     }
 
     public void basicInit(ILispDAO dao) {
@@ -109,24 +134,12 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
     }
 
     void setLispDao(ILispDAO dao) {
-        logger.trace("LispDAO set in LispMappingService");
+        LOG.trace("LispDAO set in LispMappingService");
         basicInit(dao);
-        registerTypes();
-    }
-
-    private void registerTypes() {
-        logger.trace("Registering LispIpv4Address");
-        lispDao.register(LispIpv4AddressInMemoryConverter.class);
-        logger.trace("Registering LispIpv6Address");
-        lispDao.register(LispIpv6AddressInMemoryConverter.class);
-        logger.trace("Registering MappingServiceKey");
-        lispDao.register(MappingServiceKeyConvertor.class);
-        logger.trace("Registering MappingServiceNoMaskKey");
-        lispDao.register(MappingServiceNoMaskKeyConvertor.class);
     }
 
     void unsetLispDao(ILispDAO dao) {
-        logger.trace("LispDAO was unset in LispMappingService");
+        LOG.trace("LispDAO was unset in LispMappingService");
         mapServer = null;
         mapResolver = null;
         lispDao = null;
@@ -135,9 +148,9 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
     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());
         }
     }
 
@@ -147,72 +160,91 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
     }
 
     public void destroy() {
-        logger.info("LISP (RFC6830) Mapping Service is destroyed!");
+        LOG.info("LISP (RFC6830) Mapping Service is destroyed!");
         mapResolver = null;
         mapServer = null;
+        unsetLispDao(lispDao);
+        closeDataListeners();
     }
 
     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.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)) {
+                    sb.append("\n" + key + "\t");
+                }
+                sb.append(valueKey + "=" + value + "\t");
+                lastKey = key;
+            }
+        });
+        sb.append("\n");
+        return sb.toString();
     }
-    
-    public void _setShouldOverwriteRloc(final CommandInterpreter ci) {
+
+    public void _setShouldOverwriteRlocs(final CommandInterpreter ci) {
         try {
             boolean shouldOverwriteRloc = Boolean.parseBoolean(ci.nextArgument());
-            setShouldOverwriteRlocs(shouldOverwriteRloc);
+            setOverwrite(shouldOverwriteRloc);
         } catch (Exception e) {
             ci.println("Bad Usage!!");
         }
-        
-        
-    }
 
-    public void _dumpAll(final CommandInterpreter ci) {
-        ci.println("EID\tRLOCs");
-        if (lispDao instanceof IQueryAll) {
-            ((IQueryAll) lispDao).getAll(new IRowVisitor() {
-                String lastKey = "";
-
-                public void visitRow(Class<?> keyType, Object keyId, String valueKey, Object value) {
-                    String key = keyType.getSimpleName() + "#" + keyId;
-                    if (!lastKey.equals(key)) {
-                        ci.println();
-                        ci.print(key + "\t");
-                    }
-                    ci.print(valueKey + "=" + value + "\t");
-                    lastKey = key;
-                }
-            });
-            ci.println();
-        } else {
-            ci.println("Not implemented by this DAO");
-        }
-        return;
     }
 
     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();
     }
 
     public MapReply handleMapRequest(MapRequest request) {
+        return handleMapRequest(request, smr);
+    }
+
+    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());
+
         tlsMapReply.set(null);
         tlsMapRequest.set(null);
-        mapResolver.handleMapRequest(request, this);
+        mapResolver.handleMapRequest(request, smr, this);
         // After this invocation we assume that the thread local is filled with
         // the reply
         if (tlsMapRequest.get() != null) {
-            getLispSB().handleMapRequest(tlsMapRequest.get().getLeft(), tlsMapRequest.get().getRight());
+            SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder();
+            new MapRequestBuilder(tlsMapRequest.get().getLeft());
+            smrib.setMapRequest(new MapRequestBuilder(tlsMapRequest.get().getLeft()).build());
+            smrib.setTransportAddress(tlsMapRequest.get().getRight());
+            getLispSB().sendMapRequest(smrib.build());
             return null;
         } else {
             return tlsMapReply.get();
@@ -221,31 +253,51 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
     }
 
     public MapNotify handleMapRegister(MapRegister mapRegister) {
+        return handleMapRegister(mapRegister, smr);
+    }
+
+    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());
+
         tlsMapNotify.set(null);
-        mapServer.handleMapRegister(mapRegister, this);
+        mapServer.handleMapRegister(mapRegister, smr, this);
         // 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 boolean removeAuthenticationKey(LispAddressContainer address, int maskLen) {
-        return mapServer.removeAuthenticationKey(address, maskLen);
+    public void removeAuthenticationKey(LispAddressContainer address, int maskLen) {
+        LOG.debug("DAO: Removing authentication key for {}/{}", LispAFIConvertor.toString(address), maskLen);
+        mapServer.removeAuthenticationKey(address, maskLen);
     }
 
-    public boolean addAuthenticationKey(LispAddressContainer address, int maskLen, String key) {
-        return mapServer.addAuthenticationKey(address, maskLen, key);
+    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 removeMapping(LispAddressContainer address, int maskLen) {
+        LOG.debug("DAO: Removing mapping for {}/{}", LispAFIConvertor.toString(address), maskLen);
+        mapServer.removeMapping(address, maskLen, smr, this);
     }
 
     public boolean shouldIterateMask() {
         return this.shouldIterateMask;
     }
-    
-    public boolean shouldOverwriteRlocs() {
-        return this.shouldOverwriteRLocs;
+
+    public boolean shouldUseSmr() {
+        return this.smr;
+    }
+
+    public void setShouldUseSmr(boolean smr) {
+        this.smr = smr;
     }
 
     public void setShouldIterateMask(boolean shouldIterateMask) {
@@ -253,11 +305,6 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
         this.mapResolver.setShouldIterateMask(shouldIterateMask);
         this.mapServer.setShouldIterateMask(shouldIterateMask);
     }
-    
-    public void setShouldOverwriteRlocs(boolean shouldOverwriteRlocs) {
-        this.shouldOverwriteRLocs = shouldOverwriteRlocs;
-        this.mapServer.setShouldOverwriteRlocs(shouldOverwriteRlocs);
-    }
 
     public void setShouldAuthenticate(boolean shouldAuthenticate) {
         this.shouldAuthenticate = shouldAuthenticate;
@@ -269,22 +316,52 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
         return shouldAuthenticate;
     }
 
-    public void onSessionInitialized(ConsumerContext session) {
-        logger.info("Lisp Consumer session initialized!");
-        NotificationService notificationService = session.getSALService(NotificationService.class);
-        notificationService.registerNotificationListener(AddMapping.class, new MapRegisterNotificationHandler());
-        notificationService.registerNotificationListener(RequestMapping.class, new MapRequestNotificationHandler());
+    @Override
+    public void onSessionInitiated(ProviderContext session) {
+        LOG.info("Lisp Consumer session initialized!");
+        notificationService = session.getSALService(NotificationService.class);
+        dsbe = new DataStoreBackEnd(session.getSALService(DataBroker.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);
+    }
+
+    private void closeDataListeners() {
+        keyListener.closeDataChangeListener();
+        mappingListener.closeDataChangeListener();
+    }
+
+    public <T extends Notification> void registerNotificationListener(Class<T> notificationType, NotificationListener<T> listener) {
+        notificationService.registerNotificationListener(notificationType, listener);
+    }
+
     private class MapRegisterNotificationHandler implements NotificationListener<AddMapping> {
 
         @Override
         public void onNotification(AddMapping mapRegisterNotification) {
-            MapNotify mapNotify = handleMapRegister(mapRegisterNotification.getMapRegister());
-            getLispSB().handleMapNotify(mapNotify,
-                    LispNotificationHelper.getInetAddressFromIpAddress(mapRegisterNotification.getTransportAddress().getIpAddress()));
-
+            MapNotify mapNotify = handleMapRegister(mapRegisterNotification.getMapRegister(), smr);
+            if (mapNotify != null) {
+                TransportAddressBuilder tab = new TransportAddressBuilder();
+                tab.setIpAddress(mapRegisterNotification.getTransportAddress().getIpAddress());
+                tab.setPort(new PortNumber(LispMessage.PORT_NUM));
+                SendMapNotifyInputBuilder smnib = new SendMapNotifyInputBuilder();
+                smnib.setMapNotify(new MapNotifyBuilder(mapNotify).build());
+                smnib.setTransportAddress(tab.build());
+                getLispSB().sendMapNotify(smnib.build());
+            } else {
+                LOG.warn("got null map notify");
+            }
+
+            List<Mapping> mappings = LispNotificationHelper.getMapping(mapRegisterNotification);
+            for (Mapping mapping : mappings) {
+                dsbe.updateMapping(mapping);
+            }
         }
     }
 
@@ -293,15 +370,20 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
         @Override
         public void onNotification(RequestMapping mapRequestNotification) {
             MapReply mapReply = handleMapRequest(mapRequestNotification.getMapRequest());
-            getLispSB().handleMapReply(mapReply,
-                    LispNotificationHelper.getInetAddressFromIpAddress(mapRequestNotification.getTransportAddress().getIpAddress()));
+            if (mapReply != null) {
+                SendMapReplyInputBuilder smrib = new SendMapReplyInputBuilder();
+                smrib.setMapReply((new MapReplyBuilder(mapReply).build()));
+                smrib.setTransportAddress(mapRequestNotification.getTransportAddress());
+                getLispSB().sendMapReply(smrib.build());
+            } else {
+                LOG.warn("got null map reply");
+            }
         }
-
     }
 
-    private ILispSouthboundPlugin getLispSB() {
+    private LfmControlPlaneService getLispSB() {
         if (lispSB == null) {
-            lispSB = session.getRpcService(ILispSouthboundPlugin.class);
+            lispSB = session.getRpcService(LfmControlPlaneService.class);
         }
         return lispSB;
     }
@@ -314,15 +396,32 @@ public class LispMappingService implements CommandProvider, IFlowMapping, Bindin
         tlsMapNotify.set(notify);
     }
 
+    public void handleSMR(MapRequest smr, LispAddressContainer subscriber) {
+        LOG.debug("Sending SMR to " + subscriber.toString());
+        SendMapRequestInputBuilder smrib = new SendMapRequestInputBuilder();
+        smrib.setMapRequest(new MapRequestBuilder(smr).build());
+        smrib.setTransportAddress(LispNotificationHelper.getTransportAddressFromContainer(subscriber));
+        getLispSB().sendMapRequest(smrib.build());
+
+    }
+
     @Override
-    public void handleNonProxyMapRequest(MapRequest mapRequest, InetAddress targetAddress) {
-        tlsMapRequest.set(new MutablePair<MapRequest, InetAddress>(mapRequest, targetAddress));
+    public void handleNonProxyMapRequest(MapRequest mapRequest, TransportAddress transportAddress) {
+        tlsMapRequest.set(new MutablePair<MapRequest, TransportAddress>(mapRequest, transportAddress));
     }
 
     @Override
     public void clean() {
-        lispDao.clearAll();
-        registerTypes();
+        lispDao.removeAll();
+    }
+
+    @Override
+    public boolean shouldOverwrite() {
+        return mapServer.shouldOverwrite();
     }
 
+    @Override
+    public void setOverwrite(boolean overwrite) {
+        mapServer.setOverwrite(overwrite);
+    }
 }