diff options
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 16 | ||||
| -rwxr-xr-x | resources/tools/t-rex/t-rex-installer.sh | 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 |
4 files changed, 11 insertions, 11 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 3f5cbe6675..ddd0ff3577 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -139,18 +139,18 @@ class TrafficGenerator(object): self._node = tg_node if tg_node['subtype'] == NodeSubTypeTG.TREX: - trex_path = "/opt/trex-core-2.03" + trex_path = "/opt/trex-core-2.00" ssh = SSH() ssh.connect(tg_node) - (ret, stdout, stderr) = ssh.exec_command( - "sudo sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-installer.sh'", timeout=300) - if int(ret) != 0: - logger.error('trex installation failed: {0}'.format( - stdout + stderr)) - raise RuntimeError('Installation of TG failed') +# (ret, stdout, stderr) = ssh.exec_command( +# "sudo sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" +# "t-rex-installer.sh'", timeout=600) +# if int(ret) != 0: +# logger.error('trex installation failed: {0}'.format( +# stdout + stderr)) +# raise RuntimeError('Installation of TG failed') if1_pci = topo.get_interface_pci_addr(tg_node, tg_if1) if2_pci = topo.get_interface_pci_addr(tg_node, tg_if2) diff --git a/resources/tools/t-rex/t-rex-installer.sh b/resources/tools/t-rex/t-rex-installer.sh index 1bf665c2de..13b990072e 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.03" +TREX_VERSION="2.00" 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-stateless-stop.py b/resources/tools/t-rex/t-rex-stateless-stop.py index 4f222a75b1..e9accbe3ab 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.03/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.00/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 77895d7b68..5a03273339 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.03/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.00/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * |