From b73bc71b49d8ae22745348f2cd6af4b58daed12c Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 5 Oct 2022 14:57:18 +0200 Subject: [PATCH] feat(trex): Bump T-Rex to v3.00 Signed-off-by: pmikus Change-Id: I9aa88fb094b03888fc30d84edc1deaa406075db4 --- GPL/tools/trex/trex_astf_assert.py | 2 +- GPL/tools/trex/trex_astf_profile.py | 2 +- GPL/tools/trex/trex_astf_stop.py | 2 +- GPL/tools/trex/trex_stl_assert.py | 2 +- GPL/tools/trex/trex_stl_profile.py | 2 +- GPL/tools/trex/trex_stl_stop.py | 2 +- .../trex/profile_trex_astf_base_class.py | 2 +- fdio.infra.ansible/roles/intel/defaults/main.yaml | 33 +++++++++++----------- fdio.infra.ansible/roles/trex/defaults/main.yaml | 29 +++++++++---------- .../roles/trex/tasks/deploy_block.yaml | 2 ++ resources/libraries/python/Constants.py | 2 +- .../tools/presentation/sphinx_conf/report/conf.py | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/GPL/tools/trex/trex_astf_assert.py b/GPL/tools/trex/trex_astf_assert.py index c276051c02..cc54f175c4 100644 --- a/GPL/tools/trex/trex_astf_assert.py +++ b/GPL/tools/trex/trex_astf_assert.py @@ -38,7 +38,7 @@ Functionality: import sys sys.path.insert( - 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.00/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 205bd260cd..29722c9daa 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.97/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.00/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 9185478a55..77f6cd3c26 100644 --- a/GPL/tools/trex/trex_astf_stop.py +++ b/GPL/tools/trex/trex_astf_stop.py @@ -44,7 +44,7 @@ import sys from collections import OrderedDict # Needed to parse xstats representation. sys.path.insert( - 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.00/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 296dc5b958..426df5bb27 100644 --- a/GPL/tools/trex/trex_stl_assert.py +++ b/GPL/tools/trex/trex_stl_assert.py @@ -38,7 +38,7 @@ Functionality: import sys sys.path.insert( - 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.00/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 abf79cdf14..7b7ef6e43d 100644 --- a/GPL/tools/trex/trex_stl_profile.py +++ b/GPL/tools/trex/trex_stl_profile.py @@ -34,7 +34,7 @@ import sys import time sys.path.insert( - 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.00/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 bbd3a4f1c1..7f111cba37 100644 --- a/GPL/tools/trex/trex_stl_stop.py +++ b/GPL/tools/trex/trex_stl_stop.py @@ -44,7 +44,7 @@ import sys from collections import OrderedDict # Needed to parse xstats representation. sys.path.insert( - 0, u"/opt/trex-core-2.97/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.00/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 2c97201689..f4336aba08 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.97/scripts/avl" + u"pcap_dir", u"/opt/trex-core-3.00/scripts/avl" ) return self.create_profile() diff --git a/fdio.infra.ansible/roles/intel/defaults/main.yaml b/fdio.infra.ansible/roles/intel/defaults/main.yaml index d4d8c4c514..b46fa3ebc0 100644 --- a/fdio.infra.ansible/roles/intel/defaults/main.yaml +++ b/fdio.infra.ansible/roles/intel/defaults/main.yaml @@ -21,43 +21,42 @@ intel_download_url: "https://downloadmirror.intel.com" intel_extract_dir: "/opt" intel_700_compatibility_matrix: - dpdk21.02: - # https://doc.dpdk.org/guides/rel_notes/release_21_02.html - i40e: "2.14.13" - iavf: "4.1.1" - nvm: "8.00" + dpdk22.03: + # https://doc.dpdk.org/guides/rel_notes/release_22_03.html + i40e: "2.17.15" + iavf: "4.5.3" + nvm: "8.30" dpdk22.07: # https://doc.dpdk.org/guides/rel_notes/release_22_07.html i40e: "2.19.3" iavf: "4.5.3" - nvm: "8.30" + nvm: "8.70" intel_800_compatibility_matrix: - dpdk21.02: - # https://doc.dpdk.org/guides/rel_notes/release_21_02.html - ice: "1.4.11" - ddp: "1.3.28.0" - iavf: "4.1.1" - nvm: "2.40" + dpdk22.03: + # https://doc.dpdk.org/guides/rel_notes/release_22_03.html + ice: "1.8.3" + ddp: "1.3.35.0" + iavf: "4.5.3" + nvm: "3.20" dpdk22.07: # https://doc.dpdk.org/guides/rel_notes/release_22_07.html ice: "1.9.7" ddp: "1.3.37.0" iavf: "4.5.3" - nvm: "3.20" + nvm: "4.00" intel_i40e_url: - "2.14.13": "i40e%20stable/2.14.13/i40e-2.14.13.tar.gz/download" + "2.17.15": "i40e%20stable/2.17.15/i40e-2.17.15.tar.gz/download" "2.19.3": "i40e%20stable/2.19.3/i40e-2.19.3.tar.gz/download" intel_ice_url: - "1.4.11": "ice%20stable/1.4.11/ice-1.4.11.tar.gz/download" + "1.8.3": "ice%20stable/1.8.3/ice-1.8.3.tar.gz/download" "1.9.7": "ice%20stable/1.9.7/ice-1.9.7.tar.gz/download" intel_iavf_url: - "4.1.1": "iavf%20stable/4.1.1/iavf-4.1.1.tar.gz/download" "4.5.3": "iavf%20stable/4.5.3/iavf-4.5.3.tar.gz/download" intel_ddp_url: - "1.3.28.0": "30467/eng/800%20series%20comms%20binary%20package%201.3.28.0.zip" + "1.3.35.0": "727568/800%20Series%20DDP%20Comms%20Package%201.3.35.0.zip" "1.3.37.0": "738733/800%20Series%20DDP%20Comms%20Package%201.3.37.0.zip" diff --git a/fdio.infra.ansible/roles/trex/defaults/main.yaml b/fdio.infra.ansible/roles/trex/defaults/main.yaml index c09f5e5f85..804b1f3b3f 100644 --- a/fdio.infra.ansible/roles/trex/defaults/main.yaml +++ b/fdio.infra.ansible/roles/trex/defaults/main.yaml @@ -1,26 +1,25 @@ --- # file: roles/trex/defaults/main.yaml -packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}" +packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower] + packages_by_arch[ansible_machine] }}" packages_base: - [] packages_by_distro: ubuntu: - jammy: - - "build-essential" - - "gcc-9" - - "g++-9" - - "libmnl-dev" - - "libnuma-dev" - - "libpcap-dev" - - "librdmacm-dev" - - "librdmacm1" - - "libssl-dev" - - "pciutils" - - "python3-pip" - - "zlib1g-dev" + - "build-essential" + - "gcc-9" + - "g++-9" + - "libmnl-dev" + - "libnuma-dev" + - "libpcap-dev" + - "librdmacm-dev" + - "librdmacm1" + - "libssl-dev" + - "pciutils" + - "python3-pip" + - "zlib1g-dev" packages_by_arch: aarch64: @@ -31,4 +30,4 @@ packages_by_arch: trex_target_dir: "/opt" trex_url: "https://github.com/cisco-system-traffic-generator/trex-core/archive/" trex_version: - - "2.97" + - "3.00" diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml index 492a56a65d..23948bc158 100644 --- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml +++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml @@ -32,10 +32,12 @@ - name: Reset gcc-9 ansible.builtin.command: "update-alternatives --remove-all gcc" + ignore_errors: true when: trex_extracted.changed - name: Reset g++-9 ansible.builtin.command: "update-alternatives --remove-all g++" + ignore_errors: true when: trex_extracted.changed - name: Switch to gcc-9 diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 24a1117356..e91cf6c713 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-ubuntu2204:local" # TRex install directory - TREX_INSTALL_DIR = u"/opt/trex-core-2.97" + TREX_INSTALL_DIR = u"/opt/trex-core-3.00" # TRex pcap files directory TREX_PCAP_DIR = f"{TREX_INSTALL_DIR}/scripts/avl" diff --git a/resources/tools/presentation/sphinx_conf/report/conf.py b/resources/tools/presentation/sphinx_conf/report/conf.py index 6ebf915d72..96eaa0096f 100644 --- a/resources/tools/presentation/sphinx_conf/report/conf.py +++ b/resources/tools/presentation/sphinx_conf/report/conf.py @@ -143,7 +143,7 @@ rst_epilog = """ dpdkrelease='22.07', dpdk_prev_release='22.03', sdpdkrelease='22.07', - trex_version='v2.97', + trex_version='v3.00', vpp_release_commit_id='0d352a97c5e3ad1f5f6eab18a978a14b0b9e06a8') # The language for content autogenerated by Sphinx. Refer to documentation -- 2.16.6