From 05482bfbff3de32a40c960a42eea4402e67fc961 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 29 Jun 2017 10:44:41 +0200
Subject: HC2VPP-152: nat for sub-interfaces translation layer

Change-Id: I7d3a52097975f38c1cd74426d5ec15f80274a56c
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java
index d6cc2b144..2d48bd5e1 100644
--- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java
@@ -17,11 +17,11 @@
 package io.fd.hc2vpp.nat.read.ifc;
 
 import com.google.common.base.Optional;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.read.ReadContext;
 import io.fd.honeycomb.translate.read.ReadFailedException;
 import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer;
 import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetails;
 import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump;
 import javax.annotation.Nonnull;
@@ -52,7 +52,7 @@ abstract class AbstractInterfaceNatCustomizer<C extends DataObject, B extends Bu
 
     @Override
     public boolean isPresent(final InstanceIdentifier<C> id, final C built, final ReadContext ctx) throws ReadFailedException {
-        final String ifcName = id.firstKeyOf(Interface.class).getName();
+        final String ifcName = getName(id);
         getLog().debug("Reading NAT features on interface: {}", ifcName);
         final int index = ifcContext.getIndex(ifcName, ctx.getMappingContext());
 
@@ -69,6 +69,10 @@ abstract class AbstractInterfaceNatCustomizer<C extends DataObject, B extends Bu
         // Not setting data, just marking the builder to propagate empty container to indicate presence
     }
 
+    protected String getName(final InstanceIdentifier<C> id) {
+        return id.firstKeyOf(Interface.class).getName();
+    }
+
     protected abstract Logger getLog();
 
     abstract boolean isExpectedNatType(final SnatInterfaceDetails snatInterfaceDetails);
-- 
cgit 1.2.3-korg