ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NAT: Remove old SNAT API (VPP-1070)

Browse Source 
Change-Id: I3d936d456ee27b2e0857843295efb60a9f2d0be7
Signed-off-by: Matus Fabian <matfabia@cisco.com>
This commit is contained in:
Matus Fabian
2017-11-28 23:27:36 -08:00
committed by Damjan Marion
parent de3ff7a7f4
commit c6fb36fc2e
4 changed files with 229 additions and 2122 deletions
src
plugins/nat
nat.apinat_api.cnat_test.c
vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test
FutureApiTest.java

623
src/plugins/nat/nat.api

File diff suppressed because it is too large Load Diff

1275
src/plugins/nat/nat_api.c

File diff suppressed because it is too large Load Diff

433
src/plugins/nat/nat_test.c

File diff suppressed because it is too large Load Diff

20
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<SnatAddressDetailsReplyDump> replyFuture = jvpp.snatAddressDump(request).toCompletableFuture();
final SnatAddressDetailsReplyDump reply = replyFuture.get();
final Future<Nat44AddressDetailsReplyDump> 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));
}
}
}