octeon: add clear counters for port and queues

Type: feature

Change-Id: Ie36be41694e7bd5341b4239dcba2ae6834c4a73f
Signed-off-by: Monendra Singh Kushwaha <kmonendra@marvell.com>
(cherry picked from commit 68b8125dbfc2c5ba7703d8af1c02585fd1263b37)

.gitignore

@@ -122,7 +122,8 @@ compile_commands.json
 /extras/hs-test/vpp-data
 /extras/hs-test/hs-test
 /extras/hs-test/http_server
-/extras/hs-test/.build.vpp
+/extras/hs-test/.build.ok
+/extras/hs-test/summary/
 
 # ./configure
 /CMakeFiles

.gitreview

@@ -2,4 +2,4 @@
 host=gerrit.fd.io
 port=29418
 project=vpp
-defaultbranch=stable/2402
+defaultbranch=stable/2406

MAINTAINERS

@@ -192,7 +192,7 @@ I:	sr
 M:	Pablo Camarillo <pcamaril@cisco.com>
 M:	Ahmed Abdelsalam <ahabdels@cisco.com>
 F:	src/vnet/srv6/
-F:	src/vnet/srmpls/
+F:	src/plugin/srmpls/
 F:	src/examples/srv6-sample-localsid/
 
 VNET IPSec
@@ -892,3 +892,8 @@ M:	vpp-dev Mailing List <vpp-dev@fd.io>
 C:	Missing Maintainer
 F:	*
 F:	*/
+
+Netmap
+I:	netmap
+M:	Tom Jones <thj@freebsd.org>
+F:	src/plugins/netmap/

Makefile

@@ -23,6 +23,10 @@ MACHINE=$(shell uname -m)
 SUDO?=sudo -E
 DPDK_CONFIG?=no-pci
 
+ifeq ($(strip $(SHELL)),)
+$(error "bash not found, VPP requires bash to build")
+endif
+
 ,:=,
 define disable_plugins
 $(if $(1), \
@@ -57,7 +61,7 @@ endif
 
 ifeq ($(filter ubuntu debian linuxmint,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(filter rhel centos fedora opensuse-leap rocky,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora opensuse-leap rocky almalinux,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
@@ -82,6 +86,7 @@ DEB_DEPENDS += nasm
 DEB_DEPENDS += iperf ethtool  # for 'make test TEST=vm_vpp_interfaces'
 DEB_DEPENDS += libpcap-dev
 DEB_DEPENDS += tshark
+DEB_DEPENDS += jq # for extracting test summary from .json report (hs-test)
 
 LIBFFI=libffi6 # works on all but 20.04 and debian-testing
 
@@ -150,6 +155,15 @@ else ifeq ($(OS_ID),rocky)
 	RPM_DEPENDS += python3-virtualenv python3-jsonschema
 	RPM_DEPENDS += infiniband-diags llvm clang cmake
 	RPM_DEPENDS_GROUPS = 'Development Tools'
+else ifeq ($(OS_ID),almalinux)
+	RPM_DEPENDS += yum-utils
+	RPM_DEPENDS += subunit subunit-devel
+	RPM_DEPENDS += openssl-devel
+	RPM_DEPENDS += python3-devel  # needed for python3 -m pip install psutil
+	RPM_DEPENDS += python3-ply  # for vppapigen
+	RPM_DEPENDS += python3-virtualenv python3-jsonschema
+	RPM_DEPENDS += infiniband-diags llvm clang cmake
+	RPM_DEPENDS_GROUPS = 'Development Tools'
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
 	RPM_DEPENDS += yum-utils
 	RPM_DEPENDS += compat-openssl10 openssl-devel

build-root/Makefile

@@ -650,11 +650,18 @@ configure_check_timestamp =						\
 # /proc/cpuinfo does not exist on platforms without a /proc and on some
 # platforms, notably inside containers, it has no content. In those cases
 # we assume there's 1 processor; we use 2*ncpu for the -j option.
+#
+# On FreeBSD we can call nproc to get the number of processors.
+#
 # NB: GNU Make 4.2 will let us use '$(file </proc/cpuinfo)' to both test
 # for file presence and content; for now this will have to do.
 ifndef MAKE_PARALLEL_JOBS
+ifeq ($(shell uname), FreeBSD)
+MAKE_PARALLEL_JOBS = $(shell nproc)
+else
 MAKE_PARALLEL_JOBS = $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
 	$(shell grep -c ^processor /proc/cpuinfo), 2)
+endif	# FreeBSD
 endif
 MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,-j $(MAKE_PARALLEL_JOBS))
 

build/external/Makefile

@@ -21,8 +21,12 @@ INSTALL_DIR      ?= $(CURDIR)/_install
 PKG_VERSION ?= $(shell git describe --abbrev=0 --match 'v[0-9]*' | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2)
 PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
 SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct .)
+ifeq ($shell(uname), FreeBSD)
+JOBS := $(shell nproc)
+else
 JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\
 	$(shell grep -c ^processor /proc/cpuinfo), 2)
+endif	# FreeBSD
 
 B := $(BUILD_DIR)
 I := $(INSTALL_DIR)
@@ -39,20 +43,30 @@ AARCH64=$(filter aarch64,$(shell uname -m))
 include packages.mk
 include packages/ipsec-mb.mk
 include packages/quicly.mk
+ifneq ($(shell uname), FreeBSD)
 include packages/rdma-core.mk
 include packages/dpdk.mk
 include packages/xdp-tools.mk
 include packages/octeon-roc.mk
+endif	# FreeBSD
 
 .PHONY: clean
 clean:
 	@rm -rf $(B) $(I)
 
 .PHONY: install
+ifeq ($(shell uname), FreeBSD)
+install: $(if $(ARCH_X86_64), ipsec-mb-install) quicly-install
+else
 install: $(if $(ARCH_X86_64), ipsec-mb-install) dpdk-install rdma-core-install quicly-install xdp-tools-install $(if $(AARCH64), octeon-roc-install)
+endif	# FreeBSD
 
 .PHONY: config
+ifeq ($(shell uname), FreeBSD)
+config: $(if $(ARCH_X86_64), ipsec-mb-config) quicly-build
+else
 config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build
+endif	# FreeBSD
 
 ##############################################################################
 # .deb packaging

build/external/mlx_rdma_dpdk_matrix.txt

@@ -1,2 +1,2 @@
-rdma=46.1 dpdk=23.07
 rdma=49.0 dpdk=23.11
+rdma=51.0 dpdk=24.03

build/external/packages/dpdk.mk

@@ -19,9 +19,10 @@ DPDK_FAILSAFE_PMD            ?= n
 DPDK_MACHINE                 ?= default
 DPDK_MLX_IBV_LINK            ?= static
 
-dpdk_version                 ?= 23.11
+dpdk_version                 ?= 24.03
 dpdk_base_url                ?= http://fast.dpdk.org/rel
 dpdk_tarball                 := dpdk-$(dpdk_version).tar.xz
