From d003f4e95fcf6438224782d3f1ee9e3aa53d17d5 Mon Sep 17 00:00:00 2001 From: Chris Sommers <31145757+chrispsommers@users.noreply.github.com> Date: Fri, 16 Sep 2022 22:43:03 -0700 Subject: [PATCH] Upgrade to ixia-c 0.0.1-3383 (#226) * Upgrade to ixia-c 0.0.1-3383 which fixes hairpin mode and adds option to disable IPv6 at launch. Remove ./disable_veth_ipv6.sh from makefile after deploy-ixiac sincve it's not needed. (Keep it as prerequisite to running test-cases since we still need to prevent linux ICMP6 packets during tests.) * Update ixia-c traffic engine to match controller. * Update snappi version to match ixia-c-components. Co-authored-by: Chris Sommers --- dash-pipeline/Makefile | 1 - dash-pipeline/tests/requirements.txt | 2 +- test/requirements.txt | 2 +- test/third-party/traffic_gen/deployment/.env | 7 ++++--- .../traffic_gen/deployment/ixia-c-deployment.yml | 2 ++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dash-pipeline/Makefile b/dash-pipeline/Makefile index a31860fe5..017c4714f 100644 --- a/dash-pipeline/Makefile +++ b/dash-pipeline/Makefile @@ -490,7 +490,6 @@ install-python-modules: deploy-ixiac: cd ../test/third-party/traffic_gen && ./deploy_ixiac.sh - ./disable_veth_ipv6.sh undeploy-ixiac: cd ../test/third-party/traffic_gen && ./undeploy_ixiac.sh diff --git a/dash-pipeline/tests/requirements.txt b/dash-pipeline/tests/requirements.txt index 649e00354..7db3f16dd 100644 --- a/dash-pipeline/tests/requirements.txt +++ b/dash-pipeline/tests/requirements.txt @@ -1,2 +1,2 @@ -snappi==0.7.38 +snappi==0.9.4 pytest==6.0.1 diff --git a/test/requirements.txt b/test/requirements.txt index 649e00354..7db3f16dd 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,2 +1,2 @@ -snappi==0.7.38 +snappi==0.9.4 pytest==6.0.1 diff --git a/test/third-party/traffic_gen/deployment/.env b/test/third-party/traffic_gen/deployment/.env index 788931164..72ec4ae3b 100644 --- a/test/third-party/traffic_gen/deployment/.env +++ b/test/third-party/traffic_gen/deployment/.env @@ -1,9 +1,10 @@ DOCKER_REGISTRY=ghcr.io/open-traffic-generator -CONTROLLER_VERSION=0.0.1-2934 -TRAFFIC_ENGINE_VERSION=1.4.1.26 +CONTROLLER_VERSION=0.0.1-3383 +TRAFFIC_ENGINE_VERSION=1.6.0.17 IFC1=veth1 IFC2=veth3 TCP_PORT_IFC1=5555 TCP_PORT_IFC2=5556 CPU_CORES_IFC1="0" -CPU_CORES_IFC2="1" \ No newline at end of file +CPU_CORES_IFC2="1" +OPT_ENABLE_IPv6="No" diff --git a/test/third-party/traffic_gen/deployment/ixia-c-deployment.yml b/test/third-party/traffic_gen/deployment/ixia-c-deployment.yml index 7b6a3b825..39da05fe5 100644 --- a/test/third-party/traffic_gen/deployment/ixia-c-deployment.yml +++ b/test/third-party/traffic_gen/deployment/ixia-c-deployment.yml @@ -16,6 +16,7 @@ services: - OPT_LISTEN_PORT=${TCP_PORT_IFC1:-5555} - ARG_IFACE_LIST=virtual@af_packet,${IFC1} - OPT_NO_HUGEPAGES=Yes + - OPT_ENABLE_IPv6=${OPT_ENABLE_IPv6} traffic_engine_2: image: ${DOCKER_REGISTRY}/ixia-c-traffic-engine:${TRAFFIC_ENGINE_VERSION:-latest} container_name: ixia-c-traffic-engine2-${USER} @@ -27,3 +28,4 @@ services: - OPT_LISTEN_PORT=${TCP_PORT_IFC2:-5556} - ARG_IFACE_LIST=virtual@af_packet,${IFC2} - OPT_NO_HUGEPAGES=Yes + - OPT_ENABLE_IPv6=${OPT_ENABLE_IPv6}