From c6fb36fc2eb43c6158b390918d295f2c8eba737b Mon Sep 17 00:00:00 2001 From: Matus Fabian Date: Tue, 28 Nov 2017 23:27:36 -0800 Subject: NAT: Remove old SNAT API (VPP-1070) Change-Id: I3d936d456ee27b2e0857843295efb60a9f2d0be7 Signed-off-by: Matus Fabian --- .../io/fd/vpp/jvpp/nat/test/FutureApiTest.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/vpp-api/java') diff --git a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java b/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java index 8643dcf4661..26d6b98e443 100644 --- a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java +++ b/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java @@ -20,8 +20,8 @@ package io.fd.vpp.jvpp.nat.test; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.JVppRegistryImpl; import io.fd.vpp.jvpp.nat.JVppNatImpl; -import io.fd.vpp.jvpp.nat.dto.SnatAddressDetailsReplyDump; -import io.fd.vpp.jvpp.nat.dto.SnatAddressDump; +import io.fd.vpp.jvpp.nat.dto.Nat44AddressDetailsReplyDump; +import io.fd.vpp.jvpp.nat.dto.Nat44AddressDump; import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade; import java.util.concurrent.Future; @@ -36,7 +36,7 @@ public class FutureApiTest { } private static void testCallbackApi(String[] args) throws Exception { - LOG.info("Testing Java callback API for snat plugin"); + LOG.info("Testing Java callback API for nat plugin"); try (final JVppRegistry registry = new JVppRegistryImpl("FutureApiTest", args[0]); final FutureJVppNatFacade jvpp = new FutureJVppNatFacade(registry, new JVppNatImpl())) { LOG.info("Successfully connected to VPP"); @@ -48,19 +48,19 @@ public class FutureApiTest { } private static void testAclDump(FutureJVppNatFacade jvpp) throws Exception { - LOG.info("Sending SnatAddressDump request..."); - final SnatAddressDump request = new SnatAddressDump(); + LOG.info("Sending Nat44AddressDump request..."); + final Nat44AddressDump request = new Nat44AddressDump(); - final Future replyFuture = jvpp.snatAddressDump(request).toCompletableFuture(); - final SnatAddressDetailsReplyDump reply = replyFuture.get(); + final Future replyFuture = jvpp.nat44AddressDump(request).toCompletableFuture(); + final Nat44AddressDetailsReplyDump reply = replyFuture.get(); - if (reply == null || reply.snatAddressDetails == null) { + if (reply == null || reply.nat44AddressDetails == null) { throw new IllegalStateException("Received null response for empty dump: " + reply); } else { LOG.info( String.format( - "Received snat address dump reply with list of snat address: %s", - reply.snatAddressDetails)); + "Received nat address dump reply with list of nat address: %s", + reply.nat44AddressDetails)); } } } -- cgit 1.2.3-korg