+dpdk_tarball_md5sum_24.03    := a98da848d6ba09808ef00f9a26aaa49a
 dpdk_tarball_md5sum_23.11    := 896c09f5b45b452bd77287994650b916
 dpdk_tarball_md5sum_23.07    := 2b6d57f077585cb15b885482362fd47f
 dpdk_tarball_md5sum_23.03    := 3cf8ebbcd412d5726db230f2eeb90cc9
@@ -32,8 +33,11 @@ dpdk_tarball_md5sum_21.11    := 58660bbbe9e95abce86e47692b196555
 dpdk_tarball_md5sum          := $(dpdk_tarball_md5sum_$(dpdk_version))
 dpdk_url                     := $(dpdk_base_url)/$(dpdk_tarball)
 dpdk_tarball_strip_dirs      := 1
+ifeq ($(shell uname), FreeBSD)
+dpdk_depends		     := $(if $(ARCH_X86_64), ipsec-mb)
+else
 dpdk_depends		     := rdma-core $(if $(ARCH_X86_64), ipsec-mb)
-
+endif
 DPDK_MLX_DEFAULT             := $(shell if grep -q "rdma=$(rdma-core_version) dpdk=$(dpdk_version)" mlx_rdma_dpdk_matrix.txt; then echo 'y'; else echo 'n'; fi)
 DPDK_MLX4_PMD                ?= $(DPDK_MLX_DEFAULT)
 DPDK_MLX5_PMD                ?= $(DPDK_MLX_DEFAULT)
@@ -133,14 +137,19 @@ endif
 DPDK_DRIVERS_DISABLED := $(shell echo $(DPDK_DRIVERS_DISABLED) | tr -d '\\\t ')
 DPDK_LIBS_DISABLED := $(shell echo $(DPDK_LIBS_DISABLED) | tr -d '\\\t ')
 
+SED=sed
+ifeq ($shell(uname), FreeBSD)
+SED=gsed
+endif
+
 HASH := \#
 # post-meson-setup snippet to alter rte_build_config.h
 define dpdk_config
 if grep -q RTE_$(1) $(dpdk_src_dir)/config/rte_config.h ; then	\
-sed -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \
+$(SED) -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \
 	$(dpdk_src_dir)/config/rte_config.h; \
 elif grep -q RTE_$(1) $(dpdk_build_dir)/rte_build_config.h ; then \
-sed -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \
+$(SED) -i -e 's/$(HASH)define RTE_$(1).*/$(HASH)define RTE_$(1) $(DPDK_$(1))/' \
 	$(dpdk_build_dir)/rte_build_config.h; \
 else \
 echo '$(HASH)define RTE_$(1) $(DPDK_$(1))' \
@@ -156,7 +165,7 @@ if [[ "$(DPDK_$(1))" == "y" ]]; then \
           >> $(dpdk_build_dir)/rte_build_config.h ; \
     fi; \
 elif [[ "$(DPDK_$(1))" == "n" ]]; then \
-    sed -i '/$(HASH)define RTE_$(1) .*/d' $(dpdk_build_dir)/rte_build_config.h \
+    $(SED) -i '/$(HASH)define RTE_$(1) .*/d' $(dpdk_build_dir)/rte_build_config.h \
       $(dpdk_src_dir)/config/rte_config.h ; \
 fi
 endef
@@ -172,6 +181,7 @@ DPDK_MESON_ARGS = \
 	-Db_pie=true \
 	-Dmachine=$(DPDK_MACHINE) \
 	--buildtype=$(DPDK_BUILD_TYPE) \
+	-Denable_kmods=false \
 	${DPDK_MLX_CONFIG_FLAG}
 
 PIP_DOWNLOAD_DIR = $(CURDIR)/downloads/

build/external/packages/octeon-roc.mk

@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 # https://spdx.org/licenses/Apache-2.0.html
 
-octeon-roc_version             := 0.2
-octeon-roc_tarball             := octeon-roc-v$(octeon-roc_version).tar.gz
-octeon-roc_tarball_md5sum      := a72bb3b27fd3bbaf58aadd99514620e1
+octeon-roc_version             := 0.5
+octeon-roc_tarball             := v$(octeon-roc_version).tar.gz
+octeon-roc_tarball_md5sum      := 76bc56c84935da944bbf340fe5283ef0
 
 octeon-roc_tarball_strip_dirs  := 1
-octeon-roc_url                 := https://github.com/MarvellEmbeddedProcessors/marvell-vpp/archive/refs/tags/$(octeon-roc_tarball)
+octeon-roc_url                 := https://github.com/MarvellEmbeddedProcessors/marvell-octeon-roc/archive/refs/tags/$(octeon-roc_tarball)
 
 define  octeon-roc_config_cmds
 	@true

build/external/packages/rdma-core.mk

@@ -23,10 +23,10 @@ RDMA_CORE_DEBUG?=n
 #       	2. Verify that the file build/external/dpdk_mlx_default.sh was generated
 #              and contains 'DPDK_MLX_DEFAULT=y'
 #
-rdma-core_version             := 49.0
+rdma-core_version             := 51.0
 rdma-core_tarball             := rdma-core-$(rdma-core_version).tar.gz
-rdma-core_tarball_md5sum_46.1 := 3ac7c00717ea2720df5d90f8a43ae33a
 rdma-core_tarball_md5sum_49.0 := 9fe3909f19c7e0276c9e546411bbb49c
+rdma-core_tarball_md5sum_51.0 := ed95d79f782ea00bd7233d453abd60b3
 rdma-core_tarball_md5sum      := $(rdma-core_tarball_md5sum_$(rdma-core_version))
 rdma-core_tarball_strip_dirs  := 1
 rdma-core_url                 := http://github.com/linux-rdma/rdma-core/releases/download/v$(rdma-core_version)/$(rdma-core_tarball)

configure

@@ -33,6 +33,7 @@ OPTIONS:
   --wipe, -w              Wipe whole repo (except startup.* files)
   --sanitize, -s          Enable sanitizer (mem)
   --platform, -p          Specify target platform
+  --option, -o            Enable specific VPP options (fib8, fib16)
 __EOF__
 }
 
@@ -104,6 +105,19 @@ while (( "$#" )); do
 	  ;;
       esac
       ;;
+    -o|--option)
+      shift 1
+      case "$1" in
+	fib8)
+	  shift 1
+	  args+=("-DVPP_IP_FIB_MTRIE_16=OFF")
+	  ;;
+	fib16)
+	  shift 1
+	  args+=("-DVPP_IP_FIB_MTRIE_16=ON")
+	  ;;
+      esac
+      ;;
     -*|--*=) # unsupported flags
       echo "Error: Unsupported flag $1" >&2
       exit 1

docs/aboutvpp/releasenotes/index.rst

@@ -11,5 +11,4 @@ Release notes
     v23.06
     v23.02
     v22.10.1
-    v22.10
     past

