[CENNSO-148] Update to VPP 22.10 (#358)

travelping · Nov 6, 2023 · 9396fac · 9396fac
1 parent 3555cc1
commit 9396fac
Show file tree

Hide file tree

Showing 25 changed files with 393 additions and 747 deletions.
diff --git a/hack/e2e.sh b/hack/e2e.sh
@@ -20,7 +20,6 @@ cd "$(dirname "${BASH_SOURCE}")/.."
 : "${E2E_DISPATCH_TRACE:=}"
 : "${E2E_PAUSE_ON_ERROR:=}"
 : "${E2E_MULTICORE:=}"
-: "${E2E_XDP:=}"
 : "${E2E_KEEP_ALL_ARTIFACTS:=}"
 : "${E2E_POLLING_MODE:=}"
 : "${E2E_VPP_NOT_INSTALLED:=}"
@@ -52,10 +51,6 @@ export UPG_TEST_QUICK="${E2E_QUICK}"
 export VPP_TRACE="${E2E_TRACE}"
 export VPP_DISPATCH_TRACE="${E2E_DISPATCH_TRACE}"
 export VPP_MULTICORE="${E2E_MULTICORE}"
-if [[ ${E2E_XDP} ]]; then
-  ulimit -l 10000000
-  export VPP_XDP=1
-fi
 
 if [[ ${E2E_VPP_NOT_INSTALLED} ]]; then
   case ${BUILD_TYPE} in

diff --git a/hack/run-integration-tests-internal.sh b/hack/run-integration-tests-internal.sh
@@ -6,12 +6,14 @@ set -o errtrace
 
 cd "$(dirname "${BASH_SOURCE}")/.."
 
-make -C /vpp-src/test VPP_BIN=/usr/bin/vpp \
+make -C /vpp-src/test \
      VPP_PLUGIN_PATH=/usr/lib/x86_64-linux-gnu/vpp_plugins \
      VPP_INSTALL_PATH=/usr retest \
      WS_ROOT=/vpp-src \
      BR=/vpp-src/build-root \
      TEST_DIR=/tmp \
      TEST="${TEST:-test_upf}" V=2 \
      EXTERN_TESTS=/src/upf/test \
-     RND_SEED=$(python3 -c 'import time; print(time.time())')
+     RND_SEED=$(python3 -c 'import time; print(time.time())') \
+     VPP_WS_DIR=/usr \
+     TEST_PLUGIN_PATH_ARGS="--vpp /usr/bin/vpp --vpp-plugin-dir /usr/lib/x86_64-linux-gnu/vpp_plugins --vpp-install-dir /usr"
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
@@ -178,12 +178,14 @@ func (f *Framework) BeforeEach() {
 
 		f.GTPUs = []*GTPU{accessGTPU, coreGTPU}
 	}
-	ExpectNoError(f.VPP.StartCapture())
 	ExpectNoError(f.VPP.StartVPP())
 	_, err = f.VPP.Ctl("show version")
 	ExpectNoError(err)
 	ExpectNoError(f.VPP.Configure())
+	// create routes after the interfaces are configured
+	ExpectNoError(f.VPP.SetupRoutes())
 	ExpectNoError(f.VPP.VerifyVPPAlive())
+	ExpectNoError(f.VPP.StartCapture())
 
 	for _, nsCfg := range f.VPPCfg.Namespaces {
 		if nsCfg.VPPIP == nil {