From 986a656c8ab1581a14a94d3dadf7bb7fc87764e5 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 3 Jun 2016 08:00:59 +0100 Subject: Update T-rex version to v2.03 with installation from robot - JIRA: CSIT-132 - Update T-rex version to v2.03 with installation from robot Change-Id: I7e222a61f88b1313273e6866dfc78d62b4d8ac93 Signed-off-by: pmikus --- resources/libraries/python/TrafficGenerator.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'resources/libraries/python/TrafficGenerator.py') diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 267f5d2f03..3f5cbe6675 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -132,8 +132,6 @@ class TrafficGenerator(object): :return: nothing """ - trex_path = "/opt/trex-core-2.02" - topo = Topology() if tg_node['type'] != NodeType.TG: @@ -141,9 +139,19 @@ class TrafficGenerator(object): self._node = tg_node if tg_node['subtype'] == NodeSubTypeTG.TREX: + trex_path = "/opt/trex-core-2.03" + 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') + if1_pci = topo.get_interface_pci_addr(tg_node, tg_if1) if2_pci = topo.get_interface_pci_addr(tg_node, tg_if2) if1_mac = topo.get_interface_mac(tg_node, tg_if1) -- cgit 1.2.3-korg