docs/aboutvpp/releasenotes/past.rst

@@ -6,6 +6,7 @@ Past releases
 .. toctree::
     :maxdepth: 1
 
+    v22.10
     v22.06.1
     v22.06
     v22.02

docs/developer/corefeatures/sr/sr_mpls.rst

@@ -1 +1 @@
-../../../../src/vnet/srmpls/sr_doc.rst
+../../../../src/plugins/srmpls/sr_doc.rst

docs/gettingstarted/progressivevpp/index.rst

@@ -6,7 +6,7 @@
 Progressive VPP Tutorial
 ########################
 
-Learn to run FD.io VPP on a single Ubuntu 16.04 VM using Vagrant with this walkthrough
+Learn to run FD.io VPP on a single Ubuntu VM using Vagrant with this walkthrough
 covering basic FD.io VPP scenarios. Useful FD.io VPP commands will be used, and
 will discuss basic operations, and the state of a running FD.io VPP on a system.
 

docs/gettingstarted/progressivevpp/settingupenvironment.rst

@@ -3,15 +3,15 @@
 Setting up your environment
 ===========================
 
-All of these exercises are designed to be performed on an Ubuntu 16.04 (Xenial) box.
+All of these exercises are designed to be performed on an Ubuntu 22.04 (Jammy) box.
 
-* If you have an Ubuntu 18.04 box on which you have sudo or root access, you can feel free to use that.
-* If you do not, a Vagrantfile is provided to setup a basic Ubuntu 18.04 box for you in the the steps below.
+* If you have an Ubuntu 22.04 box on which you have sudo or root access, you can feel free to use that.
+* If you do not, a Vagrantfile is provided to setup a basic Ubuntu 22.04 box for you in the the steps below.
 
-Install Virtual Box and Vagrant
+Install Libvirt and Vagrant
 -------------------------------
 
-You will need to install Virtual Box and Vagrant.
+You will need to install Libvirt and Vagrant.
 
 Create a Vagrant Directory
 ---------------------------
@@ -32,21 +32,16 @@ Create a file called **Vagrantfile** with the following contents:
 
     Vagrant.configure(2) do |config|
 
-      config.vm.box = "bento/ubuntu-18.04"
-      config.vm.box_check_update = false
+      config.vm.box = "generic/ubuntu2204"
 
       vmcpu=(ENV['VPP_VAGRANT_VMCPU'] || 2)
       vmram=(ENV['VPP_VAGRANT_VMRAM'] || 4096)
 
       config.ssh.forward_agent = true
 
-      config.vm.provider "virtualbox" do |vb|
-          vb.customize ["modifyvm", :id, "--ioapic", "on"]
+      config.vm.provider "libvirt" do |vb|
           vb.memory = "#{vmram}"
           vb.cpus = "#{vmcpu}"
-          #support for the SSE4.x instruction is required in some versions of VB.
-          vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"]
-          vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"]
       end
     end
 
@@ -97,7 +92,7 @@ We write this file with the following contents:
 .. code-block:: console
 
    $ sudo bash
-   # echo "deb [trusted=yes] https://packagecloud.io/fdio/release/ubuntu bionic main" > /etc/apt/sources.list.d/99fd.io.list
+   # echo "deb https://packagecloud.io/fdio/release/ubuntu jammy main" > /etc/apt/sources.list.d/99fd.io.list
    #
 
 Get the key.

docs/spelling_wordlist.txt

@@ -1047,6 +1047,7 @@ srcIP
 srcPortDefinition
 srcUP
 srh
+srmpls
 Srmpls
 srtp
 SRTP

extras/deprecated/plugins/gbp/test_gbp.py

@@ -391,9 +391,9 @@ class VppGbpEndpointGroup(VppObject):
 
     def encode(self) -> dict:
         return {
-            "uplink_sw_if_index": self.uplink.sw_if_index
-            if self.uplink
-            else INDEX_INVALID,
+            "uplink_sw_if_index": (
+                self.uplink.sw_if_index if self.uplink else INDEX_INVALID
+            ),
             "bd_id": self.bd.bd.bd_id,
             "rd_id": self.rd.rd_id,
             "vnid": self.vnid,
@@ -460,12 +460,12 @@ class VppGbpBridgeDomain(VppObject):
         return {
             "flags": self.flags,
             "bvi_sw_if_index": self.bvi.sw_if_index,
-            "uu_fwd_sw_if_index": self.uu_fwd.sw_if_index
-            if self.uu_fwd
-            else INDEX_INVALID,
-            "bm_flood_sw_if_index": self.bm_flood.sw_if_index
-            if self.bm_flood
-            else INDEX_INVALID,
+            "uu_fwd_sw_if_index": (
+                self.uu_fwd.sw_if_index if self.uu_fwd else INDEX_INVALID
+            ),
+            "bm_flood_sw_if_index": (
+                self.bm_flood.sw_if_index if self.bm_flood else INDEX_INVALID
+            ),
             "bd_id": self.bd.bd_id,
             "rd_id": self.rd.rd_id,
         }
@@ -510,12 +510,12 @@ class VppGbpRouteDomain(VppObject):
             "scope": self.scope,
             "ip4_table_id": self.t4.table_id,
             "ip6_table_id": self.t6.table_id,
-            "ip4_uu_sw_if_index": self.ip4_uu.sw_if_index
-            if self.ip4_uu
-            else INDEX_INVALID,
-            "ip6_uu_sw_if_index": self.ip6_uu.sw_if_index
-            if self.ip6_uu
-            else INDEX_INVALID,
+            "ip4_uu_sw_if_index": (
+                self.ip4_uu.sw_if_index if self.ip4_uu else INDEX_INVALID
+            ),
+            "ip6_uu_sw_if_index": (
+                self.ip6_uu.sw_if_index if self.ip6_uu else INDEX_INVALID
+            ),
         }
 
     def add_vpp_config(self):

extras/deprecated/vnet/lawful-intercept/lawful_intercept.c

@@ -92,14 +92,12 @@ set_li_command_fn (vlib_main_t * vm,
   return 0;
 }
 
-/* *INDENT-OFF* */
 VLIB_CLI_COMMAND (set_li_command, static) = {
     .path = "set li",
     .short_help =
     "set li src <ip4-address> collector <ip4-address> udp-port <nnnn>",
     .function = set_li_command_fn,
 };
-/* *INDENT-ON* */
 
 static clib_error_t *
 li_init (vlib_main_t * vm)

extras/deprecated/vnet/lawful-intercept/lawful_intercept.h

@@ -36,12 +36,10 @@ typedef struct
 
 extern li_main_t li_main;
 
-/* *INDENT-OFF* */
 typedef CLIB_PACKED(struct {
   ip4_header_t ip4;
   udp_header_t udp;
 }) ip4_udp_header_t;
-/* *INDENT-ON* */
 
 extern vlib_node_registration_t li_hit_node;
 

extras/deprecated/vnet/lawful-intercept/node.c

