From b7b9a6f73347fba29060f3c2a2abfc4ea411de68 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 3 Jun 2016 08:00:59 +0100 Subject: PATCH: Revert to T-rex version to v2.00 - Revert T-rex version to v2.00 without installation from robot Change-Id: I8d0c5fb57f01febc970d9fc9363965acd2e57ed4 Signed-off-by: pmikus --- resources/libraries/python/TrafficGenerator.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'resources/libraries/python/TrafficGenerator.py') 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) -- cgit 1.2.3-korg