From e562a8f1e0796a9699fc93e5b18de2c386b730f8 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Fri, 2 Sep 2016 13:45:01 +0200 Subject: HONEYCOMB-147 - Bad filtering while dumping local locator-sets Cherrypicked from https://gerrit.fd.io/r/#/c/2607/2 Fixed filtering while dumping only local locator-sets Added automatic learning of previously created locatr-sets(name to index mapping) Change-Id: I5d40c545e76a698ffdda9a092590280b0daca68a Signed-off-by: Jan Srnicek --- .../lisp/translate/read/factory/LocatorSetsReaderFactory.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java') diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java index 053f3d858..3d0801969 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/factory/LocatorSetsReaderFactory.java @@ -45,7 +45,7 @@ public class LocatorSetsReaderFactory extends AbstractLispReaderFactoryBase impl final NamingContext locatorSetContext ) { super(lispStateId, vppApi); - this.interfaceContext=interfaceContext; + this.interfaceContext = interfaceContext; this.locatorSetContext = locatorSetContext; } @@ -53,7 +53,7 @@ public class LocatorSetsReaderFactory extends AbstractLispReaderFactoryBase impl @Nonnull final FutureJVppCore vppApi, final NamingContext interfaceContext, @Nonnull final NamingContext locatorSetContext) { - return new LocatorSetsReaderFactory(lispStateId, vppApi, interfaceContext,locatorSetContext); + return new LocatorSetsReaderFactory(lispStateId, vppApi, interfaceContext, locatorSetContext); } @Override @@ -63,7 +63,8 @@ public class LocatorSetsReaderFactory extends AbstractLispReaderFactoryBase impl locatorSetsInstanceIdentifier.child(LocatorSet.class); registry.addStructuralReader(locatorSetsInstanceIdentifier, LocatorSetsBuilder.class); - registry.add(new GenericListReader<>(locatorSetInstanceIdentifier, new LocatorSetCustomizer(vppApi))); + registry.add(new GenericListReader<>(locatorSetInstanceIdentifier, + new LocatorSetCustomizer(vppApi, locatorSetContext))); registry.add(new GenericListReader<>(locatorSetInstanceIdentifier.child(Interface.class), new InterfaceCustomizer(vppApi, interfaceContext, locatorSetContext))); } -- cgit 1.2.3-korg