@@ -260,7 +260,6 @@ VLIB_NODE_FN (li_hit_node) (vlib_main_t * vm,
   return frame->n_vectors;
 }
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (li_hit_node) = {
   .name = "li-hit",
   .vector_size = sizeof (u32),
@@ -277,7 +276,6 @@ VLIB_REGISTER_NODE (li_hit_node) = {
         [LI_HIT_NEXT_ETHERNET] = "ethernet-input-not-l2",
   },
 };
-/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON

extras/deprecated/vnet/vxlan-gbp/vpp_vxlan_gbp_tunnel.py

@@ -56,9 +56,9 @@ class VppVxlanGbpTunnel(VppInterface):
             "dst": self.dst,
             "mode": self.mode,
             "vni": self.vni,
-            "mcast_sw_if_index": self.mcast_itf.sw_if_index
-            if self.mcast_itf
-            else INDEX_INVALID,
+            "mcast_sw_if_index": (
+                self.mcast_itf.sw_if_index if self.mcast_itf else INDEX_INVALID
+            ),
             "encap_table_id": self.encap_table_id,
             "instance": self.instance,
         }

extras/hs-test/Makefile

@@ -1,3 +1,4 @@
+export HS_ROOT=$(CURDIR)
 
 ifeq ($(VERBOSE),)
 VERBOSE=false
@@ -23,6 +24,14 @@ ifeq ($(CPUS),)
 CPUS=1
 endif
 
+ifeq ($(PARALLEL),)
+PARALLEL=1
+endif
+
+ifeq ($(REPEAT),)
+REPEAT=0
+endif
+
 ifeq ($(VPPSRC),)
 VPPSRC=$(shell pwd)/../..
 endif
@@ -35,13 +44,14 @@ ifeq ($(ARCH),)
 ARCH=$(shell dpkg --print-architecture)
 endif
 
-list_tests = @(grep -r ') Test' *_test.go | cut -d '*' -f2 | cut -d '(' -f1 | \
-		tr -d ' ' | tr ')' '/' | sed 's/Suite//')
+list_tests = @go run github.com/onsi/ginkgo/v2/ginkgo --dry-run -v --no-color --seed=2 | head -n -1 | grep 'Test' | \
+		sed 's/^/* /; s/\(Suite\) /\1\//g'
 
 .PHONY: help
 help:
 	@echo "Make targets:"
 	@echo " test                 - run tests"
+	@echo " test-debug           - run tests (vpp debug image)"
 	@echo " build                - build test infra"
 	@echo " build-debug          - build test infra (vpp debug image)"
 	@echo " build-go             - just build golang files"
@@ -60,6 +70,8 @@ help:
 	@echo " TEST=[test-name]         - specific test to run"
 	@echo " CPUS=[n-cpus]            - number of cpus to run with vpp"
 	@echo " VPPSRC=[path-to-vpp-src] - path to vpp source files (for gdb)"
+	@echo " PARALLEL=[n-cpus]        - number of test processes to spawn to run in parallel"
+	@echo " REPEAT=[n]               - repeat tests up to N times or until a failure occurs"
 	@echo
 	@echo "List of all tests:"
 	$(call list_tests)
@@ -68,30 +80,53 @@ help:
 list-tests:
 	$(call list_tests)
 
+.PHONY: build-vpp-release
 build-vpp-release:
 	@make -C ../.. build-release
 
+.PHONY: build-vpp-debug
 build-vpp-debug:
 	@make -C ../.. build
 
-.PHONY: test
-test: .deps.ok .build.vpp
-	@bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
-		--unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \
-		--vppsrc=$(VPPSRC)
+.build.ok: build
+	@touch .build.ok
 
+.build_debug.ok: build-debug
+	@touch .build.ok
+
+.PHONY: test
+test: .deps.ok .build.ok
+	# '-' ignores the exit status, it is set in compress.sh
+	# necessary so gmake won't skip executing the bash script
+	-bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
+		--unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \
+		--vppsrc=$(VPPSRC) --parallel=$(PARALLEL) --repeat=$(REPEAT)
+	@bash ./script/compress.sh
+
+.PHONY: test-debug
+test-debug: .deps.ok .build_debug.ok
+	# '-' ignores the exit status, it is set in compress.sh
+	# necessary so gmake won't skip executing the bash script
+	-bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
+		--unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \
+		--vppsrc=$(VPPSRC) --parallel=$(PARALLEL) --repeat=$(REPEAT)
+	@bash ./script/compress.sh
+
+.PHONY: build-go
 build-go:
 	go build ./tools/http_server
 
+.PHONY: build
 build: .deps.ok build-vpp-release build-go
-	@rm -f .build.vpp
+	@rm -f .build.ok
 	bash ./script/build_hst.sh release
-	@touch .build.vpp
+	@touch .build.ok
 
+.PHONY: build-debug
 build-debug: .deps.ok build-vpp-debug build-go
-	@rm -f .build.vpp
+	@rm -f .build.ok
 	bash ./script/build_hst.sh debug
-	@touch .build.vpp
+	@touch .build.ok
 
 .deps.ok:
 	@sudo make install-deps
@@ -101,14 +136,13 @@ install-deps:
 	@rm -f .deps.ok
 	@apt-get update \
 		&& apt-get install -y apt-transport-https ca-certificates curl software-properties-common \
-		&& apt-get install -y golang apache2-utils wrk bridge-utils
+		apache2-utils wrk bridge-utils
 	@if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ] ; then \
 		curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg; \
 		echo "deb [arch=$(ARCH) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(UBUNTU_CODENAME) stable" \
 			| sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ; \
 		apt-get update; \
 	fi
-	@apt-get install -y docker-ce
 	@touch .deps.ok
 
 .PHONY: fixstyle

extras/hs-test/README.rst

@@ -9,7 +9,10 @@ End-to-end tests often want multiple VPP instances, network namespaces, differen
 and to execute external tools or commands. With such requirements the existing VPP test framework is not sufficient.
 For this, ``Go`` was chosen as a high level language, allowing rapid development, with ``Docker`` and ``ip`` being the tools for creating required topology.
 
-Go's package `testing`_ together with `go test`_ command form the base framework upon which the *hs-test* is built and run.
+`Ginkgo`_ forms the base framework upon which the *hs-test* is built and run.
+All tests are technically in a single suite because we are only using ``package main``. We simulate suite behavior by grouping tests by the topology they require.
+This allows us to run those mentioned groups in parallel, but not individual tests in parallel.
+
 
 Anatomy of a test case
 ----------------------
@@ -24,15 +27,16 @@ Anatomy of a test case
 **Action flow when running a test case**:
 
 #. It starts with running ``make test``. Optional arguments are VERBOSE, PERSIST (topology configuration isn't cleaned up after test run),
