diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2017-02-02 11:45:16 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2017-02-09 06:21:43 +0000 |
| commit | b468094f7c9e2ecd32712fde46de46eeef4acc8f (patch) | |
| tree | 7efb3443740c0d9cb6bb7a629d28d0b2ed440c5e | |
| parent | 1fcfc9bcc91c9bf9f1ab10fab898efc0d8c1e25f (diff) | |
Upgrade T-rex to newer version
Change-Id: I8b918a3c1d8109fb64bfdeec8e5c9afe45a86d21
Signed-off-by: pmikus <pmikus@cisco.com>
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 4 | ||||
| -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, 6 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 86cf093656..47008bc22a 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.09" + trex_path = "/opt/trex-core-2.17" ssh = SSH() ssh.connect(tg_node) @@ -252,7 +252,7 @@ class TrafficGenerator(object): while max_startup_retries > 0: # kill T-rex only if it is already running (ret, _, _) = ssh.exec_command( - "sh -c 'pgrep t-rex && sudo pkill t-rex'") + "sh -c 'pgrep t-rex && sudo pkill t-rex && sleep 3'") # configure T-rex (ret, stdout, stderr) = ssh.exec_command( diff --git a/resources/tools/t-rex/t-rex-installer.sh b/resources/tools/t-rex/t-rex-installer.sh index e89b06f9b1..d21852c0f7 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.09" +TREX_VERSION="2.17" 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 2c66286e5f..891e4312db 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.09/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.17/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 ac963565d8..7fe4ab5432 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.09/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.17/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 24f4a99738..0a2d7df1f5 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.09/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.17/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * |