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/RemoteMappingCustomizer.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/RemoteMappingCustomizer.java')
| -rwxr-xr-x | lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizer.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizer.java index 81405ecec..b6327c2ba 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/RemoteMappingCustomizer.java @@ -115,6 +115,7 @@ public class RemoteMappingCustomizer extends FutureJVppCustomizer .setEidType(EidConverter.getEidType(eid)) .setEid(EidConverter.getEidAsByteArray(eid)) .setPrefixLength(EidConverter.getPrefixLength(eid)) + .setFilter(FilterType.REMOTE) .build(); LOG.debug("Dumping data for LocalMappings(id={})", id); @@ -158,10 +159,17 @@ public class RemoteMappingCustomizer extends FutureJVppCustomizer throws ReadFailedException { checkState(id.firstKeyOf(VniTable.class) != null, "Parent VNI table not specified"); + final int vni = id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier().intValue(); + + 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(); + } //requesting all remote with specific vni final MappingsDumpParams dumpParams = new MappingsDumpParamsBuilder() - .setVni(Long.valueOf(id.firstKeyOf(VniTable.class).getVirtualNetworkIdentifier()).intValue()) .setEidSet(QuantityType.ALL) .setFilter(FilterType.REMOTE) .build(); @@ -179,6 +187,7 @@ public class RemoteMappingCustomizer extends FutureJVppCustomizer return replyOptional.get() .lispEidTableDetails .stream() + .filter(a -> a.vni == vni) .map(detail -> new RemoteMappingKey( new MappingId( remoteMappingContext.getId( |