-   and TEST=<test-name> to run specific test.
-#. ``make list-tests`` (or ``make help``) shows all test names.
-#. ``go test`` compiles package ``main`` along with any files with names matching the file pattern ``*_test.go``
-   and then runs the resulting test binaries
-#. The go test framework runs each function matching :ref:`naming convention<test-convention>`. Each of these corresponds to a `test suite`_
-#. Testify toolkit's ``suite.Run(t *testing.T, suite TestingSuite)`` function runs the suite and does the following:
+   TEST=<test-name> to run a specific test and PARALLEL=[n-cpus].
+#. ``make list-tests`` (or ``make help``) shows all tests. The current `list of tests`_ is at the bottom of this document.
+#. ``Ginkgo`` looks for a spec suite in the current directory and then compiles it to a .test binary
+#. The Ginkgo test framework runs each function that was registered manually using ``registerMySuiteTest(s *MySuite)``. Each of these functions correspond to a suite
+#. Ginkgo's ``RunSpecs(t, "Suite description")`` function is the entry point and does the following:
 
+  #. Ginkgo compiles the spec, builds a spec tree
+  #. ``Describe`` container nodes in suite\_\*_test.go files are run (in series by default, or in parallel with the argument PARALLEL=[n-cpus])
   #. Suite is initialized. The topology is loaded and configured in this step
-  #. Test suite runs all the tests attached to it
+  #. Registered tests are run in generated ``It`` subject nodes
   #. Execute tear-down functions, which currently consists of stopping running containers
      and clean-up of test topology
 
@@ -43,23 +47,25 @@ This describes adding a new test case to an existing suite.
 For adding a new suite, please see `Modifying the framework`_ below.
 
 #. To write a new test case, create a file whose name ends with ``_test.go`` or pick one that already exists
-#. Declare method whose name starts with ``Test`` and specifies its receiver as a pointer to the suite's struct (defined in ``framework_test.go``)
+#. Declare method whose name ends with ``Test`` and specifies its parameter as a pointer to the suite's struct (defined in ``suite_*_test.go``)
 #. Implement test behaviour inside the test method. This typically includes the following:
 
-  #. Retrieve a running container in which to run some action. Method ``getContainerByName``
-     from ``HstSuite`` struct serves this purpose
-  #. Interact with VPP through the ``VppInstance`` struct embedded in container. It provides ``vppctl`` method to access debug CLI
-  #. Run arbitrary commands inside the containers with ``exec`` method
-  #. Run other external tool with one of the preexisting functions in the ``utils.go`` file.
-     For example, use ``wget`` with ``startWget`` function
-  #. Use ``exechelper`` or just plain ``exec`` packages to run whatever else
-  #. Verify results of your tests using ``assert`` methods provided by the test suite,
-     implemented by HstSuite struct
+   #. Retrieve a running container in which to run some action. Method ``getContainerByName``
+      from ``HstSuite`` struct serves this purpose
+   #. Interact with VPP through the ``VppInstance`` struct embedded in container. It provides ``vppctl`` method to access debug CLI
+   #. Run arbitrary commands inside the containers with ``exec`` method
+   #. Run other external tool with one of the preexisting functions in the ``utils.go`` file.
+      For example, use ``wget`` with ``startWget`` function
+   #. Use ``exechelper`` or just plain ``exec`` packages to run whatever else
+   #. Verify results of your tests using ``assert`` methods provided by the test suite, implemented by HstSuite struct or use ``Gomega`` assert functions.
+
+#. Create an ``init()`` function and register the test using ``register*SuiteTests(testCaseFunction)``
+
 
 **Example test case**
 
 Assumed are two docker containers, each with its own VPP instance running. One VPP then pings the other.
-This can be put in file ``extras/hs-test/my_test.go`` and run with command ``./test -run TestMySuite/TestMyCase``.
+This can be put in file ``extras/hs-test/my_test.go`` and run with command ``make test TEST=MyTest`` or ``ginkgo -v --trace --focus MyTest``.
 
 ::
 
@@ -69,7 +75,11 @@ This can be put in file ``extras/hs-test/my_test.go`` and run with command ``./t
                 "fmt"
         )
 
