From f4f272db8e211d115044d8135fc0c6ecef98408e Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 24 May 2023 12:40:14 +0000 Subject: [PATCH] feat(core): T-Rex 3.03 Signed-off-by: pmikus Change-Id: I58607f50e2889092e40ff831ed4f1515444e29f8 --- 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/trex/defaults/main.yaml | 4 +-- .../roles/trex/tasks/deploy_block.yaml | 36 +--------------------- fdio.infra.ansible/roles/trex/tasks/main.yaml | 2 +- resources/libraries/python/Constants.py | 2 +- 11 files changed, 12 insertions(+), 46 deletions(-) diff --git a/GPL/tools/trex/trex_astf_assert.py b/GPL/tools/trex/trex_astf_assert.py index cc54f175c4..107253f5f0 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-3.00/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.03/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 29722c9daa..ccda573bf4 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-3.00/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.03/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 77f6cd3c26..699f4d491c 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-3.00/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.03/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 426df5bb27..f705619fea 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-3.00/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.03/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 7b7ef6e43d..324ad41cc0 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-3.00/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.03/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 7f111cba37..9cc1814589 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-3.00/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-3.03/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 f4336aba08..55aedd0543 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-3.00/scripts/avl" + u"pcap_dir", u"/opt/trex-core-3.03/scripts/avl" ) return self.create_profile() diff --git a/fdio.infra.ansible/roles/trex/defaults/main.yaml b/fdio.infra.ansible/roles/trex/defaults/main.yaml index 804b1f3b3f..18a2b56bda 100644 --- a/fdio.infra.ansible/roles/trex/defaults/main.yaml +++ b/fdio.infra.ansible/roles/trex/defaults/main.yaml @@ -1,5 +1,5 @@ --- -# file: roles/trex/defaults/main.yaml +# file: defaults/main.yaml packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower] + packages_by_arch[ansible_machine] }}" @@ -30,4 +30,4 @@ packages_by_arch: trex_target_dir: "/opt" trex_url: "https://github.com/cisco-system-traffic-generator/trex-core/archive/" trex_version: - - "3.00" + - "3.03" diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml index 23948bc158..1a747f68d5 100644 --- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml +++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml @@ -1,5 +1,5 @@ --- -# file: roles/trex/tasks/deploy_block.yaml +# file: tasks/deploy_block.yaml - name: Get Release {{ item }} ansible.builtin.get_url: @@ -22,32 +22,6 @@ creates: "{{ trex_target_dir }}/trex-core-{{ item }}/linux_dpdk/" register: trex_extracted -- name: Patch Azure - ansible.builtin.patch: - src: "files/t-rex.patch" - basedir: "{{ trex_target_dir }}/trex-core-{{ item }}" - strip: 1 - when: - - azure is defined and item == "2.73" - -- 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 - ansible.builtin.command: "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9" - when: trex_extracted.changed - -- name: Switch to g++-9 - ansible.builtin.command: "update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9" - when: trex_extracted.changed - - name: Compile Release {{ item }} Part I ansible.builtin.command: "./b configure" args: @@ -72,14 +46,6 @@ retries: 300 when: trex_extracted.changed -- name: Switch to gcc-11 - ansible.builtin.command: "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11" - when: trex_extracted.changed - -- name: Switch to g++-11 - ansible.builtin.command: "update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11" - when: trex_extracted.changed - - name: Compile Release {{ item }} Part III ansible.builtin.command: "make -j 16" args: diff --git a/fdio.infra.ansible/roles/trex/tasks/main.yaml b/fdio.infra.ansible/roles/trex/tasks/main.yaml index 5cdf041a14..d0509f7544 100644 --- a/fdio.infra.ansible/roles/trex/tasks/main.yaml +++ b/fdio.infra.ansible/roles/trex/tasks/main.yaml @@ -1,5 +1,5 @@ --- -# file: roles/trex/tasks/main.yaml +# file: tasks/main.yaml - name: Update Package Cache (APT) ansible.builtin.apt: diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 1a4b10d441..fcb1ca965f 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -189,7 +189,7 @@ class Constants: DOCKER_SUT_IMAGE_UBUNTU_ARM = u"csit_sut-ubuntu2204:local" # TRex install directory - TREX_INSTALL_DIR = u"/opt/trex-core-3.00" + TREX_INSTALL_DIR = u"/opt/trex-core-3.03" # TRex pcap files directory TREX_PCAP_DIR = f"{TREX_INSTALL_DIR}/scripts/avl" -- 2.16.6