summaryrefslogtreecommitdiffstats
path: root/vpp-integration
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-08-23 14:18:51 +0200
committerJan Srnicek <jsrnicek@cisco.com>2017-08-24 15:08:00 +0200
commit36ed0b50449248a3276ebf149dd5c8105e0ba3fc (patch)
treea38e80b0f7743928e694db0d0747d65179878a6d /vpp-integration
parent31996a6707d75a5f87f7d8c89f563af74e32fe70 (diff)
HC2VPP-222: adapt hc2vpp to snat->nat plugin rename in vpp
Change-Id: If4c7f2f1fc52f1ee64ed95900a362063207def27 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'vpp-integration')
-rw-r--r--vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy4
-rw-r--r--vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java10
2 files changed, 7 insertions, 7 deletions
diff --git a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
index de15d7b9b..65ee2ed1e 100644
--- a/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
+++ b/vpp-integration/api-docs/scripts/src/main/groovy/io/fd/hc2vpp/docs/scripts/ApiDocsIndexGenerator.groovy
@@ -27,7 +27,7 @@ import io.fd.vpp.jvpp.ioamexport.future.FutureJVppIoamexport
import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot
import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace
import io.fd.vpp.jvpp.nsh.future.FutureJVppNsh
-import io.fd.vpp.jvpp.snat.future.FutureJVppSnat
+import io.fd.vpp.jvpp.nat.future.FutureJVppNat
import java.nio.charset.StandardCharsets
import java.nio.file.Files
@@ -45,7 +45,7 @@ class ApiDocsIndexGenerator {
private static def NL = System.lineSeparator()
// TODO - check if list of plugin classes can be generated based on list of modules enabled for doc generation
private static
- def PLUGIN_CLASSES = [FutureJVppCore.class, FutureJVppAcl.class, FutureJVppSnat.class, FutureJVppNsh.class,
+ def PLUGIN_CLASSES = [FutureJVppCore.class, FutureJVppAcl.class, FutureJVppNat.class, FutureJVppNsh.class,
FutureJVppIoamexport.class, FutureJVppIoampot.class, FutureJVppIoamtrace.class]
private static def TABLE_PART_MARK = "|"
diff --git a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java
index d74f7f2b9..4f0a0fc87 100644
--- a/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java
+++ b/vpp-integration/api-docs/scripts/src/main/java/io/fd/hc2vpp/docs/core/mock/binding/MockNatModule.java
@@ -22,7 +22,7 @@ import com.google.inject.Provider;
import io.fd.hc2vpp.nat.NatModule;
import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import io.fd.vpp.jvpp.nat.future.FutureJVppNatFacade;
import java.io.IOException;
/**
@@ -31,15 +31,15 @@ import java.io.IOException;
public class MockNatModule extends NatModule {
public MockNatModule() {
- super(MockJVppSnatProvider.class);
+ super(MockJVppNatProvider.class);
}
- private static class MockJVppSnatProvider implements Provider<FutureJVppSnatFacade> {
+ private static class MockJVppNatProvider implements Provider<FutureJVppNatFacade> {
@Override
- public FutureJVppSnatFacade get() {
+ public FutureJVppNatFacade get() {
try {
- return new FutureJVppSnatFacade(noOpProxy(JVppRegistry.class), noOpProxy(JVpp.class));
+ return new FutureJVppNatFacade(noOpProxy(JVppRegistry.class), noOpProxy(JVpp.class));
} catch (IOException e) {
throw new IllegalStateException(e);
}