diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 11 | ||||
| -rwxr-xr-x | resources/tools/t-rex/t-rex-installer.sh | 2 | ||||
| -rwxr-xr-x | resources/tools/t-rex/t-rex-server-info.py | 2 | ||||
| -rwxr-xr-x | resources/tools/t-rex/t-rex-stateless-stop.py | 2 | ||||
| -rwxr-xr-x | resources/tools/t-rex/t-rex-stateless.py | 2 |
5 files changed, 6 insertions, 13 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 8387ce2b3c..c9cd971cf3 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -184,7 +184,7 @@ class TrafficGenerator(object): self._node = tg_node if tg_node['subtype'] == NodeSubTypeTG.TREX: - trex_path = "/opt/trex-core-2.22" + trex_path = "/opt/trex-core-2.25" ssh = SSH() ssh.connect(tg_node) @@ -322,9 +322,6 @@ class TrafficGenerator(object): (ret, stdout, stderr) = ssh.exec_command( "sh -c '{}/resources/tools/t-rex/" "t-rex-stateless-stop.py'".format(Constants.REMOTE_FW_DIR)) - logger.trace(ret) - logger.trace(stdout) - logger.trace(stderr) if int(ret) != 0: raise RuntimeError('T-rex stateless runtime error') @@ -712,14 +709,10 @@ class TrafficGenerator(object): duration, rate, framesize, _p0, _p1, _async, _latency, warmup_time), - timeout = int(duration) + 60) + timeout=int(duration) + 60) else: raise NotImplementedError('Unsupported traffic type') - logger.trace(ret) - logger.trace(stdout) - logger.trace(stderr) - if int(ret) != 0: raise RuntimeError('T-rex stateless runtime error') elif async_call: diff --git a/resources/tools/t-rex/t-rex-installer.sh b/resources/tools/t-rex/t-rex-installer.sh index 8090b75683..13891f14a1 100755 --- a/resources/tools/t-rex/t-rex-installer.sh +++ b/resources/tools/t-rex/t-rex-installer.sh @@ -1,6 +1,6 @@ #!/bin/sh -TREX_VERSION="2.22" +TREX_VERSION="2.25" 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/t-rex/t-rex-server-info.py b/resources/tools/t-rex/t-rex-server-info.py index 0ec447b726..ac7c7a5427 100755 --- a/resources/tools/t-rex/t-rex-server-info.py +++ b/resources/tools/t-rex/t-rex-server-info.py @@ -28,7 +28,7 @@ Functionality: import sys -sys.path.insert(0, "/opt/trex-core-2.22/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.25/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * diff --git a/resources/tools/t-rex/t-rex-stateless-stop.py b/resources/tools/t-rex/t-rex-stateless-stop.py index a7066293a9..0eee3e8cd5 100755 --- a/resources/tools/t-rex/t-rex-stateless-stop.py +++ b/resources/tools/t-rex/t-rex-stateless-stop.py @@ -28,7 +28,7 @@ Functionality: import sys -sys.path.insert(0, "/opt/trex-core-2.22/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.25/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * diff --git a/resources/tools/t-rex/t-rex-stateless.py b/resources/tools/t-rex/t-rex-stateless.py index ae8d187670..fdee81de72 100755 --- a/resources/tools/t-rex/t-rex-stateless.py +++ b/resources/tools/t-rex/t-rex-stateless.py @@ -48,7 +48,7 @@ import string import struct import sys -sys.path.insert(0, "/opt/trex-core-2.22/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.25/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * |