From 48d0b3ea0445da0b69347f610f17e67d471b77e3 Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 21 Jul 2021 12:01:34 +0000 Subject: [PATCH] Core: T-rex 2.97 Signed-off-by: pmikus Change-Id: Id4d84aa7268080843b099fd7ab9851234612968b --- GPL/tools/trex/trex_astf_assert.py | 4 ++-- GPL/tools/trex/trex_astf_profile.py | 2 +- GPL/tools/trex/trex_astf_stop.py | 4 ++-- GPL/tools/trex/trex_stl_assert.py | 4 ++-- GPL/tools/trex/trex_stl_profile.py | 4 ++-- GPL/tools/trex/trex_stl_stop.py | 4 ++-- GPL/traffic_profiles/trex/profile_trex_astf_base_class.py | 2 +- docs/report/trex_performance_tests/csit_release_notes.rst | 2 +- resources/libraries/bash/function/common.sh | 2 +- resources/libraries/python/Constants.py | 10 ++-------- resources/tools/presentation/sphinx_conf/report/conf.py | 2 +- 11 files changed, 17 insertions(+), 23 deletions(-) diff --git a/GPL/tools/trex/trex_astf_assert.py b/GPL/tools/trex/trex_astf_assert.py index 494f3832bd..c276051c02 100644 --- a/GPL/tools/trex/trex_astf_assert.py +++ b/GPL/tools/trex/trex_astf_assert.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -38,7 +38,7 @@ Functionality: import sys sys.path.insert( - 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" ) from trex.astf.api import ASTFClient, TRexError diff --git a/GPL/tools/trex/trex_astf_profile.py b/GPL/tools/trex/trex_astf_profile.py index a2d177fdea..936a8df436 100644 --- a/GPL/tools/trex/trex_astf_profile.py +++ b/GPL/tools/trex/trex_astf_profile.py @@ -34,7 +34,7 @@ import sys import time sys.path.insert( - 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" ) from trex.astf.api import ASTFClient, ASTFProfile, TRexError diff --git a/GPL/tools/trex/trex_astf_stop.py b/GPL/tools/trex/trex_astf_stop.py index 8c05cb46de..7291552631 100644 --- a/GPL/tools/trex/trex_astf_stop.py +++ b/GPL/tools/trex/trex_astf_stop.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -44,7 +44,7 @@ import sys from collections import OrderedDict # Needed to parse xstats representation. sys.path.insert( - 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" ) from trex.astf.api import ASTFClient diff --git a/GPL/tools/trex/trex_stl_assert.py b/GPL/tools/trex/trex_stl_assert.py index f4f6d16603..296dc5b958 100644 --- a/GPL/tools/trex/trex_stl_assert.py +++ b/GPL/tools/trex/trex_stl_assert.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -38,7 +38,7 @@ Functionality: import sys sys.path.insert( - 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" ) from trex.stl.api import STLClient, STLError diff --git a/GPL/tools/trex/trex_stl_profile.py b/GPL/tools/trex/trex_stl_profile.py index cef985870c..09fd7b457c 100644 --- a/GPL/tools/trex/trex_stl_profile.py +++ b/GPL/tools/trex/trex_stl_profile.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -34,7 +34,7 @@ import sys import time sys.path.insert( - 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" ) from trex.stl.api import STLClient, STLProfile, STLError diff --git a/GPL/tools/trex/trex_stl_stop.py b/GPL/tools/trex/trex_stl_stop.py index 8d24a88b33..bbd3a4f1c1 100644 --- a/GPL/tools/trex/trex_stl_stop.py +++ b/GPL/tools/trex/trex_stl_stop.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -44,7 +44,7 @@ import sys from collections import OrderedDict # Needed to parse xstats representation. sys.path.insert( - 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" ) from trex.stl.api import STLClient diff --git a/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py index cb8fd763e6..2c97201689 100644 --- a/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py +++ b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py @@ -135,7 +135,7 @@ class TrafficProfileBaseClass: self.framesize = kwargs[u"framesize"] self.n_data_frames = kwargs[u"n_data_frames"] self._pcap_dir = kwargs.get( - u"pcap_dir", u"/opt/trex-core-2.88/scripts/avl" + u"pcap_dir", u"/opt/trex-core-2.97/scripts/avl" ) return self.create_profile() diff --git a/docs/report/trex_performance_tests/csit_release_notes.rst b/docs/report/trex_performance_tests/csit_release_notes.rst index fd901f7096..5eed2ac295 100644 --- a/docs/report/trex_performance_tests/csit_release_notes.rst +++ b/docs/report/trex_performance_tests/csit_release_notes.rst @@ -14,7 +14,7 @@ Changes in |csit-release| loopback tests. #. TRex RELEASE VERSION - - **TRex version used: 2.88** + - **TRex version used: 2.97** .. _trex_known_issues: diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 6b113588fa..52e44c796e 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -1196,7 +1196,7 @@ function set_environment_variables () { case "${TEST_CODE}" in *"1n-aws"* | *"2n-aws"* | *"3n-aws"*) - # T-Rex 2.88 workaround for ENA NICs + # T-Rex 2.88+ workaround for ENA NICs export TREX_RX_DESCRIPTORS_COUNT=1024 export TREX_EXTRA_CMDLINE="--mbuf-factor 19" export TREX_CORE_COUNT=6 diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index bfbbfd7471..7289c9c5a4 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -195,7 +195,7 @@ class Constants: DOCKER_SUT_IMAGE_UBUNTU_ARM = u"csit_sut-ubuntu2004:local" # TRex install directory - TREX_INSTALL_DIR = u"/opt/trex-core-2.88" + TREX_INSTALL_DIR = u"/opt/trex-core-2.97" # TRex pcap files directory TREX_PCAP_DIR = f"{TREX_INSTALL_DIR}/scripts/avl" @@ -322,13 +322,7 @@ class Constants: u"Intel-XL710": 18750000, u"Intel-XXV710": 18750000, u"Intel-E810CQ": 58500000, - # 2n-clx testbeds show duration stretching on high rates, - # depending on encapsulation TRex has to generate. - # 40 Mpps is still too much for dot1q (~8% stretching). - # 36 Mpps is around the maximal VPP throughput (l2patch 4c8t). - # Vxlan traffic will still show stretching at 36 Mpps (>12%), - # but we do not care about those tests that much. - u"Mellanox-CX556A": 36000000, # 148809523, + u"Mellanox-CX556A": 148809523, u"Amazon-Nitro-50G": 1200000, u"virtual": 14880952, } diff --git a/resources/tools/presentation/sphinx_conf/report/conf.py b/resources/tools/presentation/sphinx_conf/report/conf.py index ea8418e5b3..3861cbe78e 100644 --- a/resources/tools/presentation/sphinx_conf/report/conf.py +++ b/resources/tools/presentation/sphinx_conf/report/conf.py @@ -136,7 +136,7 @@ rst_epilog = u""" dpdkrelease=u'21.11', dpdk_prev_release=u'21.08', sdpdkrelease=u'2111', - trex_version=u'v2.88', + trex_version=u'v2.97', vpp_release_commit_id=u'0e0384cde97a71acc0313a0904ed340730a87817') # The language for content autogenerated by Sphinx. Refer to documentation -- 2.16.6