aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-09-11 11:19:27 +0000
committerPeter Mikus <pmikus@cisco.com>2019-09-12 07:10:34 +0000
commit6a80c9028d71a1502a2f2a64b4646af4c5958733 (patch)
treeeae7a91f17c5677dcdf3e36356e8ab5bb64fa5be /resources
parent45882a2701df2349b3f53b8436aec530cbeeb614 (diff)
TRex: 2.61
- HDRhistogram can be rebased and used in separate patch. Signed-off-by: Peter Mikus <pmikus@cisco.com> Change-Id: Ic7ce752344c6e1791af7cf7b7effde65ac2be680
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/Constants.py5
-rw-r--r--resources/libraries/python/TrafficGenerator.py3
-rwxr-xr-xresources/tools/trex/trex_server_info.py2
-rwxr-xr-xresources/tools/trex/trex_stateless_profile.py2
-rwxr-xr-xresources/tools/trex/trex_stateless_stop.py2
5 files changed, 6 insertions, 8 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index b7f91930cb..9dd9a38e17 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -184,11 +184,8 @@ class Constants(object):
# Docker container arm SUT image
DOCKER_SUT_IMAGE_UBUNTU_ARM = 'snergster/csit-arm-sut:latest'
- # TRex install version
- TREX_INSTALL_VERSION = '2.54'
-
# TRex install directory
- TREX_INSTALL_DIR = '/opt/trex-core-2.54'
+ TREX_INSTALL_DIR = '/opt/trex-core-2.61'
# Honeycomb directory location at topology nodes:
REMOTE_HC_DIR = '/opt/honeycomb'
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index f2fac256fc..2e59459773 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -323,7 +323,8 @@ class TrafficGenerator(AbstractMeasurer):
self._node, cmd, sudo=True,
message='Unbind PCI ports from driver failed!')
- cmd = ("sh -c 'cd {dir}/scripts/ && ./trex-cfg'"
+ cmd = ("sh -c 'cd {dir}/scripts/ && ./trex-cfg "
+ "--unbind-unused-ports'"
.format(dir=Constants.TREX_INSTALL_DIR))
exec_cmd_no_error(
self._node, cmd, sudo=True, message='Config TRex failed!')
diff --git a/resources/tools/trex/trex_server_info.py b/resources/tools/trex/trex_server_info.py
index eaab6d794a..b9574957a5 100755
--- a/resources/tools/trex/trex_server_info.py
+++ b/resources/tools/trex/trex_server_info.py
@@ -28,7 +28,7 @@ Functionality:
import sys
-sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\
+sys.path.insert(0, "/opt/trex-core-2.61/scripts/automation/"+\
"trex_control_plane/interactive/")
from trex.stl.api import *
diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py
index 15e2157057..b8ee77c69a 100755
--- a/resources/tools/trex/trex_stateless_profile.py
+++ b/resources/tools/trex/trex_stateless_profile.py
@@ -22,7 +22,7 @@ import sys
import argparse
import json
-sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"
+sys.path.insert(0, "/opt/trex-core-2.61/scripts/automation/"
"trex_control_plane/interactive/")
from trex.stl.api import *
diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 9421356bc1..e8b6fdf96c 100755
--- a/resources/tools/trex/trex_stateless_stop.py
+++ b/resources/tools/trex/trex_stateless_stop.py
@@ -28,7 +28,7 @@ Functionality:
import sys
import json
-sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\
+sys.path.insert(0, "/opt/trex-core-2.61/scripts/automation/"+\
"trex_control_plane/interactive/")
from trex.stl.api import *