X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=mappingservice%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Flispflowmapping%2Fimplementation%2Flisp%2FMapResolver.java;h=eeaee4ed6aba0236b252b3cd93868912d92a3504;hb=927cbc753dfc85f6ecd72f56f1640ff05e2a905c;hp=498d4494210e4a4e81d3195130dbd94bb08cebfa;hpb=c6dde5823e9bb14e9db6cfa585f6e333c0f215ee;p=lispflowmapping.git diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java index 498d44942..eeaee4ed6 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java @@ -10,203 +10,226 @@ package org.opendaylight.lispflowmapping.implementation.lisp; 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.dao.MappingServiceKeyUtil; -import org.opendaylight.lispflowmapping.implementation.util.DAOMappingUtil; -import org.opendaylight.lispflowmapping.implementation.util.LispAFIConvertor; -import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO; -import org.opendaylight.lispflowmapping.interfaces.dao.IMappingServiceKey; -import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry; -import org.opendaylight.lispflowmapping.interfaces.dao.MappingServiceRLOCGroup; -import org.opendaylight.lispflowmapping.interfaces.dao.MappingServiceSubscriberRLOC; +import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys; +import org.opendaylight.lispflowmapping.interfaces.dao.SubscriberRLOC; import org.opendaylight.lispflowmapping.interfaces.lisp.IMapRequestResultHandler; import org.opendaylight.lispflowmapping.interfaces.lisp.IMapResolverAsync; -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.mappingservice.IMappingService; +import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil; +import org.opendaylight.lispflowmapping.lisp.util.SourceDestKeyHelper; +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.lisp.address.address.ExplicitLocatorPath; +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.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.MappingRecord.Action; +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.MappingRecordItem; +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.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -public class MapResolver extends AbstractLispComponent implements IMapResolverAsync { +public class MapResolver implements IMapResolverAsync { + protected static final Logger LOG = LoggerFactory.getLogger(MapResolver.class); 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); - private static final ConfigIni configIni = new ConfigIni(); - private static final String elpPolicy = configIni.getElpPolicy(); - - public MapResolver(ILispDAO dao) { - this(dao, true, true); - } + private IMappingService mapService; + private boolean subscriptionService; + private String elpPolicy; + private IMapRequestResultHandler requestHandler; + private boolean authenticate = true; - public MapResolver(ILispDAO dao, boolean authenticate, boolean iterateMask) { - super(dao, authenticate, iterateMask); + 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; } - public void handleMapRequest(MapRequest request, boolean smr, IMapRequestResultHandler callback) { - if (dao == null) { - LOG.warn("handleMapRequest called while dao is uninitialized"); - return; - } - - LispAddressContainer srcEid = null; - LispAFIAddress srcEidAfi = null; + public void handleMapRequest(MapRequest request) { + Eid srcEid = null; if (request.getSourceEid() != null) { - srcEid = request.getSourceEid().getLispAddressContainer(); - srcEidAfi = LispAFIConvertor.toAFI(srcEid); + srcEid = request.getSourceEid().getEid(); } - MapReplyBuilder builder = new MapReplyBuilder(); - builder.setEchoNonceEnabled(false); - builder.setProbe(false); - builder.setSecurityEnabled(false); - builder.setNonce(request.getNonce()); - builder.setEidToLocatorRecord(new ArrayList()); - for (EidRecord eid : request.getEidRecord()) { - EidToLocatorRecordBuilder recordBuilder = new EidToLocatorRecordBuilder(); - Entry> 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()); - List locators = mapping.getValue(); - if (locators != null && locators.size() > 0) { + MapReplyBuilder replyBuilder = new MapReplyBuilder(); + replyBuilder.setEchoNonceEnabled(false); + replyBuilder.setProbe(false); + replyBuilder.setSecurityEnabled(false); + replyBuilder.setNonce(request.getNonce()); + replyBuilder.setMappingRecordItem(new ArrayList()); + for (EidItem eidRecord : request.getEidItem()) { + MappingRecord mapping = (MappingRecord) mapService.getMapping(srcEid, + eidRecord.getEid()); + if (mapping != null) { List itrRlocs = request.getItrRloc(); - addLocatorGroups(recordBuilder, locators, itrRlocs); - if (!(srcEid.getAddress() instanceof No) && itrRlocs != null && itrRlocs.size() > 0) { - LispAddressContainer itrRloc = itrRlocs.get(0).getLispAddressContainer(); - MappingServiceSubscriberRLOC subscriberRloc = new MappingServiceSubscriberRLOC(itrRloc, srcEid); - Set subscribers = getSubscribers(mapping.getKey().getEID(), mapping.getKey().getMask()); - 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) { - IMappingServiceKey key = MappingServiceKeyUtil.generateMappingServiceKey(mapping.getKey().getEID(), - mapping.getKey().getMask()); - LOG.trace("Adding new subscriber: " + subscriberRloc.toString()); - subscribers.add(subscriberRloc); - dao.put(key, new MappingEntry>(SUBSCRIBERS_SUBKEY, subscribers)); + if (itrRlocs != null && itrRlocs.size() != 0) { + if (subscriptionService) { + updateSubscribers(itrRlocs.get(0).getRloc(), mapping.getEid(), + srcEid); } + mapping = updateLocators(mapping, itrRlocs); } + mapping = fixIfNotSDRequest(mapping, eidRecord.getEid()); } else { - recordBuilder.setAction(Action.NativelyForward); - if (shouldAuthenticate() && getPassword(eid.getLispAddressContainer(), eid.getMask()) != null) { - recordBuilder.setRecordTtl(TTL_RLOC_TIMED_OUT); - } else { - recordBuilder.setRecordTtl(TTL_NO_RLOC_KNOWN); - - } + mapping = getNegativeMapping(eidRecord.getEid()); } - builder.getEidToLocatorRecord().add(recordBuilder.build()); + replyBuilder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord(mapping).build()); } + requestHandler.handleMapReply(replyBuilder.build()); + } - callback.handleMapReply(builder.build()); + private MappingRecord getNegativeMapping(Eid eid) { + MappingRecordBuilder recordBuilder = new MappingRecordBuilder(); + recordBuilder.setAuthoritative(false); + recordBuilder.setMapVersion((short) 0); + recordBuilder.setEid(eid); + recordBuilder.setAction(Action.NativelyForward); + if (authenticate && mapService.getAuthenticationKey(eid) != null) { + recordBuilder.setRecordTtl(TTL_RLOC_TIMED_OUT); + } else { + recordBuilder.setRecordTtl(TTL_NO_RLOC_KNOWN); + } + return recordBuilder.build(); + } + + private void updateSubscribers(Rloc itrRloc, Eid dstEid, + Eid srcEid) { + SubscriberRLOC subscriberRloc = new SubscriberRLOC(itrRloc, srcEid); + Set subscribers = getSubscribers(dstEid); + 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); + } + LOG.trace("Adding new subscriber: " + subscriberRloc.toString()); + subscribers.add(subscriberRloc); + addSubscribers(dstEid, subscribers); + } + // 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.getDst(mapping.getEid())).build(); + } + return mapping; } - private void addLocatorGroups(EidToLocatorRecordBuilder recordBuilder, List rlocs, List itrRlocs) { - for (MappingServiceRLOCGroup rloc : rlocs) { - addLocators(recordBuilder, rloc, itrRlocs); - recordBuilder.setRecordTtl(rloc.getTtl()); + private boolean locatorsNeedFixing(List locatorRecords) { + for (LocatorRecord record : locatorRecords) { + if (record.getRloc().getAddress() instanceof ExplicitLocatorPath) { + return true; + } } + return false; } - private void addLocators(EidToLocatorRecordBuilder recordBuilder, MappingServiceRLOCGroup locatorObject, List itrRlocs) { - if (locatorObject == null) { - return; + // Process locators according to configured policy + private MappingRecord updateLocators(MappingRecord mapping, List itrRlocs) { + // no fixing if elpPolicy is default + if (elpPolicy.equalsIgnoreCase("default")) { + return mapping; } - recordBuilder.setAction(locatorObject.getAction()); - recordBuilder.setAuthoritative(locatorObject.isAuthoritative()); - recordBuilder.setRecordTtl(locatorObject.getTtl()); + List locatorRecords = mapping.getLocatorRecord(); + + // if no updated is needed, just return the mapping + if (!locatorsNeedFixing(locatorRecords)) { + return mapping; + } + MappingRecordBuilder recordBuilder = new MappingRecordBuilder(); + recordBuilder.setLocatorRecord(new ArrayList()); 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)) || elpPolicy.equalsIgnoreCase("default") || itrRlocs == null) { + // 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 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()) + 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")) { 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()); + new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator()) + .setRlocProbed(record.isRlocProbed()).setWeight(record.getWeight()) + .setPriority(record.getPriority()) + .setMulticastWeight(record.getMulticastWeight()) + .setMulticastPriority(record.getMulticastPriority()) + .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++; } } // Build and add the simple RLOC recordBuilder.getLocatorRecord().add( - new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator()).setRlocProbed(record.isRlocProbed()) - .setWeight(record.getWeight()).setPriority(priority).setMulticastWeight(record.getMulticastWeight()) - .setMulticastPriority(record.getMulticastPriority()).setRouted(record.isRouted()) - .setLispAddressContainer(nextHop).setName(record.getName()).build()); + new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator()) + .setRlocProbed(record.isRlocProbed()).setWeight(record.getWeight()) + .setPriority(priority).setMulticastWeight(record.getMulticastWeight()) + .setMulticastPriority(record.getMulticastPriority()).setRouted(record.isRouted()) + .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 itrRlocs) { - LispAddressContainer nextHop = null; - List hops = elp.getHops(); + private SimpleAddress getNextELPHop(ExplicitLocatorPath elp, List itrRlocs) { + SimpleAddress nextHop = null; + List 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) { + SimpleAddress hopContainer = hop.getAddress(); for (ItrRloc itrRloc : itrRlocs) { - if (itrRloc.getLispAddressContainer().equals(hopContainer)) { + // XXX Need conversion + if (itrRloc.getRloc().equals(hopContainer)) { int i = hops.indexOf(hop); if (i < hops.size() - 1) { - nextHop = LispAFIConvertor.toContainer(LispAFIConvertor.toAFIfromPrimitive(hops.get(i+1).getHop().getPrimitiveAddress())); + nextHop = hops.get(i + 1).getAddress(); return nextHop; } } @@ -217,4 +240,27 @@ public class MapResolver extends AbstractLispComponent implements IMapResolverAs return nextHop; } + @SuppressWarnings("unchecked") + private Set getSubscribers(Eid address) { + return (Set) mapService.getData(MappingOrigin.Southbound, address, SubKeys.SUBSCRIBERS); + } + + private void addSubscribers(Eid address, Set subscribers) { + mapService.addData(MappingOrigin.Southbound, address, SubKeys.SUBSCRIBERS, subscribers); + } + + @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; + } }