From 3afa4e3d471e2c6178c4f8a5600003a53288b34f Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Tue, 8 Nov 2016 12:34:36 +0100
Subject: HONEYCOMB-270 Remove read (presence) workarounds for nat

Change-Id: Ia0986dbe173123a4dca4f7f3bf65e7ba4851b1b7
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 .../nat/read/ifc/AbstractInterfaceNatCustomizer.java          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/AbstractInterfaceNatCustomizer.java')

diff --git a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/AbstractInterfaceNatCustomizer.java
index e48e7eb3d..f4d45900c 100644
--- a/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/AbstractInterfaceNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/honeycomb/nat/read/ifc/AbstractInterfaceNatCustomizer.java
@@ -47,6 +47,11 @@ abstract class AbstractInterfaceNatCustomizer<C extends DataObject, B extends Bu
     public void readCurrentAttributes(@Nonnull final InstanceIdentifier<C> id,
                                       @Nonnull final B builder,
                                       @Nonnull final ReadContext ctx) throws ReadFailedException {
+        // NOOP
+    }
+
+    @Override
+    public boolean isPresent(final InstanceIdentifier<C> id, final C built, final ReadContext ctx) throws ReadFailedException {
         final String ifcName = id.firstKeyOf(Interface.class).getName();
         getLog().debug("Reading NAT features on interface: {}", ifcName);
         final int index = ifcContext.getIndex(ifcName, ctx.getMappingContext());
@@ -56,17 +61,15 @@ abstract class AbstractInterfaceNatCustomizer<C extends DataObject, B extends Bu
                 dumpMgr.getDump(id, ctx.getModificationCache(), null);
 
         // Find entries for current ifc and if is marked as inside set the builder to return presence container
-        dump.or(new SnatInterfaceDetailsReplyDump()).snatInterfaceDetails.stream()
+        return dump.or(new SnatInterfaceDetailsReplyDump()).snatInterfaceDetails.stream()
                 .filter(snatIfcDetail -> snatIfcDetail.swIfIndex == index)
                 .filter(this::isExpectedNatType)
                 .findFirst()
-                .ifPresent(snatIfcDetail -> setBuilderPresence(builder));
+                .isPresent();
         // Not setting data, just marking the builder to propagate empty container to indicate presence
     }
 
     protected abstract Logger getLog();
 
-    abstract void setBuilderPresence(@Nonnull final B builder);
-
     abstract boolean isExpectedNatType(final SnatInterfaceDetails snatInterfaceDetails);
 }
-- 
cgit 1.2.3-korg