diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2016-09-21 15:07:27 +0200 |
---|---|---|
committer | Maros Marsalek <mmarsale@cisco.com> | 2016-09-21 13:38:24 +0000 |
commit | f99391460a65aea85ee1dc4a229db5503d47716b (patch) | |
tree | 2d42baefc2682add348e4ee1af25a859fe3f0bd0 /lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java | |
parent | 8f0700144878115aeb16d319d4dae10e917c83d5 (diff) |
Fixed reading of operational state of lisp
Rejecting of empty locator-sets
Added revert of searched key to match vpp address
order
Ignoring helper data returned by dumps
Change-Id: I35fff11d6dbbceb28a526c6603317948a5a9e179
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java')
-rwxr-xr-x | lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java index 8762066d2..28c09c95a 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocalMappingCustomizer.java @@ -154,11 +154,19 @@ public class LocalMappingCustomizer throws ReadFailedException { checkState(id.firstKeyOf(VniTable.class) != null, "Parent VNI table not specified"); + final long vni = id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier(); + + if (vni == 0) { + // ignoring default vni mapping + // its not relevant for us and we also don't store mapping for such eid's + // such mapping is used to create helper local mappings to process remote ones + return Collections.emptyList(); + } //request for all local mappings final MappingsDumpParams dumpParams = new MappingsDumpParamsBuilder() - .setVni(Long.valueOf(id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier()).intValue()) .setFilter(FilterType.LOCAL) + .setEidSet(QuantityType.ALL) .build(); @@ -172,11 +180,14 @@ public class LocalMappingCustomizer if (replyOptional.isPresent()) { LOG.debug("Valid dump loaded"); - return replyOptional.get().lispEidTableDetails.stream().map(a -> new LocalMappingKey( - new MappingId( - localMappingContext.getId( - getArrayAsEidLocal(valueOf(a.eidType), a.eid), - context.getMappingContext())))) + return replyOptional.get().lispEidTableDetails.stream() + //filtering with vni to skip help local mappings that are created in vpp to handle remote mappings(vpp feature) + .filter(a -> a.vni == vni) + .map(a -> new LocalMappingKey( + new MappingId( + localMappingContext.getId( + getArrayAsEidLocal(valueOf(a.eidType), a.eid), + context.getMappingContext())))) .collect(Collectors.toList()); } else { LOG.debug("No data dumped"); |