From f99391460a65aea85ee1dc4a229db5503d47716b Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Wed, 21 Sep 2016 15:07:27 +0200 Subject: 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 --- .../io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java') diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java index f03a72937..60ef1f2dc 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/MapResolverCustomizer.java @@ -18,6 +18,7 @@ package io.fd.honeycomb.lisp.translate.read; import static io.fd.honeycomb.translate.v3po.util.TranslateUtils.arrayToIpAddress; import static io.fd.honeycomb.translate.v3po.util.TranslateUtils.byteToBoolean; +import static io.fd.honeycomb.translate.v3po.util.TranslateUtils.reverseAddress; import static io.fd.honeycomb.translate.v3po.util.cache.EntityDumpExecutor.NO_PARAMS; import com.google.common.base.Optional; @@ -85,13 +86,15 @@ public class MapResolverCustomizer extends FutureJVppCustomizer } final MapResolverKey key = id.firstKeyOf(MapResolver.class); - final IpAddress address = key.getIpAddress(); + //revert searched key to match vpp's reversed order ip's + final IpAddress address = reverseAddress(key.getIpAddress()); final LispMapResolverDetailsReplyDump dump = dumpOptional.get(); //cannot use RWUtils.singleItemCollector(),there is some problem with generic params binding java.util.Optional mapResolverOptional = dump.lispMapResolverDetails.stream() - .filter(a -> address.equals(arrayToIpAddress(byteToBoolean(a.isIpv6), a.ipAddress))) + .filter(a -> address + .equals(arrayToIpAddress(byteToBoolean(a.isIpv6), a.ipAddress))) .findFirst(); if (mapResolverOptional.isPresent()) { -- cgit 1.2.3-korg