HC2VPP-222: adapt hc2vpp to snat->nat plugin rename in vpp

Change-Id: If4c7f2f1fc52f1ee64ed95900a362063207def27
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

5 files changed, 69 insertions, 72 deletions

diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java
index 8f25bfa12..db68ecf6a 100644
--- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java
@@ -27,11 +27,11 @@ import io.fd.hc2vpp.nat.NatTestSchemaContext;
 import io.fd.honeycomb.test.tools.HoneycombTestRunner;
 import io.fd.honeycomb.test.tools.annotations.InjectTestData;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.snat.dto.Nat64AddDelPoolAddrRange;
-import io.fd.vpp.jvpp.snat.dto.Nat64AddDelPoolAddrRangeReply;
-import io.fd.vpp.jvpp.snat.dto.SnatAddAddressRange;
-import io.fd.vpp.jvpp.snat.dto.SnatAddAddressRangeReply;
-import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import io.fd.vpp.jvpp.nat.dto.Nat44AddDelAddressRange;
+import io.fd.vpp.jvpp.nat.dto.Nat44AddDelAddressRangeReply;
+import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPoolAddrRange;
+import io.fd.vpp.jvpp.nat.dto.Nat64AddDelPoolAddrRangeReply;
+import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -56,14 +56,14 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement
     private static final String NAT_INSTANCES_PATH = "/ietf-nat:nat-config/ietf-nat:nat-instances";
 
     @Mock
-    private FutureJVppSnatFacade jvppSnat;
+    private FutureJVppNatFacade jvppNat;
     private ExternalIpPoolCustomizer customizer;
 
     @Override
     public void setUpTest() {
-        customizer = new ExternalIpPoolCustomizer(jvppSnat);
-        when(jvppSnat.snatAddAddressRange(any())).thenReturn(future(new SnatAddAddressRangeReply()));
-        when(jvppSnat.nat64AddDelPoolAddrRange(any())).thenReturn(future(new Nat64AddDelPoolAddrRangeReply()));
+        customizer = new ExternalIpPoolCustomizer(jvppNat);
+        when(jvppNat.nat44AddDelAddressRange(any())).thenReturn(future(new Nat44AddDelAddressRangeReply()));
+        when(jvppNat.nat64AddDelPoolAddrRange(any())).thenReturn(future(new Nat64AddDelPoolAddrRangeReply()));
     }
 
     @Test
@@ -71,8 +71,8 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement
             @InjectTestData(resourcePath = "/nat44/external-ip-pool.json", id = NAT_INSTANCES_PATH) NatInstances data)
             throws WriteFailedException {
         customizer.writeCurrentAttributes(IID, extractIpPool(data), writeContext);
-        final SnatAddAddressRange expectedRequest = getExpectedRequestNat44(true);
-        verify(jvppSnat).snatAddAddressRange(expectedRequest);
+        final Nat44AddDelAddressRange expectedRequest = getExpectedRequestNat44(true);
+        verify(jvppNat).nat44AddDelAddressRange(expectedRequest);
     }
 
     @Test
@@ -81,7 +81,7 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement
             throws WriteFailedException {
         customizer.writeCurrentAttributes(IID, extractIpPool(data), writeContext);
         final Nat64AddDelPoolAddrRange expectedRequest = getExpectedRequestNat64(true);
-        verify(jvppSnat).nat64AddDelPoolAddrRange(expectedRequest);
+        verify(jvppNat).nat64AddDelPoolAddrRange(expectedRequest);
     }
 
         @Test(expected = UnsupportedOperationException.class)
@@ -95,8 +95,8 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement
             @InjectTestData(resourcePath = "/nat44/external-ip-pool.json", id = NAT_INSTANCES_PATH) NatInstances data)
             throws WriteFailedException {
         customizer.deleteCurrentAttributes(IID, extractIpPool(data), writeContext);
-        final SnatAddAddressRange expectedRequest = getExpectedRequestNat44(false);
-        verify(jvppSnat).snatAddAddressRange(expectedRequest);
+        final Nat44AddDelAddressRange expectedRequest = getExpectedRequestNat44(false);
+        verify(jvppNat).nat44AddDelAddressRange(expectedRequest);
     }
 
     @Test
