HC2VPP-168 - Gpe native entries support(operational read)

Change-Id: I50155013874a9e69d926a48a212d402e93945d9b
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

4 files changed, 360 insertions, 6 deletions

diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java
index 734b4841b..2c5da177e 100644
--- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java
@@ -31,6 +31,10 @@ import io.fd.vpp.jvpp.core.future.FutureJVppCore;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.GpeState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.GpeStateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTablesState;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTablesStateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPath;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.GpeEntryTable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.GpeEntryTableBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.gpe.entry.table.GpeEntry;
@@ -66,6 +70,10 @@ public class GpeReaderFactory implements ReaderFactory {
     @Named(GpeModule.GPE_TO_LOCATOR_PAIR_CTX)
     private GpeLocatorPairMappingContext gpeLocatorPairMappingContext;
 
+    @Inject
+    @Named("interface-context")
+    private NamingContext interfaceContext;
+
     @Override
     public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) {
         registry.addStructuralReader(GPE_STATE_ID, GpeStateBuilder.class);
@@ -81,5 +89,15 @@ public class GpeReaderFactory implements ReaderFactory {
                 new GenericInitListReader<>(GPE_ENTRY_ID,
                         new GpeForwardEntryCustomizer(api, gpeStateCheckService, gpeEntryMappingContext,
                                 gpeLocatorPairMappingContext)));
+
+        final InstanceIdentifier<NativeForwardPathsTablesState> tablesId =
+                InstanceIdentifier.create(NativeForwardPathsTablesState.class);
+        registry.addStructuralReader(tablesId, NativeForwardPathsTablesStateBuilder.class);
+
+        final InstanceIdentifier<NativeForwardPathsTable> tableId = tablesId.child(NativeForwardPathsTable.class);
+        registry.add(new GenericInitListReader<>(tableId, new NativeForwardPathsTableCustomizer(api)));
+
+        final InstanceIdentifier<NativeForwardPath> pathId = tableId.child(NativeForwardPath.class);
+        registry.add(new GenericInitListReader<>(pathId, new NativeForwardPathCustomizer(api, interfaceContext)));
     }
 }
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java
new file mode 100644
index 000000000..b8a59a181
--- /dev/null
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.lisp.gpe.translate.read;
+
+import static java.util.Arrays.stream;
+
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.honeycomb.translate.ModificationCache;
+import io.fd.honeycomb.translate.read.ReadContext;
+import io.fd.honeycomb.translate.read.ReadFailedException;
+import io.fd.honeycomb.translate.spi.read.Initialized;
+import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
+import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
+import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet;
+import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGetReply;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import io.fd.vpp.jvpp.core.types.GpeNativeFwdRpath;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTableKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPath;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPathBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPathKey;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+
+public class NativeForwardPathCustomizer extends FutureJVppCustomizer
+        implements InitializingListReaderCustomizer<NativeForwardPath, NativeForwardPathKey, NativeForwardPathBuilder>,
+        JvppReplyConsumer, AddressTranslator {
+
+    private static final GpeNativeFwdRpathsGetReply DEFAULT_DUMP = new GpeNativeFwdRpathsGetReply();
+
+    private final NamingContext interfaceContext;
+    private final DumpCacheManager<GpeNativeFwdRpathsGetReply, Integer> dumpCacheManager;
+
+    public NativeForwardPathCustomizer(@Nonnull final FutureJVppCore futureJVppCore,
+                                       @Nonnull final NamingContext interfaceContext) {
+        super(futureJVppCore);
+        this.interfaceContext = interfaceContext;
+        dumpCacheManager = new DumpCacheManager.DumpCacheManagerBuilder<GpeNativeFwdRpathsGetReply, Integer>()
+                .acceptOnly(GpeNativeFwdRpathsGetReply.class)
+                .withExecutor((identifier, params) -> {
+                    final GpeNativeFwdRpathsGet request = new GpeNativeFwdRpathsGet();
+                    request.isIp4 = params.byteValue();
+                    return getReplyForRead(getFutureJVpp().gpeNativeFwdRpathsGet(request).toCompletableFuture(),
+                            identifier);
+                }).build();
+    }
+
+    @Nonnull
+    @Override
+    public Initialized<? extends DataObject> init(@Nonnull final InstanceIdentifier<NativeForwardPath> id,
+                                                  @Nonnull final NativeForwardPath readValue,
+                                                  @Nonnull final ReadContext ctx) {
+        final Long tableId = id.firstKeyOf(NativeForwardPathsTable.class).getTableId();
+        final KeyedInstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPath, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPathKey>
+                cfgId = InstanceIdentifier.create(NativeForwardPathsTables.class)
+                .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable.class,
+                        new NativeForwardPathsTableKey(
+                                tableId))
+                .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPath.class,
+                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPathKey(
+                                readValue.getNextHopAddress()));
+
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPath
+                cfgValue =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPathBuilder()
+                        .setNextHopAddress(readValue.getNextHopAddress())
+                        .setNextHopInterface(readValue.getNextHopInterface())
+                        .build();
+        return Initialized.create(cfgId, cfgValue);
+    }
+
+    @Nonnull
+    @Override
+    public List<NativeForwardPathKey> getAllIds(@Nonnull final InstanceIdentifier<NativeForwardPath> id,
+                                                @Nonnull final ReadContext context) throws ReadFailedException {
+
+        final ModificationCache modificationCache = context.getModificationCache();
+        final Long tableId = id.firstKeyOf(NativeForwardPathsTable.class).getTableId();
+        return Stream.concat(
+                stream(v6Dump(id, modificationCache, dumpCacheManager).entries),
+                stream(v4Dump(id, modificationCache, dumpCacheManager).entries))
+                // fib index temporally returns table id to be able to filter by table id
+                // field will be renamed in future
+                .filter(gpeNativeFwdRpath -> isFromFib(tableId, gpeNativeFwdRpath))
+                .map(gpeNativeFwdRpath -> arrayToIpAddress(!byteToBoolean(gpeNativeFwdRpath.isIp4),
+                        gpeNativeFwdRpath.nhAddr))
+                .map(NativeForwardPathKey::new)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public void merge(@Nonnull final Builder<? extends DataObject> builder,
+                      @Nonnull final List<NativeForwardPath> readData) {
+        ((NativeForwardPathsTableBuilder) builder).setNativeForwardPath(readData);
+    }
+
+    @Nonnull
+    @Override
+    public NativeForwardPathBuilder getBuilder(@Nonnull final InstanceIdentifier<NativeForwardPath> id) {
+        return new NativeForwardPathBuilder();
+    }
+
+    @Override
+    public void readCurrentAttributes(@Nonnull final InstanceIdentifier<NativeForwardPath> id,
+                                      @Nonnull final NativeForwardPathBuilder builder,
+                                      @Nonnull final ReadContext ctx)
+            throws ReadFailedException {
+        final IpAddress nextHopAddress = id.firstKeyOf(NativeForwardPath.class).getNextHopAddress();
+        final ModificationCache modificationCache = ctx.getModificationCache();
+        final boolean ipv6 = isIpv6(nextHopAddress);
+        final Long tableId = id.firstKeyOf(NativeForwardPathsTable.class).getTableId();
+
+        // dumps only needed address family
+        final Optional<GpeNativeFwdRpath> foundPath = Arrays.stream(ipv6
+                ? v6Dump(id, modificationCache, dumpCacheManager).entries
+                : v4Dump(id, modificationCache, dumpCacheManager).entries)
+                .filter(gpeNativeFwdRpath -> isFromFib(tableId, gpeNativeFwdRpath))
+                // TODO - HC2VPP-169 - use equals after resolving this issue
+                .filter(gpeNativeFwdRpath -> addressesEqual(nextHopAddress,
+                        arrayToIpAddress(ipv6, gpeNativeFwdRpath.nhAddr)))
+                .findAny();
+
+        if (foundPath.isPresent()) {
+            final GpeNativeFwdRpath path = foundPath.get();
+            builder.setNextHopAddress(arrayToIpAddress(ipv6, path.nhAddr));
+            if (path.nhSwIfIndex != ~0) {
+                builder.setNextHopInterface(interfaceContext.getName(path.nhSwIfIndex, ctx.getMappingContext()));
+            }
+        }
+    }
+
+    private static boolean isFromFib(final Long tableId, final GpeNativeFwdRpath gpeNativeFwdRpath) {
+        // fibIndex is temporally used to return table id
+        // ~0 is default, and 0 will be used internally in vpp
+        return gpeNativeFwdRpath.fibIndex == ~0
+                ? 0 == tableId
+                : gpeNativeFwdRpath.fibIndex == tableId;
+    }
+
+    private static GpeNativeFwdRpathsGetReply v4Dump(final @Nonnull InstanceIdentifier<?> id,
+                                                     final ModificationCache modificationCache,
+                                                     final DumpCacheManager<GpeNativeFwdRpathsGetReply, Integer> dumpCacheManager)
+            throws ReadFailedException {
+        return dumpCacheManager.getDump(id, modificationCache, 1).or(DEFAULT_DUMP);
+    }
+
+    private static GpeNativeFwdRpathsGetReply v6Dump(final @Nonnull InstanceIdentifier<?> id,
+                                                     final ModificationCache modificationCache,
+                                                     final DumpCacheManager<GpeNativeFwdRpathsGetReply, Integer> dumpCacheManager)
+            throws ReadFailedException {
+        return dumpCacheManager.getDump(id, modificationCache, 0).or(DEFAULT_DUMP);
+    }
+}
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java
new file mode 100644
index 000000000..055f38ae8
--- /dev/null
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.lisp.gpe.translate.read;
+
+import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS;
+
+import com.google.common.primitives.UnsignedInts;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.honeycomb.translate.read.ReadContext;
+import io.fd.honeycomb.translate.read.ReadFailedException;
+import io.fd.honeycomb.translate.spi.read.Initialized;
+import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
+import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
+import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder;
+import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump;
+import io.fd.vpp.jvpp.core.dto.Ip6FibDump;
+import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump;
+import io.fd.vpp.jvpp.core.dto.IpFibDump;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import java.util.List;
+import java.util.OptionalLong;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTablesStateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableKey;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+
+public class NativeForwardPathsTableCustomizer extends FutureJVppCustomizer implements
+        InitializingListReaderCustomizer<NativeForwardPathsTable, NativeForwardPathsTableKey, NativeForwardPathsTableBuilder>,
+        JvppReplyConsumer {
+
+    // no need to recreate, has no params
+    private static final IpFibDump REQUEST_V4 = new IpFibDump();
+    private static final Ip6FibDump REQUEST_V6 = new Ip6FibDump();
+    private static final IpFibDetailsReplyDump DEFAULT_REPLY_V4 = new IpFibDetailsReplyDump();
+    private static final Ip6FibDetailsReplyDump DEFAULT_REPLY_V6 = new Ip6FibDetailsReplyDump();
+    private DumpCacheManager<IpFibDetailsReplyDump, Void> dumpCacheManagerV4;
+    private DumpCacheManager<Ip6FibDetailsReplyDump, Void> dumpCacheManagerV6;
+
+    public NativeForwardPathsTableCustomizer(@Nonnull final FutureJVppCore futureJVppCore) {
+        super(futureJVppCore);
+
+        // there's no lisp specific dump for tables created by gpe_add_del_iface,
+        // so have to use standard fib dump
+        dumpCacheManagerV4 = new DumpCacheManagerBuilder<IpFibDetailsReplyDump, Void>()
+                .acceptOnly(IpFibDetailsReplyDump.class)
+                .withExecutor((identifier, params) -> getReplyForRead(
+                        getFutureJVpp().ipFibDump(REQUEST_V4).toCompletableFuture(),
+                        identifier)).build();
+
+        dumpCacheManagerV6 = new DumpCacheManagerBuilder<Ip6FibDetailsReplyDump, Void>()
+                .acceptOnly(Ip6FibDetailsReplyDump.class)
+                .withExecutor((identifier, params) -> getReplyForRead(
+                        getFutureJVpp().ip6FibDump(REQUEST_V6).toCompletableFuture(),
+                        identifier)).build();
+    }
+
+    @Nonnull
+    @Override
+    public Initialized<? extends DataObject> init(@Nonnull final InstanceIdentifier<NativeForwardPathsTable> id,
+                                                  @Nonnull final NativeForwardPathsTable readValue,
+                                                  @Nonnull final ReadContext ctx) {
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable
+                cfgValue =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTableBuilder()
+                        .setTableId(readValue.getTableId())
+                        .build();
+
+        final KeyedInstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTableKey>
+                cfgKey = InstanceIdentifier.create(NativeForwardPathsTables.class)
+                .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable.class,
+                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTableKey(
+                                cfgValue.getKey()));
+
+        return Initialized.create(cfgKey, cfgValue);
+    }
+
+    @Nonnull
+    @Override
+    public List<NativeForwardPathsTableKey> getAllIds(@Nonnull final InstanceIdentifier<NativeForwardPathsTable> id,
+                                                      @Nonnull final ReadContext context) throws ReadFailedException {
+
+        return Stream.concat(v4FibsStream(id, context), v6FibsStream(id, context))
+                .mapToLong(UnsignedInts::toLong)
+                .distinct()
+                .mapToObj(NativeForwardPathsTableKey::new)
+                .collect(Collectors.toList());
+    }
+
+
+    @Override
+    public void merge(@Nonnull final Builder<? extends DataObject> builder,
+                      @Nonnull final List<NativeForwardPathsTable> readData) {
+        ((NativeForwardPathsTablesStateBuilder) builder).setNativeForwardPathsTable(readData);
+    }
+
+    @Nonnull
+    @Override
+    public NativeForwardPathsTableBuilder getBuilder(@Nonnull final InstanceIdentifier<NativeForwardPathsTable> id) {
+        return new NativeForwardPathsTableBuilder();
+    }
+
+    @Override
+    public void readCurrentAttributes(@Nonnull final InstanceIdentifier<NativeForwardPathsTable> id,
+                                      @Nonnull final NativeForwardPathsTableBuilder builder,
+                                      @Nonnull final ReadContext ctx)
+            throws ReadFailedException {
+        final Long tableId = id.firstKeyOf(NativeForwardPathsTable.class).getTableId();
+
+        final OptionalLong optionalTable = Stream.concat(v4FibsStream(id, ctx), v6FibsStream(id, ctx))
+                .mapToLong(UnsignedInts::toLong)
+                .distinct()
+                .filter(tblId -> tblId == tableId)
+                .findAny();
+
+        if (optionalTable.isPresent()) {
+            final long existingTableId = optionalTable.getAsLong();
+            builder.setTableId(existingTableId);
+            builder.setKey(new NativeForwardPathsTableKey(existingTableId));
+        }
+    }
+
+    private Stream<Integer> v4FibsStream(final InstanceIdentifier<NativeForwardPathsTable> id,
+                                         final ReadContext ctx) throws ReadFailedException {
+
+        return dumpCacheManagerV4.getDump(id, ctx.getModificationCache(), NO_PARAMS).or(DEFAULT_REPLY_V4)
+                .ipFibDetails.stream()
+                .map(ipFibDetails -> ipFibDetails.tableId);
+    }
+
+    private Stream<Integer> v6FibsStream(final InstanceIdentifier<NativeForwardPathsTable> id,
+                                         final ReadContext ctx) throws ReadFailedException {
+
+        return dumpCacheManagerV6.getDump(id, ctx.getModificationCache(), NO_PARAMS).or(DEFAULT_REPLY_V6)
+                .ip6FibDetails.stream()
+                .map(ip6FibDetails -> ip6FibDetails.tableId);
+    }
+}
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java
index 41de38333..85d520868 100755
--- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java
@@ -105,12 +105,6 @@ public class MapResolverCustomizer extends CheckedLispCustomizer
                 arrayToIpAddress(byteToBoolean(mapResolverDetails.isIpv6), mapResolverDetails.ipAddress));
     }
 
-    // safest way to compare addresses - prevents returning false while using different types from hierarchy
-    // Ex. Key for MapResolver contains Ipv4Address as value but we translate addresses from binary data to Ipv4AddressNoZone
-    private boolean addressesEqual(final IpAddress left, final IpAddress right) {
-        return Arrays.equals(left.getValue(), right.getValue());
-    }
-
     @Override
     public List<MapResolverKey> getAllIds(InstanceIdentifier<MapResolver> id, ReadContext context)
             throws ReadFailedException {