From: Michal Cmarada <michal.cmarada@pantheon.tech>
Date: Wed, 9 May 2018 10:20:22 +0000 (+0200)
Subject: HC2VPP-316 - Fix isTableLookup check
X-Git-Tag: v1.18.07-RC1~79
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=6bfb3a997ad5f0993808db92b484f3d0d5dac452;p=hc2vpp.git

HC2VPP-316 - Fix isTableLookup check

Fixing condition, because VPP-995 is not relevant anymore.

Change-Id: Ie444817c265f6a3e01b7694e60fd0ce76ec15bc5
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
---

diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java
index 68f245b26..8da15c1bd 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/trait/RouteMapper.java
@@ -79,8 +79,7 @@ public interface RouteMapper extends AddressTranslator, ByteDataTranslator {
     }
 
     default boolean isTableLookup(@Nonnull final FibPath path) {
-        // TODO - remove isDrop condition https://jira.fd.io/browse/VPP-995
-        return path.isDrop == 1 && isArrayZeroed(path.nextHop);
+        return !isSpecialHop(path) && isArrayZeroed(path.nextHop);
     }
 
     default SpecialNextHopGrouping.SpecialNextHop specialHopType(final FibPath singlePath) {