@@ -105,7 +105,7 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement
             throws WriteFailedException {
         customizer.deleteCurrentAttributes(IID, extractIpPool(data), writeContext);
         final Nat64AddDelPoolAddrRange expectedRequest = getExpectedRequestNat64(false);
-        verify(jvppSnat).nat64AddDelPoolAddrRange(expectedRequest);
+        verify(jvppNat).nat64AddDelPoolAddrRange(expectedRequest);
     }
 
     private static ExternalIpAddressPool extractIpPool(NatInstances data) {
@@ -113,10 +113,9 @@ public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implement
         return data.getNatInstance().get(0).getExternalIpAddressPool().get(0);
     }
 
-    private SnatAddAddressRange getExpectedRequestNat44(final boolean isAdd) {
-        final SnatAddAddressRange expectedRequest = new SnatAddAddressRange();
+    private Nat44AddDelAddressRange getExpectedRequestNat44(final boolean isAdd) {
+        final Nat44AddDelAddressRange expectedRequest = new Nat44AddDelAddressRange();
         expectedRequest.isAdd = booleanToByte(isAdd);
-        expectedRequest.isIp4 = 1;
         expectedRequest.firstIpAddress = new byte[] {(byte) 192, (byte) 168, 1, 0};
         expectedRequest.lastIpAddress = new byte[] {(byte) 192, (byte) 168, 1, (byte) 255};
         return expectedRequest;
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java
index 96726cb11..29869381a 100644
--- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizerTest.java
@@ -26,11 +26,11 @@ import io.fd.hc2vpp.nat.util.MappingEntryContext;
 import io.fd.honeycomb.test.tools.HoneycombTestRunner;
 import io.fd.honeycomb.test.tools.annotations.InjectTestData;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.snat.dto.Nat64AddDelStaticBib;
-import io.fd.vpp.jvpp.snat.dto.Nat64AddDelStaticBibReply;
-import io.fd.vpp.jvpp.snat.dto.SnatAddStaticMapping;
-import io.fd.vpp.jvpp.snat.dto.SnatAddStaticMappingReply;
-import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import io.fd.vpp.jvpp.nat.dto.Nat44AddDelStaticMapping;
+import io.fd.vpp.jvpp.nat.dto.Nat44AddDelStaticMappingReply;
+import io.fd.vpp.jvpp.nat.dto.Nat64AddDelStaticBib;
+import io.fd.vpp.jvpp.nat.dto.Nat64AddDelStaticBibReply;
+import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -56,16 +56,16 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements
         + "ietf-nat:nat-instance[ietf-nat:id='" + NAT_INSTANCE_ID + "']/ietf-nat:mapping-table";
 
     @Mock
-    private FutureJVppSnatFacade jvppSnat;
+    private FutureJVppNatFacade jvppNat;
     @Mock
     private MappingEntryContext mappingContext;
     private MappingEntryCustomizer customizer;
 
     @Override
     public void setUpTest() {
-        customizer = new MappingEntryCustomizer(jvppSnat, mappingContext);
-        when(jvppSnat.snatAddStaticMapping(any())).thenReturn(future(new SnatAddStaticMappingReply()));
-        when(jvppSnat.nat64AddDelStaticBib(any())).thenReturn(future(new Nat64AddDelStaticBibReply()));
+        customizer = new MappingEntryCustomizer(jvppNat, mappingContext);
+        when(jvppNat.nat44AddDelStaticMapping(any())).thenReturn(future(new Nat44AddDelStaticMappingReply()));
+        when(jvppNat.nat64AddDelStaticBib(any())).thenReturn(future(new Nat64AddDelStaticBibReply()));
     }
 
     @Test
@@ -73,9 +73,9 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements
             @InjectTestData(resourcePath = "/nat44/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data)
             throws WriteFailedException {
         customizer.writeCurrentAttributes(IID, extractMappingEntry(data), writeContext);
-        final SnatAddStaticMapping expectedRequest = getExpectedNat44Request();
+        final Nat44AddDelStaticMapping expectedRequest = getExpectedNat44Request();
         expectedRequest.isAdd = 1;
-        verify(jvppSnat).snatAddStaticMapping(expectedRequest);
+        verify(jvppNat).nat44AddDelStaticMapping(expectedRequest);
     }
 
     @Test
@@ -85,7 +85,7 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements
         customizer.writeCurrentAttributes(IID, extractMappingEntry(data), writeContext);
         final Nat64AddDelStaticBib expectedRequest = getExpectedNat64Request();
         expectedRequest.isAdd = 1;
-        verify(jvppSnat).nat64AddDelStaticBib(expectedRequest);
+        verify(jvppNat).nat64AddDelStaticBib(expectedRequest);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -102,10 +102,10 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements
             throws WriteFailedException {
         customizer.updateCurrentAttributes(IID, extractMappingEntry(before), extractMappingEntry(after), writeContext);
         final Nat64AddDelStaticBib expectedDeleteRequest = getExpectedNat64Request();
-        verify(jvppSnat).nat64AddDelStaticBib(expectedDeleteRequest);
+        verify(jvppNat).nat64AddDelStaticBib(expectedDeleteRequest);
         final Nat64AddDelStaticBib expectedUpdateRequest = getExpectedNat64UpdateRequest();
         expectedUpdateRequest.isAdd = 1;
-        verify(jvppSnat).nat64AddDelStaticBib(expectedUpdateRequest);
+        verify(jvppNat).nat64AddDelStaticBib(expectedUpdateRequest);
     }
 
     @Test
@@ -113,7 +113,7 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements
             @InjectTestData(resourcePath = "/nat44/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data)
             throws WriteFailedException {
         customizer.deleteCurrentAttributes(IID, extractMappingEntry(data), writeContext);
-        verify(jvppSnat).snatAddStaticMapping(getExpectedNat44Request());
+        verify(jvppNat).nat44AddDelStaticMapping(getExpectedNat44Request());
     }
 
     @Test
@@ -121,7 +121,7 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements
             @InjectTestData(resourcePath = "/nat64/static-mapping.json", id = MAPPING_TABLE_PATH) MappingTable data)
             throws WriteFailedException {
         customizer.deleteCurrentAttributes(IID, extractMappingEntry(data), writeContext);
-        verify(jvppSnat).nat64AddDelStaticBib(getExpectedNat64Request());
+        verify(jvppNat).nat64AddDelStaticBib(getExpectedNat64Request());
     }
 
     private static MappingEntry extractMappingEntry(MappingTable data) {
@@ -129,9 +129,8 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements
         return data.getMappingEntry().get(0);
     }
 
-    private static SnatAddStaticMapping getExpectedNat44Request() {
-        final SnatAddStaticMapping expectedRequest = new SnatAddStaticMapping();
-        expectedRequest.isIp4 = 1;
+    private static Nat44AddDelStaticMapping getExpectedNat44Request() {
+        final Nat44AddDelStaticMapping expectedRequest = new Nat44AddDelStaticMapping();
         expectedRequest.addrOnly = 1;
         expectedRequest.protocol = 17; // udp
         expectedRequest.vrfId = (int) NAT_INSTANCE_ID;
@@ -150,9 +149,8 @@ public class MappingEntryCustomizerTest extends WriterCustomizerTest implements
         return expectedRequest;
     }
 
-    private static SnatAddStaticMapping getExpectedNat44UpdateRequest() {
-        final SnatAddStaticMapping expectedRequest = new SnatAddStaticMapping();
-        expectedRequest.isIp4 = 1;
+    private static Nat44AddDelStaticMapping getExpectedNat44UpdateRequest() {
+        final Nat44AddDelStaticMapping expectedRequest = new Nat44AddDelStaticMapping();
         expectedRequest.addrOnly = 1;
         expectedRequest.protocol = 17; // udp
         expectedRequest.vrfId = (int) NAT_INSTANCE_ID;
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java
index c70999907..611103d40 100644
--- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java
@@ -24,13 +24,13 @@ import static org.mockito.Mockito.when;
 import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.vpp.jvpp.snat.dto.Nat64AddDelInterface;
-import io.fd.vpp.jvpp.snat.dto.Nat64AddDelInterfaceReply;
-import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeature;
-import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeatureReply;
-import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelOutputFeature;
-import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelOutputFeatureReply;
-import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeature;
+import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelFeatureReply;
+import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeature;
+import io.fd.vpp.jvpp.nat.dto.Nat44InterfaceAddDelOutputFeatureReply;
+import io.fd.vpp.jvpp.nat.dto.Nat64AddDelInterface;
+import io.fd.vpp.jvpp.nat.dto.Nat64AddDelInterfaceReply;
+import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev170816.InterfaceNatVppFeatureAttributes;
@@ -47,17 +47,17 @@ abstract class AbstractNatCustomizerTest<D extends InterfaceNatVppFeatureAttribu
     private T customizer;
 
     @Mock
-    private FutureJVppSnatFacade snatApi;
+    private FutureJVppNatFacade natApi;
     private NamingContext ifcNamingCtx = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
 
     @Override
     public void setUpTest() {
-        customizer = getCustomizer(snatApi, ifcNamingCtx);
+        customizer = getCustomizer(natApi, ifcNamingCtx);
         defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        when(snatApi.snatInterfaceAddDelFeature(any())).thenReturn(future(new SnatInterfaceAddDelFeatureReply()));
-        when(snatApi.snatInterfaceAddDelOutputFeature(any()))
-                .thenReturn(future(new SnatInterfaceAddDelOutputFeatureReply()));
-        when(snatApi.nat64AddDelInterface(any())).thenReturn(future(new Nat64AddDelInterfaceReply()));
+        when(natApi.nat44InterfaceAddDelFeature(any())).thenReturn(future(new Nat44InterfaceAddDelFeatureReply()));
+        when(natApi.nat44InterfaceAddDelOutputFeature(any()))
+                .thenReturn(future(new Nat44InterfaceAddDelOutputFeatureReply()));
+        when(natApi.nat64AddDelInterface(any())).thenReturn(future(new Nat64AddDelInterfaceReply()));
     }
 
     @Test
@@ -71,8 +71,8 @@ abstract class AbstractNatCustomizerTest<D extends InterfaceNatVppFeatureAttribu
     public void testWritePostRouting() throws Exception {
         final D data = getPostRoutingConfig();
         customizer.writeCurrentAttributes(getIId(IFACE_NAME), data, writeContext);
-        verify(snatApi).snatInterfaceAddDelOutputFeature(expectedPostRoutingRequest(data, true));
-        verify(snatApi, never()).nat64AddDelInterface(any()); // VPP does not support it currently
+        verify(natApi).nat44InterfaceAddDelOutputFeature(expectedPostRoutingRequest(data, true));
+        verify(natApi, never()).nat64AddDelInterface(any()); // VPP does not support it currently
     }
 
     @Test(expected = UnsupportedOperationException.class)
@@ -98,26 +98,26 @@ abstract class AbstractNatCustomizerTest<D extends InterfaceNatVppFeatureAttribu
     public void testDeletePostRouting() throws Exception {
         final D data = getPostRoutingConfig();
         customizer.deleteCurrentAttributes(getIId(IFACE_NAME), data, writeContext);
-        verify(snatApi).snatInterfaceAddDelOutputFeature(expectedPostRoutingRequest(data, false));
-        verify(snatApi, never()).nat64AddDelInterface(any()); // VPP does not support it currently
+        verify(natApi).nat44InterfaceAddDelOutputFeature(expectedPostRoutingRequest(data, false));
+        verify(natApi, never()).nat64AddDelInterface(any()); // VPP does not support it currently
     }
 
     private void verifyPreRouting(final D data, final boolean isAdd) {
         if (data.isNat44Support()) {
-            verify(snatApi).snatInterfaceAddDelFeature(expectedPreRoutingNat44Request(data, isAdd));
+            verify(natApi).nat44InterfaceAddDelFeature(expectedPreRoutingNat44Request(data, isAdd));
         } else {
-            verify(snatApi, never()).snatInterfaceAddDelFeature(any());
+            verify(natApi, never()).nat44InterfaceAddDelFeature(any());
         }
         if (data.isNat64Support() != null && data.isNat64Support()) {
-            verify(snatApi).nat64AddDelInterface(expectedPreRoutingNat64Request(data, isAdd));
+            verify(natApi).nat64AddDelInterface(expectedPreRoutingNat64Request(data, isAdd));
         } else {
-            verify(snatApi, never()).nat64AddDelInterface(any());
+            verify(natApi, never()).nat64AddDelInterface(any());
         }
 
     }
 
-    private SnatInterfaceAddDelFeature expectedPreRoutingNat44Request(final D data, boolean isAdd) {
-        SnatInterfaceAddDelFeature request = new SnatInterfaceAddDelFeature();
+    private Nat44InterfaceAddDelFeature expectedPreRoutingNat44Request(final D data, boolean isAdd) {
+        Nat44InterfaceAddDelFeature request = new Nat44InterfaceAddDelFeature();
         request.isInside = booleanToByte(data instanceof Inbound);
         request.swIfIndex = IFACE_ID;
         request.isAdd = booleanToByte(isAdd);
@@ -132,8 +132,8 @@ abstract class AbstractNatCustomizerTest<D extends InterfaceNatVppFeatureAttribu
         return request;
     }
 
-    private SnatInterfaceAddDelOutputFeature expectedPostRoutingRequest(final D data, boolean isAdd) {
-        SnatInterfaceAddDelOutputFeature request = new SnatInterfaceAddDelOutputFeature();
+    private Nat44InterfaceAddDelOutputFeature expectedPostRoutingRequest(final D data, boolean isAdd) {
+        Nat44InterfaceAddDelOutputFeature request = new Nat44InterfaceAddDelOutputFeature();
         request.isInside = booleanToByte(data instanceof Inbound);
         request.swIfIndex = IFACE_ID;
         request.isAdd = booleanToByte(isAdd);
@@ -146,5 +146,5 @@ abstract class AbstractNatCustomizerTest<D extends InterfaceNatVppFeatureAttribu
 
     protected abstract InstanceIdentifier<D> getIId(final String ifaceName);
 
-    protected abstract T getCustomizer(final FutureJVppSnatFacade snatApi, final NamingContext ifcNamingCtx);
+    protected abstract T getCustomizer(final FutureJVppNatFacade natApi, final NamingContext ifcNamingCtx);
 }
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java
index 74dd59938..b05c83e1a 100644
--- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java
@@ -17,7 +17,7 @@
 package io.fd.hc2vpp.nat.write.ifc;
 
 import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
@@ -48,8 +48,8 @@ public class InterfaceInboundNatCustomizerTest
     }
 
     @Override
-    protected InterfaceInboundNatCustomizer getCustomizer(final FutureJVppSnatFacade snatApi,
+    protected InterfaceInboundNatCustomizer getCustomizer(final FutureJVppNatFacade natApi,
                                                           final NamingContext ifcNamingCtx) {
-        return new InterfaceInboundNatCustomizer(snatApi, ifcNamingCtx);
+        return new InterfaceInboundNatCustomizer(natApi, ifcNamingCtx);
     }
 }
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java
index ddd589472..f15182659 100644
--- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java
@@ -17,7 +17,7 @@
 package io.fd.hc2vpp.nat.write.ifc;
 
 import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
@@ -48,8 +48,8 @@ public class InterfaceOutboundNatCustomizerTest
     }
 
     @Override
-    protected InterfaceOutboundNatCustomizer getCustomizer(final FutureJVppSnatFacade snatApi,
+    protected InterfaceOutboundNatCustomizer getCustomizer(final FutureJVppNatFacade natApi,
                                                            final NamingContext ifcNamingCtx) {
-        return new InterfaceOutboundNatCustomizer(snatApi, ifcNamingCtx);
+        return new InterfaceOutboundNatCustomizer(natApi, ifcNamingCtx);
     }
 }
\ No newline at end of file