aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-01-04 09:56:37 +0100
committerPeter Mikus <pmikus@cisco.com>2018-01-04 11:24:34 +0000
commit45393e98c3162faaa2fdc86ef471798a8e4bb5f2 (patch)
treea4291b839f85d16a584a4c4c5d3c7e6647c90018 /resources/libraries/python
parentf4e3171ec87416266291170f7c9cd089a9d2d8e4 (diff)
CSIT-885 Updagrade TRex to v2.35
Change-Id: I82681fc9ea52d72323d48ac78507ef1c571ca712 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/python')
-rw-r--r--resources/libraries/python/TrafficGenerator.py5
-rw-r--r--resources/libraries/python/constants.py5
2 files changed, 7 insertions, 3 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index a8083381d1..698b67ead2 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -185,8 +185,9 @@ class TrafficGenerator(object):
ssh.connect(tg_node)
(ret, _, _) = ssh.exec_command(
- "sudo -E sh -c '{}/resources/tools/trex/"
- "trex_installer.sh'".format(Constants.REMOTE_FW_DIR),
+ "sudo -E sh -c '{0}/resources/tools/trex/"
+ "trex_installer.sh {1}'".format(Constants.REMOTE_FW_DIR,
+ Constants.TREX_INSTALL_VERSION),
timeout=1800)
if int(ret) != 0:
raise RuntimeError('TRex installation failed.')
diff --git a/resources/libraries/python/constants.py b/resources/libraries/python/constants.py
index 7ae9cdd06f..30f7531947 100644
--- a/resources/libraries/python/constants.py
+++ b/resources/libraries/python/constants.py
@@ -35,8 +35,11 @@ class Constants(object):
# QEMU install directory
QEMU_INSTALL_DIR = '/opt/qemu-2.5.0'
+ # TRex install version
+ TREX_INSTALL_VERSION = '2.35'
+
# TRex install directory
- TREX_INSTALL_DIR = '/opt/trex-core-2.34'
+ TREX_INSTALL_DIR = '/opt/trex-core-2.35'
# Kubernetes templates location
RESOURCES_TPL_K8S = 'resources/templates/kubernetes'