From 9f35c00b6df316585dec0664ad761dced5c2c9e8 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 15 Mar 2021 19:45:04 +0000 Subject: Perf: Bump T-Rex to 2.88 + Mellanox 4.6 is not for Ubuntu 20.04 + Mellanox for ubuntu 20.04 is 4.9+ + T-Rex 2.86 is not for Mellanox 4.6+ + T-Rex for Mellanox 5.2 is 2.88+ ================================== = Bump Signed-off-by: pmikus Change-Id: I902dfc2a43e6718b385e89f31a34260e09d61bd3 (cherry picked from commit 6ec31b8aa67f4af2b963b3984f047e94ba790b3d) (cherry picked from commit aadd201ba28d44660dd86a77dc7248910973cc12) --- 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 +- GPL/traffic_profiles/trex/profile_trex_astf_base_class.py | 2 +- resources/libraries/python/Constants.py | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GPL/tools/trex/trex_astf_assert.py b/GPL/tools/trex/trex_astf_assert.py index d6d74bcff8..1a2e38810c 100644 --- a/GPL/tools/trex/trex_astf_assert.py +++ b/GPL/tools/trex/trex_astf_assert.py @@ -28,7 +28,7 @@ Functionality: import sys sys.path.insert( - 0, u"/opt/trex-core-2.82/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" ) from trex.astf.api import * diff --git a/GPL/tools/trex/trex_astf_profile.py b/GPL/tools/trex/trex_astf_profile.py index 63831e4bf4..df0cbccce2 100644 --- a/GPL/tools/trex/trex_astf_profile.py +++ b/GPL/tools/trex/trex_astf_profile.py @@ -24,7 +24,7 @@ import sys import time sys.path.insert( - 0, u"/opt/trex-core-2.82/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" ) from trex.astf.api import * diff --git a/GPL/tools/trex/trex_astf_stop.py b/GPL/tools/trex/trex_astf_stop.py index d9784e661a..7e4d5ceeee 100644 --- a/GPL/tools/trex/trex_astf_stop.py +++ b/GPL/tools/trex/trex_astf_stop.py @@ -34,7 +34,7 @@ import sys from collections import OrderedDict # Needed to parse xstats representation. sys.path.insert( - 0, u"/opt/trex-core-2.82/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" ) from trex.astf.api import * diff --git a/GPL/tools/trex/trex_stl_assert.py b/GPL/tools/trex/trex_stl_assert.py index 7c7e9215b8..ca92ad27e4 100644 --- a/GPL/tools/trex/trex_stl_assert.py +++ b/GPL/tools/trex/trex_stl_assert.py @@ -28,7 +28,7 @@ Functionality: import sys sys.path.insert( - 0, u"/opt/trex-core-2.82/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" ) from trex.stl.api import * diff --git a/GPL/tools/trex/trex_stl_profile.py b/GPL/tools/trex/trex_stl_profile.py index ea001b58b6..e0a7b6cdbd 100644 --- a/GPL/tools/trex/trex_stl_profile.py +++ b/GPL/tools/trex/trex_stl_profile.py @@ -24,7 +24,7 @@ import sys import time sys.path.insert( - 0, u"/opt/trex-core-2.82/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" ) from trex.stl.api import * diff --git a/GPL/tools/trex/trex_stl_stop.py b/GPL/tools/trex/trex_stl_stop.py index f07479da8a..2c34618bd1 100644 --- a/GPL/tools/trex/trex_stl_stop.py +++ b/GPL/tools/trex/trex_stl_stop.py @@ -34,7 +34,7 @@ import sys from collections import OrderedDict # Needed to parse xstats representation. sys.path.insert( - 0, u"/opt/trex-core-2.82/scripts/automation/trex_control_plane/interactive/" + 0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/" ) from trex.stl.api import * 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 913a44754c..f1d291105f 100644 --- a/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py +++ b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py @@ -123,7 +123,7 @@ class TrafficProfileBaseClass: """ self.framesize = kwargs[u"framesize"] self._pcap_dir = kwargs.get( - u"pcap_dir",u"/opt/trex-core-2.82/scripts/avl" + u"pcap_dir",u"/opt/trex-core-2.88/scripts/avl" ) return self.create_profile() diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index faf861d89d..77f6982f56 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -185,7 +185,7 @@ class Constants: DOCKER_SUT_IMAGE_UBUNTU_ARM = u"snergster/csit-arm-sut:latest" # TRex install directory - TREX_INSTALL_DIR = u"/opt/trex-core-2.82" + TREX_INSTALL_DIR = u"/opt/trex-core-2.88" # TODO: Find the right way how to use it in trex profiles # TRex pcap files directory -- cgit 1.2.3-korg