Fix binary AuthenticationKey lookup 80/39780/1
authorLorand Jakab <lojakab@cisco.com>
Thu, 2 Jun 2016 15:30:28 +0000 (18:30 +0300)
committerLorand Jakab <lojakab@cisco.com>
Thu, 2 Jun 2016 15:30:28 +0000 (18:30 +0300)
Change-Id: I84357b7bb301b09cd342d818448fa309bca8abf3
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java

index 72f6d04126a7f041fcaf3c72e8462505b31f8ac1..4cb8ad763ad1ca4c7a3e30c99c6b2b10efab37b8 100644 (file)
@@ -22,8 +22,7 @@ import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;
 import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys;
 import org.opendaylight.lispflowmapping.interfaces.mapcache.IMapCache;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6Prefix;
+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.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
@@ -334,7 +333,7 @@ public class SimpleMapCache implements IMapCache {
         if (table == null) {
             return null;
         }
-        if (eid.getAddress() instanceof Ipv4Prefix || eid.getAddress() instanceof Ipv6Prefix) {
+        if (MaskUtil.isMaskable(eid.getAddress()) && !(eid.getAddress() instanceof SourceDestKey)) {
             return getAuthKeyLpm(eid, table);
         } else {
             Eid key = MaskUtil.normalize(eid);