-        func (s *MySuite) TestMyCase() {
+        func init(){
+                registerMySuiteTest(MyTest)
+        }
+
+        func MyTest(s *MySuite) {
                 clientVpp := s.getContainerByName("client-vpp").vppInstance
 
                 serverVethAddress := s.netInterfaces["server-iface"].AddressString()
@@ -86,8 +96,7 @@ Modifying the framework
 
 .. _test-convention:
 
-#. Adding a new suite takes place in ``framework_test.go`` and by creating a new file for the suite.
-   Naming convention for the suite files is ``suite_name_test.go`` where *name* will be replaced
+#. To add a new suite, create a new file. Naming convention for the suite files is ``suite_name_test.go`` where *name* will be replaced
    by the actual name
 
 #. Make a ``struct``, in the suite file, with at least ``HstSuite`` struct as its member.
@@ -99,7 +108,17 @@ Modifying the framework
                         HstSuite
                 }
 
-#. In suite file, implement ``SetupSuite`` method which testify runs once before starting any of the tests.
+#. Create a new slice that will contain test functions with a pointer to the suite's struct: ``var myTests = []func(s *MySuite){}``
+
+#. Then create a new function that will append test functions to that slice:
+
+        ::
+
+                func registerMySuiteTests(tests ...func(s *MySuite)) {
+	                nginxTests = append(myTests, tests...)
+                }
+
+#. In suite file, implement ``SetupSuite`` method which Ginkgo runs once before starting any of the tests.
    It's important here to call ``configureNetworkTopology`` method,
    pass the topology name to the function in a form of file name of one of the *yaml* files in ``topo-network`` folder.
    Without the extension. In this example, *myTopology* corresponds to file ``extras/hs-test/topo-network/myTopology.yaml``
@@ -111,6 +130,8 @@ Modifying the framework
         ::
 
                 func (s *MySuite) SetupSuite() {
+                        s.HstSuite.SetupSuite()
+
                         // Add custom setup code here
 
                         s.configureNetworkTopology("myTopology")
@@ -123,19 +144,62 @@ Modifying the framework
         ::
 
                 func (s *MySuite) SetupTest() {
+                        s.HstSuite.setupTest()
                         s.SetupVolumes()
                         s.SetupContainers()
                 }
 
-#. In order for ``go test`` to run this suite, we need to create a normal test function and pass our suite to ``suite.Run``.
-   These functions are placed at the end of ``framework_test.go``
+#. In order for ``Ginkgo`` to run this suite, we need to create a ``Describe`` container node with setup nodes and an ``It`` subject node.
+   Place them at the end of the suite file
+
+   * Declare a suite struct variable before anything else
+   * To use ``BeforeAll()`` and ``AfterAll()``, the container has to be marked as ``Ordered``
+   * Because the container is now marked as Ordered, if a test fails, all the subsequent tests are skipped.
+     To override this behavior, decorate the container node with ``ContinueOnFailure``
 
         ::
 
-                func TestMySuite(t *testing.T) {
-                        var m MySuite
-                        suite.Run(t, &m)
-                }
+                var _ = Describe("MySuite", Ordered, ContinueOnFailure, func() {
+	        var s MySuite
+	        BeforeAll(func() {
+		        s.SetupSuite()
+	        })
+	        BeforeEach(func() {
+		        s.SetupTest()
+	        })
+	        AfterAll(func() {
+		        s.TearDownSuite()
+	        })
+	        AfterEach(func() {
+		        s.TearDownTest()
+        	})
+	        for _, test := range mySuiteTests {
+		        test := test
+		        pc := reflect.ValueOf(test).Pointer()
+		        funcValue := runtime.FuncForPC(pc)
+		        It(strings.Split(funcValue.Name(), ".")[2], func(ctx SpecContext) {
+			        test(&s)
+		        }, SpecTimeout(time.Minute*5))
+	        }
+                })
+
+#. Notice the loop - it will generate multiple ``It`` nodes, each running a different test.
+   ``test := test`` is necessary, otherwise only the last test in a suite will run.
+   For a more detailed description, check Ginkgo's documentation: https://onsi.github.io/ginkgo/#dynamically-generating-specs\.
+
+#. ``funcValue.Name()`` returns the full name of a function (e.g. ``fd.io/hs-test.MyTest``), however, we only need the test name (``MyTest``).
+
+#. To run certain tests solo, create a new slice that will only contain tests that have to run solo and a new register function.
+   Add a ``Serial`` decorator to the container node and ``Label("SOLO")`` to the ``It`` subject node:
+
+        ::
+
+                var _ = Describe("MySuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+                        ...
+                        It(strings.Split(funcValue.Name(), ".")[2], Label("SOLO"), func(ctx SpecContext) {
+			test(&s)
+		        }, SpecTimeout(time.Minute*5))
+                })
 
 #. Next step is to add test cases to the suite. For that, see section `Adding a test case`_ above
 
@@ -186,13 +250,23 @@ Alternatively copy the executable from host system to the Docker image, similarl
 **Skipping tests**
 
 ``HstSuite`` provides several methods that can be called in tests for skipping it conditionally or unconditionally such as:
-``skip()``, ``SkipIfMultiWorker()``, ``SkipUnlessExtendedTestsBuilt()``.
+``skip()``, ``SkipIfMultiWorker()``, ``SkipUnlessExtendedTestsBuilt()``. You can also use Ginkgo's ``Skip()``.
 However the tests currently run under test suites which set up topology and containers before actual test is run. For the reason of saving
-test run time it is not advisable to use aforementioned skip methods and instead prefix test name with ``Skip``:
+test run time it is not advisable to use aforementioned skip methods and instead, just don't register the test.
+
+**Debugging a test**
+
+It is possible to debug VPP by attaching ``gdb`` before test execution by adding ``DEBUG=true`` like follows:
 
 ::
 
-    func (s *MySuite) SkipTest(){
+    $ make test TEST=LDPreloadIperfVppTest DEBUG=true
+    ...
+    run following command in different terminal:
+    docker exec -it server-vpp2456109 gdb -ex "attach $(docker exec server-vpp2456109 pidof vpp)"
+    Afterwards press CTRL+\ to continue
+
+If a test consists of more VPP instances then this is done for each of them.
 
 
 **Eternal dependencies**
@@ -208,8 +282,38 @@ Generally, these will be updated on a per-need basis, for example when a bug is
 or a new version incompatibility issue occurs.
 
 
-.. _testing: https://pkg.go.dev/testing
-.. _go test: https://pkg.go.dev/cmd/go#hdr-Test_packages
-.. _test suite: https://github.com/stretchr/testify#suite-package
+.. _ginkgo: https://onsi.github.io/ginkgo/
 .. _volumes: https://docs.docker.com/storage/volumes/
 
+**List of tests**
+
+.. _list of tests:
+
+Please update this list whenever you add a new test by pasting the output below.
+
+* NsSuite/HttpTpsTest
+* NsSuite/VppProxyHttpTcpTest
+* NsSuite/VppProxyHttpTlsTest
+* NsSuite/EnvoyProxyHttpTcpTest
+* NginxSuite/MirroringTest
+* VethsSuiteSolo TcpWithLossTest [SOLO]
+* NoTopoSuiteSolo HttpStaticPromTest [SOLO]
+* TapSuite/LinuxIperfTest
+* NoTopoSuite/NginxHttp3Test
+* NoTopoSuite/NginxAsServerTest
+* NoTopoSuite/NginxPerfCpsTest
+* NoTopoSuite/NginxPerfRpsTest
+* NoTopoSuite/NginxPerfWrkTest
+* VethsSuite/EchoBuiltinTest
+* VethsSuite/HttpCliTest
+* VethsSuite/LDPreloadIperfVppTest
+* VethsSuite/VppEchoQuicTest
+* VethsSuite/VppEchoTcpTest
+* VethsSuite/VppEchoUdpTest
+* VethsSuite/XEchoVclClientUdpTest
+* VethsSuite/XEchoVclClientTcpTest
+* VethsSuite/XEchoVclServerUdpTest
+* VethsSuite/XEchoVclServerTcpTest
+* VethsSuite/VclEchoTcpTest
+* VethsSuite/VclEchoUdpTest
+* VethsSuite/VclRetryAttachTest

extras/hs-test/address_allocator.go

@@ -1,11 +1,20 @@
 package main
 
-import "fmt"
+import (
+	"errors"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/edwarnicke/exechelper"
+)
 
 type AddressCounter = int
 
 type Ip4AddressAllocator struct {
-	networks map[int]AddressCounter
+	networks    map[int]AddressCounter
+	chosenOctet int
+	assignedIps []string
 }
 
 func (a *Ip4AddressAllocator) AddNetwork(networkNumber int) {
@@ -28,12 +37,59 @@ func (a *Ip4AddressAllocator) NewIp4InterfaceAddress(inputNetworkNumber ...int)
 		return "", fmt.Errorf("no available IPv4 addresses")
 	}
 
-	address := fmt.Sprintf("10.10.%v.%v/24", networkNumber, numberOfAddresses)
+	address, err := a.createIpAddress(networkNumber, numberOfAddresses)
+
 	a.networks[networkNumber] = numberOfAddresses + 1
 
+	return address + "/24", err
+}
+
+// Creates a file every time an IP is assigned: used to keep track of addresses in use.
+// If an address is not in use, 'counter' is then copied to 'chosenOctet' and it is used for the remaining tests.
+// Also checks host IP addresses.
+func (a *Ip4AddressAllocator) createIpAddress(networkNumber int, numberOfAddresses int) (string, error) {
+	hostIps, _ := exechelper.CombinedOutput("ip a")
+	counter := 10
+	var address string
+
+	for {
+		if a.chosenOctet != 0 {
+			address = fmt.Sprintf("10.%v.%v.%v", a.chosenOctet, networkNumber, numberOfAddresses)
+			file, err := os.Create(address)
+			if err != nil {
+				return "", errors.New("unable to create file: " + fmt.Sprint(err))
+			}
+			file.Close()
+			break
+		} else {
+			address = fmt.Sprintf("10.%v.%v.%v", counter, networkNumber, numberOfAddresses)
+			_, err := os.Stat(address)
+			if err == nil || strings.Contains(string(hostIps), address) {
+				counter++
+			} else if os.IsNotExist(err) {
+				file, err := os.Create(address)
+				if err != nil {
+					return "", errors.New("unable to create file: " + fmt.Sprint(err))
+				}
+				file.Close()
+				a.chosenOctet = counter
+				break
+			} else {
+				return "", errors.New("an error occurred while checking if a file exists: " + fmt.Sprint(err))
+			}
+		}
+	}
+
+	a.assignedIps = append(a.assignedIps, address)
 	return address, nil
 }
 
+func (a *Ip4AddressAllocator) deleteIpAddresses() {
+	for ip := range a.assignedIps {
+		os.Remove(a.assignedIps[ip])
+	}
+}
+
 func NewIp4AddressAllocator() *Ip4AddressAllocator {
 	var ip4AddrAllocator = new(Ip4AddressAllocator)
 	ip4AddrAllocator.networks = make(map[int]AddressCounter)

extras/hs-test/container.go

@@ -9,10 +9,12 @@ import (
 	"time"
 
 	"github.com/edwarnicke/exechelper"
+	. "github.com/onsi/ginkgo/v2"
 )
 
 const (
-	logDir string = "/tmp/hs-test/"
+	logDir    string = "/tmp/hs-test/"
+	volumeDir string = "/volumes"
 )
 
 var (
@@ -37,7 +39,7 @@ type Container struct {
 	vppInstance      *VppInstance
 }
 
-func newContainer(yamlInput ContainerConfig) (*Container, error) {
+func newContainer(suite *HstSuite, yamlInput ContainerConfig) (*Container, error) {
 	containerName := yamlInput["name"].(string)
 	if len(containerName) == 0 {
 		err := fmt.Errorf("container name must not be blank")
@@ -48,6 +50,7 @@ func newContainer(yamlInput ContainerConfig) (*Container, error) {
 	container.volumes = make(map[string]Volume)
 	container.envVars = make(map[string]string)
 	container.name = containerName
+	container.suite = suite
 
 	if image, ok := yamlInput["image"]; ok {
 		container.image = image.(string)
@@ -74,19 +77,20 @@ func newContainer(yamlInput ContainerConfig) (*Container, error) {
 	}
 
 	if _, ok := yamlInput["volumes"]; ok {
-		r := strings.NewReplacer("$HST_DIR", workDir)
+		workingVolumeDir := logDir + CurrentSpecReport().LeafNodeText + volumeDir
+		workDirReplacer := strings.NewReplacer("$HST_DIR", workDir)
+		volDirReplacer := strings.NewReplacer("$HST_VOLUME_DIR", workingVolumeDir)
 		for _, volu := range yamlInput["volumes"].([]interface{}) {
 			volumeMap := volu.(ContainerConfig)
-			hostDir := r.Replace(volumeMap["host-dir"].(string))
+			hostDir := workDirReplacer.Replace(volumeMap["host-dir"].(string))
+			hostDir = volDirReplacer.Replace(hostDir)
 			containerDir := volumeMap["container-dir"].(string)
 			isDefaultWorkDir := false
 
 			if isDefault, ok := volumeMap["is-default-work-dir"]; ok {
 				isDefaultWorkDir = isDefault.(bool)
 			}
-
 			container.addVolume(hostDir, containerDir, isDefaultWorkDir)
-
 		}
 	}
 
@@ -246,7 +250,7 @@ func (c *Container) copy(sourceFileName string, targetFileName string) error {
 }
 
 func (c *Container) createFile(destFileName string, content string) error {
-	f, err := os.CreateTemp("/tmp", "hst-config")
+	f, err := os.CreateTemp("/tmp", "hst-config"+c.suite.pid)
 	if err != nil {
 		return err
 	}
@@ -270,7 +274,7 @@ func (c *Container) execServer(command string, arguments ...any) {
 	serverCommand := fmt.Sprintf(command, arguments...)
 	containerExecCommand := "docker exec -d" + c.getEnvVarsAsCliOption() +
 		" " + c.name + " " + serverCommand
-	c.suite.T().Helper()
+	GinkgoHelper()
 	c.suite.log(containerExecCommand)
 	c.suite.assertNil(exechelper.Run(containerExecCommand))
 }
@@ -279,21 +283,21 @@ func (c *Container) exec(command string, arguments ...any) string {
 	cliCommand := fmt.Sprintf(command, arguments...)
 	containerExecCommand := "docker exec" + c.getEnvVarsAsCliOption() +
 		" " + c.name + " " + cliCommand
-	c.suite.T().Helper()
+	GinkgoHelper()
 	c.suite.log(containerExecCommand)
 	byteOutput, err := exechelper.CombinedOutput(containerExecCommand)
-	c.suite.assertNil(err)
+	c.suite.assertNil(err, err)
 	return string(byteOutput)
 }
 
 func (c *Container) getLogDirPath() string {
 	testId := c.suite.getTestId()
-	testName := c.suite.T().Name()
+	testName := CurrentSpecReport().LeafNodeText
 	logDirPath := logDir + testName + "/" + testId + "/"
 
 	cmd := exec.Command("mkdir", "-p", logDirPath)
 	if err := cmd.Run(); err != nil {
-		c.suite.T().Fatalf("mkdir error: %v", err)
+		Fail("mkdir error: " + fmt.Sprint(err))
 	}
 
 	return logDirPath
@@ -310,27 +314,33 @@ func (c *Container) saveLogs() {
 	cmd = exec.Command("docker", "logs", "--details", "-t", c.name)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		c.suite.T().Fatalf("fetching logs error: %v", err)
+		Fail("fetching logs error: " + fmt.Sprint(err))
 	}
 
 	f, err := os.Create(testLogFilePath)
 	if err != nil {
-		c.suite.T().Fatalf("file create error: %v", err)
+		Fail("file create error: " + fmt.Sprint(err))
 	}
 	fmt.Fprint(f, string(output))
 	f.Close()
 }
 
-func (c *Container) log() string {
-	cmd := "docker logs " + c.name
+// Outputs logs from docker containers. Set 'maxLines' to 0 to output the full log.
+func (c *Container) log(maxLines int) (string, error) {
+	var cmd string
+	if maxLines == 0 {
+		cmd = "docker logs " + c.name
+	} else {
+		cmd = fmt.Sprintf("docker logs --tail %d %s", maxLines, c.name)
+	}
+
 	c.suite.log(cmd)
 	o, err := exechelper.CombinedOutput(cmd)
-	c.suite.assertNil(err)
-	return string(o)
+	return string(o), err
 }
 
 func (c *Container) stop() error {
-	if c.vppInstance != nil && c.vppInstance.apiChannel != nil {
+	if c.vppInstance != nil && c.vppInstance.apiStream != nil {
 		c.vppInstance.saveLogs()
 		c.vppInstance.disconnect()
 	}
@@ -342,15 +352,15 @@ func (c *Container) stop() error {
 func (c *Container) createConfig(targetConfigName string, templateName string, values any) {
 	template := template.Must(template.ParseFiles(templateName))
 
-	f, err := os.CreateTemp("/tmp/hs-test/", "hst-config")
-	c.suite.assertNil(err)
+	f, err := os.CreateTemp(logDir, "hst-config")
+	c.suite.assertNil(err, err)
 	defer os.Remove(f.Name())
 
 	err = template.Execute(f, values)
-	c.suite.assertNil(err)
+	c.suite.assertNil(err, err)
 
 	err = f.Close()
-	c.suite.assertNil(err)
+	c.suite.assertNil(err, err)
 
 	c.copy(f.Name(), targetConfigName)
 }

extras/hs-test/cpu.go

@@ -2,11 +2,14 @@ package main
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"os"
+	"os/exec"
+	"strings"
 )
 
-var CPU_PATH = "/sys/fs/cgroup/cpuset.cpus.effective"
+var CgroupPath = "/sys/fs/cgroup/"
 
 type CpuContext struct {
 	cpuAllocator *CpuAllocatorT
@@ -36,9 +39,27 @@ func (c *CpuAllocatorT) Allocate(nCpus int) (*CpuContext, error) {
 	return &cpuCtx, nil
 }
 
-func (c *CpuAllocatorT) readCpus(fname string) error {
+func (c *CpuAllocatorT) readCpus() error {
 	var first, last int
-	file, err := os.Open(CPU_PATH)
+
+	// Path depends on cgroup version. We need to check which version is in use.
+	// For that following command can be used: 'stat -fc %T /sys/fs/cgroup/'
+	// In case the output states 'cgroup2fs' then cgroups v2 is used, 'tmpfs' in case cgroups v1.
+	cmd := exec.Command("stat", "-fc", "%T", "/sys/fs/cgroup/")
+	byteOutput, err := cmd.CombinedOutput()
+	if err != nil {
+		return err
+	}
+	CpuPath := CgroupPath
+	if strings.Contains(string(byteOutput), "tmpfs") {
+		CpuPath += "cpuset/cpuset.effective_cpus"
+	} else if strings.Contains(string(byteOutput), "cgroup2fs") {
+		CpuPath += "cpuset.cpus.effective"
+	} else {
+		return errors.New("cgroup unknown fs: " + string(byteOutput))
+	}
+
+	file, err := os.Open(CpuPath)
 	if err != nil {
 		return err
 	}
@@ -60,7 +81,7 @@ func (c *CpuAllocatorT) readCpus(fname string) error {
 func CpuAllocator() (*CpuAllocatorT, error) {
 	if cpuAllocator == nil {
 		cpuAllocator = new(CpuAllocatorT)
-		err := cpuAllocator.readCpus(CPU_PATH)
+		err := cpuAllocator.readCpus()
 		if err != nil {
 			return nil, err
 		}

extras/hs-test/docker/Dockerfile.vpp

@@ -16,6 +16,8 @@ COPY \
    $DIR/unittest_plugin.so \
    $DIR/quic_plugin.so \
    $DIR/http_static_plugin.so \
+   $DIR/ping_plugin.so \
+   $DIR/nsim_plugin.so \
    $DIR/prom_plugin.so \
    $DIR/tlsopenssl_plugin.so \
    /usr/lib/x86_64-linux-gnu/vpp_plugins/

extras/hs-test/echo_test.go

@@ -1,8 +1,13 @@
 package main
 
-func (s *VethsSuite) TestEchoBuiltin() {
+func init() {
+	registerVethTests(EchoBuiltinTest)
+	registerSoloVethTests(TcpWithLossTest)
+}
+
+func EchoBuiltinTest(s *VethsSuite) {
 	serverVpp := s.getContainerByName("server-vpp").vppInstance
-	serverVeth := s.netInterfaces["vppsrv"]
+	serverVeth := s.getInterfaceByName(serverInterfaceName)
 
 	serverVpp.vppctl("test echo server " +
 		" uri tcp://" + serverVeth.ip4AddressString() + "/1234")
@@ -16,29 +21,29 @@ func (s *VethsSuite) TestEchoBuiltin() {
 	s.assertNotContains(o, "failed:")
 }
 
-func (s *VethsSuite) TestTcpWithLoss() {
+func TcpWithLossTest(s *VethsSuite) {
 	serverVpp := s.getContainerByName("server-vpp").vppInstance
 
-	serverVeth := s.netInterfaces[serverInterfaceName]
+	serverVeth := s.getInterfaceByName(serverInterfaceName)
 	serverVpp.vppctl("test echo server uri tcp://%s/20022",
 		serverVeth.ip4AddressString())
 
 	clientVpp := s.getContainerByName("client-vpp").vppInstance
 
 	// Ensure that VPP doesn't abort itself with NSIM enabled
-	// Warning: Removing this ping will make the test fail!
+	// Warning: Removing this ping will make VPP crash!
 	clientVpp.vppctl("ping %s", serverVeth.ip4AddressString())
 
 	// Add loss of packets with Network Delay Simulator
 	clientVpp.vppctl("set nsim poll-main-thread delay 0.01 ms bandwidth 40 gbit" +
 		" packet-size 1400 packets-per-drop 1000")
 
-	clientVpp.vppctl("nsim output-feature enable-disable host-vppcln")
+	clientVpp.vppctl("nsim output-feature enable-disable host-" + s.getInterfaceByName(clientInterfaceName).name)
 
 	// Do echo test from client-vpp container
 	output := clientVpp.vppctl("test echo client uri tcp://%s/20022 verbose echo-bytes mbytes 50",
 		serverVeth.ip4AddressString())
 	s.log(output)
 	s.assertNotEqual(len(output), 0)
-	s.assertNotContains(output, "failed: timeout")
+	s.assertNotContains(output, "failed", output)
 }

extras/hs-test/framework_test.go

@@ -3,30 +3,11 @@ package main
 import (
 	"testing"
 
-	"github.com/stretchr/testify/suite"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
-func TestTapSuite(t *testing.T) {
-	var m TapSuite
-	suite.Run(t, &m)
-}
-
-func TestNs(t *testing.T) {
-	var m NsSuite
-	suite.Run(t, &m)
-}
-
-func TestVeths(t *testing.T) {
-	var m VethsSuite
-	suite.Run(t, &m)
-}
-
-func TestNoTopo(t *testing.T) {
-	var m NoTopoSuite
-	suite.Run(t, &m)
-}
-
-func TestNginx(t *testing.T) {
-	var m NginxSuite
-	suite.Run(t, &m)
+func TestHst(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "HST")
 }