aboutsummaryrefslogtreecommitdiffstats
path: root/resources
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
parentf4e3171ec87416266291170f7c9cd089a9d2d8e4 (diff)
CSIT-885 Updagrade TRex to v2.35
Change-Id: I82681fc9ea52d72323d48ac78507ef1c571ca712 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/TrafficGenerator.py5
-rw-r--r--resources/libraries/python/constants.py5
-rwxr-xr-xresources/tools/trex/trex_installer.sh2
-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
6 files changed, 11 insertions, 7 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'
diff --git a/resources/tools/trex/trex_installer.sh b/resources/tools/trex/trex_installer.sh
index 1e9b4ba734..c0012a18cf 100755
--- a/resources/tools/trex/trex_installer.sh
+++ b/resources/tools/trex/trex_installer.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-TREX_VERSION="2.34"
+TREX_VERSION=$1
TREX_DOWNLOAD_REPO="https://github.com/cisco-system-traffic-generator/trex-core/archive/"
TREX_DOWNLOAD_PACKAGE="v${TREX_VERSION}.zip"
diff --git a/resources/tools/trex/trex_server_info.py b/resources/tools/trex/trex_server_info.py
index ff1350d306..e9de6f9413 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.34/scripts/automation/"+\
+sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/"+\
"trex_control_plane/stl/")
from trex_stl_lib.api import *
diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py
index 311c85f5d8..c792f3eb48 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.34/scripts/automation/"
+sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/"
"trex_control_plane/stl/")
from trex_stl_lib.api import *
diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 67dd2d277e..778bd05e01 100755
--- a/resources/tools/trex/trex_stateless_stop.py
+++ b/resources/tools/trex/trex_stateless_stop.py
@@ -29,7 +29,7 @@ Functionality:
import sys
import json
-sys.path.insert(0, "/opt/trex-core-2.34/scripts/automation/"+\
+sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/"+\
"trex_control_plane/stl/")
from trex_stl_lib.api import *