Make some improvements
[lispflowmapping.git] / mappingservice / implementation / src / main / java / org / opendaylight / lispflowmapping / implementation / lisp / MapResolver.java
index 6b41e8047001245b673a0516ebded6fb502f2b7e..98cea8f77e28e5bb3824690fa5a90cac61d17ba4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Contextream, Inc. and others.  All rights reserved.
+ * Copyright (c) 2014, 2017 Contextream, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
 
 package org.opendaylight.lispflowmapping.implementation.lisp;
 
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
-import org.opendaylight.lispflowmapping.implementation.util.DAOMappingUtil;
-import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
-import org.opendaylight.lispflowmapping.interfaces.dao.IMappingKey;
-import org.opendaylight.lispflowmapping.interfaces.dao.RLOCGroup;
-import org.opendaylight.lispflowmapping.interfaces.dao.SubscriberRLOC;
+import org.opendaylight.lispflowmapping.interfaces.dao.Subscriber;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IMapRequestResultHandler;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IMapResolverAsync;
-import org.opendaylight.lispflowmapping.lisp.util.LispAFIConvertor;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.EidToLocatorRecord.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.LcafTrafficEngineeringAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.LispAFIAddress;
-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.eidrecords.EidRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.eidtolocatorrecords.EidToLocatorRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.eidtolocatorrecords.EidToLocatorRecordBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lcaftrafficengineeringaddress.Hops;
-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.LcafTrafficEngineering;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.lispaddresscontainer.address.No;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.locatorrecords.LocatorRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.locatorrecords.LocatorRecordBuilder;
-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.maprequest.ItrRloc;
+import org.opendaylight.lispflowmapping.interfaces.lisp.ISmrNotificationListener;
+import org.opendaylight.lispflowmapping.interfaces.lisp.SmrEvent;
+import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
+import org.opendaylight.lispflowmapping.lisp.type.MappingData;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
+import org.opendaylight.lispflowmapping.lisp.util.MappingRecordUtil;
+import org.opendaylight.lispflowmapping.lisp.util.SourceDestKeyHelper;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4Afi;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4PrefixAfi;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv6Afi;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv6PrefixAfi;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SourceDestKeyLcaf;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.NoAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4BinaryAfi;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4PrefixBinaryAfi;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6BinaryAfi;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6PrefixBinaryAfi;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRequest;
+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.proto.rev151105.eid.list.EidItem;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapreplymessage.MapReplyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequest.ItrRloc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
+public class MapResolver implements IMapResolverAsync {
+    private static final Logger LOG = LoggerFactory.getLogger(MapResolver.class);
 
-public class MapResolver extends AbstractLispComponent implements IMapResolverAsync {
+    private IMappingService mapService;
+    private boolean subscriptionService;
+    private String elpPolicy;
+    private IMapRequestResultHandler requestHandler;
+    private boolean authenticate = true;
+    private ISmrNotificationListener smrNotificationListener;
+    private static final int TTL_DELETE_MAPPING = 0;
 
-    private static final int TTL_RLOC_TIMED_OUT = 1;
-    private static final int TTL_NO_RLOC_KNOWN = 15;
-    protected static final Logger LOG = LoggerFactory.getLogger(MapResolver.class);
+    public MapResolver(IMappingService mapService, boolean smr, String elpPolicy,
+                       IMapRequestResultHandler requestHandler) {
+        Preconditions.checkNotNull(mapService);
+        this.subscriptionService = smr;
+        this.mapService = mapService;
+        this.elpPolicy = elpPolicy;
+        this.requestHandler = requestHandler;
+    }
 
-    private static final ConfigIni configIni = new ConfigIni();
-    private static final String elpPolicy = configIni.getElpPolicy();
+    public void handleMapRequest(MapRequest request) {
+        LOG.trace("Map-Request received: {}", request);
+        // SMRs and RLOC probes are directed towards xTRs and we're a Map-Resolver here, so ignore them
+        if (request.isSmr() != null && request.isSmr()) {
+            LOG.debug("Map-Resolver ignoring incoming SMR control message.");
+            return;
+        }
+        if (request.isProbe() != null && request.isProbe()) {
+            LOG.debug("Map-Resolver ignoring incoming RLOC probe control message.");
+            return;
+        }
+        if (request.isSmrInvoked()) {
+            LOG.debug("SMR-invoked request received.");
+            LOG.trace("Map-Request object: {}", request);
+            for (EidItem eidItem : request.getEidItem()) {
+                final SmrEvent event = new SmrEvent(
+                        subscriberListFromItrRlocs(request.getItrRloc(), request.getSourceEid().getEid()),
+                        eidItem.getEid(),
+                        request.getNonce());
+                smrNotificationListener.onSmrInvokedReceived(event);
+            }
+        }
+        Eid srcEid = null;
+        if (request.getSourceEid() != null) {
+            srcEid = request.getSourceEid().getEid();
+        }
+        MapReplyBuilder replyBuilder = new MapReplyBuilder();
+        replyBuilder.setEchoNonceEnabled(false);
+        replyBuilder.setProbe(false);
+        replyBuilder.setSecurityEnabled(false);
+        replyBuilder.setNonce(request.getNonce());
+        replyBuilder.setMappingRecordItem(new ArrayList<>());
+        List<ItrRloc> itrRlocs = request.getItrRloc();
+        final IpAddressBinary sourceRloc = request.getSourceRloc();
+
+        for (EidItem eidRecord : request.getEidItem()) {
+            MappingData mappingData = mapService.getMapping(srcEid, eidRecord.getEid());
+            MappingRecord mapping;
+            if (mappingData == null) {
+                mapping = mapService.addNegativeMapping(eidRecord.getEid()).getRecord();
+            } else {
+                mapping = mappingData.getRecord();
+            }
+
+            if (itrRlocs != null && itrRlocs.size() != 0) {
+                if (subscriptionService && isValidSourceEidForSubscriber(srcEid)) {
+                    final Rloc resolvedRloc = resolveRloc(itrRlocs, sourceRloc);
+                    updateSubscribers(resolvedRloc, eidRecord.getEid(), mapping.getEid(),
+                            srcEid, mapping.getRecordTtl());
+                }
+                mapping = updateLocators(mapping, itrRlocs);
+            }
+            mapping = fixIfNotSDRequest(mapping, eidRecord.getEid());
+            mapping = fixTtlIfSmrInvoked(request, mapping);
+            replyBuilder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord(mapping).build());
+        }
+        requestHandler.handleMapReply(replyBuilder.build());
+    }
 
-    public MapResolver(ILispDAO dao) {
-        this(dao, true, true);
+    private static boolean isEqualIpVersion(IpAddressBinary srcRloc, Rloc rloc) {
+        if (srcRloc.getIpv4AddressBinary() != null) {
+            if (rloc.getAddressType() == Ipv4Afi.class
+                    || rloc.getAddressType() == Ipv4BinaryAfi.class
+                    || rloc.getAddressType() == Ipv4PrefixAfi.class
+                    || rloc.getAddressType() == Ipv4PrefixBinaryAfi.class) {
+                return true;
+            }
+        } else if (rloc.getAddressType() == Ipv6Afi.class
+                || rloc.getAddressType() == Ipv6BinaryAfi.class
+                || rloc.getAddressType() == Ipv6PrefixAfi.class
+                || rloc.getAddressType() == Ipv6PrefixBinaryAfi.class) {
+            return true;
+        }
+        return false;
     }
 
-    public MapResolver(ILispDAO dao, boolean authenticate, boolean iterateMask) {
-        super(dao, authenticate, iterateMask);
+    private static boolean isValidSourceEidForSubscriber(Eid eid) {
+        if (eid == null || eid.getAddress() instanceof NoAddress) {
+            return false;
+        }
+        return true;
     }
 
-    public void handleMapRequest(MapRequest request, boolean smr, IMapRequestResultHandler callback) {
-        Preconditions.checkNotNull(dao);
+    private Rloc resolveRloc(List<ItrRloc> itrRlocList, IpAddressBinary srcRloc) {
+        if (srcRloc == null) {
+            return itrRlocList.get(0).getRloc();
+        }
+        byte[] srcRlocByte;
+        if (srcRloc.getIpv4AddressBinary() != null) {
+            srcRlocByte = srcRloc.getIpv4AddressBinary().getValue();
+        } else {
+            srcRlocByte = srcRloc.getIpv6AddressBinary().getValue();
+        }
 
-        LispAddressContainer srcEid = null;
-        LispAFIAddress srcEidAfi = null;
-        if (request.getSourceEid() != null) {
-            srcEid = request.getSourceEid().getLispAddressContainer();
-            srcEidAfi = LispAFIConvertor.toAFI(srcEid);
-        }
-        MapReplyBuilder builder = new MapReplyBuilder();
-        builder.setEchoNonceEnabled(false);
-        builder.setProbe(false);
-        builder.setSecurityEnabled(false);
-        builder.setNonce(request.getNonce());
-        builder.setEidToLocatorRecord(new ArrayList<EidToLocatorRecord>());
-        for (EidRecord eid : request.getEidRecord()) {
-            EidToLocatorRecordBuilder recordBuilder = new EidToLocatorRecordBuilder();
-            Entry<IMappingKey, List<RLOCGroup>> mapping =
-                    DAOMappingUtil.getMapping(srcEidAfi, eid, dao);
-            recordBuilder.setRecordTtl(0);
-            recordBuilder.setAction(Action.NoAction);
-            recordBuilder.setAuthoritative(false);
-            recordBuilder.setMapVersion((short) 0);
-            recordBuilder.setMaskLength((short) mapping.getKey().getMask());
-            recordBuilder.setLispAddressContainer(mapping.getKey().getEID());
-            recordBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
-            List<RLOCGroup> locators = mapping.getValue();
-            if (locators != null && locators.size() > 0) {
-                List<ItrRloc> itrRlocs = request.getItrRloc();
-                addLocatorGroups(recordBuilder, locators, itrRlocs);
-                if (srcEid != null && !(srcEid.getAddress() instanceof No) && itrRlocs != null
-                        && itrRlocs.size() > 0) {
-                    LispAddressContainer itrRloc = itrRlocs.get(0).getLispAddressContainer();
-                    SubscriberRLOC subscriberRloc = new SubscriberRLOC(itrRloc, srcEid);
-                    Set<SubscriberRLOC> subscribers = DAOMappingUtil.getSubscribers(mapping.getKey().getEID(),
-                            mapping.getKey().getMask(), dao);
-                    if (subscribers == null) {
-                        subscribers = Sets.newConcurrentHashSet();
-                    } else if (subscribers.contains(subscriberRloc)) {
-                        // If there is an entry already for this subscriberRloc, remove it, so that it gets the new
-                        // timestamp
-                        subscribers.remove(subscriberRloc);
-                    }
-                    if (smr) {
-                        LOG.trace("Adding new subscriber: " + subscriberRloc.toString());
-                        subscribers.add(subscriberRloc);
-                        DAOMappingUtil.addSubscribers(mapping.getKey().getEID(), mapping.getKey().getMask(),
-                                subscribers, dao);
-                    }
-                }
-            } else {
-                recordBuilder.setAction(Action.NativelyForward);
-                if (shouldAuthenticate() && DAOMappingUtil.getPassword(eid.getLispAddressContainer(), eid.getMask(),
-                        dao, shouldIterateMask()) != null) {
-                    recordBuilder.setRecordTtl(TTL_RLOC_TIMED_OUT);
-                } else {
-                    recordBuilder.setRecordTtl(TTL_NO_RLOC_KNOWN);
+        Rloc equalIpvRloc = null;
+        for (ItrRloc itrRloc : itrRlocList) {
+            final Rloc rloc = itrRloc.getRloc();
+            final byte[] itrRlocByte = LispAddressUtil.ipAddressToByteArray(rloc.getAddress());
 
-                }
+            // return an Rloc equal to the source Rloc
+            if (itrRlocByte != null && LispAddressUtil.compareIpAddressByteArrays(srcRlocByte, itrRlocByte) == 0) {
+                return rloc;
+            }
+            // else lookup the first Rloc with identical Ip version
+            if (equalIpvRloc == null && isEqualIpVersion(srcRloc, rloc)) {
+                equalIpvRloc = rloc;
             }
-            builder.getEidToLocatorRecord().add(recordBuilder.build());
         }
-        callback.handleMapReply(builder.build());
+        if (equalIpvRloc != null) {
+            return equalIpvRloc;
+        } else {
+            // if none of the above, return the first Rloc
+            return itrRlocList.get(0).getRloc();
+        }
+    }
+
+    private void updateSubscribers(Rloc itrRloc, Eid reqEid, Eid mapEid, Eid srcEid, Integer recordTtl) {
+        Subscriber subscriber = new Subscriber(itrRloc, srcEid, Subscriber.recordTtlToSubscriberTime(recordTtl));
+        Eid subscribedEid = mapEid;
+
+        // If the eid in the matched mapping is SourceDest and the requested eid IS NOT then we subscribe itrRloc only
+        // to dst from the src/dst since that what's been requested. Note though that any updates to to the src/dst
+        // mapping will be pushed to dst as well (see sendSMRs in MapServer)
+        if (mapEid.getAddressType().equals(SourceDestKeyLcaf.class)
+                && !reqEid.getAddressType().equals(SourceDestKeyLcaf.class)) {
+            subscribedEid = SourceDestKeyHelper.getDstBinary(mapEid);
+        }
+
+        mapService.subscribe(subscriber, subscribedEid);
     }
 
-    private void addLocatorGroups(EidToLocatorRecordBuilder recordBuilder, List<RLOCGroup> rlocs,
-            List<ItrRloc> itrRlocs) {
-        for (RLOCGroup rloc : rlocs) {
-            addLocators(recordBuilder, rloc, itrRlocs);
-            recordBuilder.setRecordTtl(rloc.getTtl());
+    // Fixes mapping if request was for simple dst EID but the matched mapping is a SourceDest
+    private MappingRecord fixIfNotSDRequest(MappingRecord mapping, Eid dstEid) {
+        if (mapping.getEid().getAddress() instanceof SourceDestKey
+                && !(dstEid.getAddress() instanceof SourceDestKey)) {
+            return new MappingRecordBuilder(mapping).setEid(
+                    SourceDestKeyHelper.getDstBinary(mapping.getEid())).build();
         }
+        return mapping;
     }
 
-    private void addLocators(EidToLocatorRecordBuilder recordBuilder, RLOCGroup locatorObject,
-            List<ItrRloc> itrRlocs) {
-        Preconditions.checkNotNull(locatorObject);
+    // When an SMR-invoked Map-Request is asking for a mapping that is negative, it is most likely an attempt to delete
+    // that mapping.
+    private MappingRecord fixTtlIfSmrInvoked(MapRequest request, MappingRecord mapping) {
+        if (request.isSmrInvoked() && MappingRecordUtil.isNegativeMapping(mapping)) {
+            return new MappingRecordBuilder(mapping).setRecordTtl(TTL_DELETE_MAPPING).build();
+        }
+        return mapping;
+    }
 
-        recordBuilder.setAction(locatorObject.getAction());
-        recordBuilder.setAuthoritative(locatorObject.isAuthoritative());
-        recordBuilder.setRecordTtl(locatorObject.getTtl());
+    private boolean locatorsNeedFixing(List<LocatorRecord> locatorRecords) {
+        // no locators - no fixing needed ;)
+        if (locatorRecords == null) {
+            return false;
+        }
+
+        for (LocatorRecord record : locatorRecords) {
+            if (record.getRloc().getAddress() instanceof ExplicitLocatorPath) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // Process locators according to configured policy
+    private MappingRecord updateLocators(MappingRecord mapping, List<ItrRloc> itrRlocs) {
+        // no fixing if elpPolicy is default
+        if (elpPolicy.equalsIgnoreCase("default")) {
+            return mapping;
+        }
 
+        List<LocatorRecord> locatorRecords = mapping.getLocatorRecord();
+
+        // if no updated is needed, just return the mapping
+        if (!locatorsNeedFixing(locatorRecords)) {
+            return mapping;
+        }
+
+        MappingRecordBuilder recordBuilder = new MappingRecordBuilder(mapping);
+        recordBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
         try {
-            for (LocatorRecord record : locatorObject.getRecords()) {
-                LispAddressContainer container = record.getLispAddressContainer();
+            for (LocatorRecord record : locatorRecords) {
+                Rloc container = record.getRloc();
 
                 // For non-ELP RLOCs, or when ELP policy is default, or itrRlocs is null, just add the locator and be
                 // done
-                if ((!(container.getAddress() instanceof LcafTrafficEngineering))
+                if ((!(container.getAddress() instanceof ExplicitLocatorPath))
                         || elpPolicy.equalsIgnoreCase("default") || itrRlocs == null) {
                     recordBuilder.getLocatorRecord().add(
                             new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator())
                                     .setRlocProbed(record.isRlocProbed()).setWeight(record.getWeight())
                                     .setPriority(record.getPriority()).setMulticastWeight(record.getMulticastWeight())
                                     .setMulticastPriority(record.getMulticastPriority()).setRouted(record.isRouted())
-                                    .setLispAddressContainer(container).setName(record.getName()).build());
+                                    .setRloc(container).setLocatorId(record.getLocatorId()).build());
                     continue;
                 }
 
-                LcafTrafficEngineeringAddress teAddress = ((LcafTrafficEngineering) container.getAddress())
-                        .getLcafTrafficEngineeringAddr();
-                LispAddressContainer nextHop = getNextELPHop(teAddress, itrRlocs);
+                ExplicitLocatorPath teAddress = ((ExplicitLocatorPath) container.getAddress());
+                SimpleAddress nextHop = getNextELPHop(teAddress, itrRlocs);
                 if (nextHop != null) {
                     java.lang.Short priority = record.getPriority();
                     if (elpPolicy.equalsIgnoreCase("both")) {
@@ -171,12 +281,12 @@ public class MapResolver extends AbstractLispComponent implements IMapResolverAs
                                         .setPriority(record.getPriority())
                                         .setMulticastWeight(record.getMulticastWeight())
                                         .setMulticastPriority(record.getMulticastPriority())
-                                        .setRouted(record.isRouted()).setLispAddressContainer(container)
-                                        .setName(record.getName()).build());
+                                        .setRouted(record.isRouted()).setRloc(container)
+                                        .setLocatorId(record.getLocatorId()).build());
                         // Make the priority of the added simple locator lower so that ELP is used by default if
-                        // the xTR understands ELP.  Exclude 255, since that means don't use for unicast forwarding
+                        // the xTR understands ELP. Exclude 255, since that means don't use for unicast forwarding
                         // XXX Complex cases like several ELPs with different priorities are not handled
-                        if (priority != 254 || priority !=255) {
+                        if (priority != 254 || priority != 255) {
                             priority++;
                         }
                     }
@@ -186,31 +296,31 @@ public class MapResolver extends AbstractLispComponent implements IMapResolverAs
                                     .setRlocProbed(record.isRlocProbed()).setWeight(record.getWeight())
                                     .setPriority(priority).setMulticastWeight(record.getMulticastWeight())
                                     .setMulticastPriority(record.getMulticastPriority()).setRouted(record.isRouted())
-                                    .setLispAddressContainer(nextHop).setName(record.getName()).build());
+                                    .setRloc(LispAddressUtil.toRloc(nextHop))
+                                    .setLocatorId(record.getLocatorId()).build());
                 }
             }
         } catch (ClassCastException cce) {
             LOG.error("Class Cast Exception while building EidToLocatorRecord: {}", ExceptionUtils.getStackTrace(cce));
         }
+
+        return recordBuilder.build();
     }
 
-    private LispAddressContainer getNextELPHop(LcafTrafficEngineeringAddress elp, List<ItrRloc> itrRlocs) {
-        LispAddressContainer nextHop = null;
-        List<Hops> hops = elp.getHops();
+    private SimpleAddress getNextELPHop(ExplicitLocatorPath elp, List<ItrRloc> itrRlocs) {
+        SimpleAddress nextHop = null;
+        List<Hop> hops = elp.getExplicitLocatorPath().getHop();
 
         if (hops != null && hops.size() > 0) {
             // By default we return the first hop
-            nextHop = LispAFIConvertor.toContainer(LispAFIConvertor.toAFIfromPrimitive(hops.get(0).getHop()
-                    .getPrimitiveAddress()));
-            for (Hops hop : hops) {
-                LispAddressContainer hopContainer = LispAFIConvertor.toContainer(LispAFIConvertor
-                        .toAFIfromPrimitive(hop.getHop().getPrimitiveAddress()));
+            nextHop = hops.get(0).getAddress();
+            for (Hop hop : hops) {
+                Address hopAddress = LispAddressUtil.addressFromSimpleAddress(hop.getAddress());
                 for (ItrRloc itrRloc : itrRlocs) {
-                    if (itrRloc.getLispAddressContainer().equals(hopContainer)) {
-                        int i = hops.indexOf(hop);
-                        if (i < hops.size() - 1) {
-                            nextHop = LispAFIConvertor.toContainer(LispAFIConvertor.toAFIfromPrimitive(hops.get(i + 1)
-                                    .getHop().getPrimitiveAddress()));
+                    if (itrRloc.getRloc().getAddress().equals(hopAddress)) {
+                        int iterator = hops.indexOf(hop);
+                        if (iterator < hops.size() - 1) {
+                            nextHop = hops.get(iterator + 1).getAddress();
                             return nextHop;
                         }
                     }
@@ -221,4 +331,31 @@ public class MapResolver extends AbstractLispComponent implements IMapResolverAs
         return nextHop;
     }
 
-}
\ No newline at end of file
+    private static List<Subscriber> subscriberListFromItrRlocs(List<ItrRloc> itrRlocs, Eid srcEid) {
+        List<Subscriber> subscriberList = Lists.newArrayList();
+        for (ItrRloc itrRloc : itrRlocs) {
+            subscriberList.add(new Subscriber(itrRloc.getRloc(), srcEid, Subscriber.DEFAULT_SUBSCRIBER_TIMEOUT));
+        }
+        return subscriberList;
+    }
+
+    @Override
+    public void setSubscriptionService(boolean smr) {
+        subscriptionService = smr;
+    }
+
+    @Override
+    public void setElpPolicy(String elpPolicy) {
+        this.elpPolicy = elpPolicy;
+    }
+
+    @Override
+    public void setShouldAuthenticate(boolean shouldAuthenticate) {
+        this.authenticate = shouldAuthenticate;
+    }
+
+    @Override
+    public void setSmrNotificationListener(ISmrNotificationListener smrNotificationListener) {
+        this.smrNotificationListener = smrNotificationListener;
+    }
+}