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 <jsrnicek@cisco.com>

1 files changed, 4 insertions, 3 deletions

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)));
     }