From 3744273d8f1540fe45312b5c3a4e2e6f8b21a81f Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 6 Jun 2016 06:48:06 +0100 Subject: [PATCH] Update T-rex to v2.03 part II - JIRA: CSIT-132 - Update Trex via autoinstall script Change-Id: I65753b35287d9322ef230642ea0dd3596f1da5c9 Signed-off-by: pmikus --- resources/libraries/python/TrafficGenerator.py | 86 +++++++++++++------------- resources/tools/t-rex/t-rex-installer.sh | 2 +- resources/tools/t-rex/t-rex-stateless-stop.py | 2 +- resources/tools/t-rex/t-rex-stateless.py | 2 +- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index ddd0ff3577..127b5b1d9b 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -16,6 +16,7 @@ from robot.api import logger from robot.libraries.BuiltIn import BuiltIn +from resources.libraries.python.constants import Constants from resources.libraries.python.ssh import SSH from resources.libraries.python.topology import NodeType from resources.libraries.python.topology import NodeSubTypeTG @@ -139,18 +140,19 @@ class TrafficGenerator(object): self._node = tg_node if tg_node['subtype'] == NodeSubTypeTG.TREX: - trex_path = "/opt/trex-core-2.00" + 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=600) -# 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 '{}/resources/tools/t-rex/" + "t-rex-installer.sh'".format(Constants.REMOTE_FW_DIR), + timeout=1800) + 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) @@ -198,9 +200,7 @@ class TrafficGenerator(object): raise RuntimeError('trex config generation error') (ret, stdout, stderr) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && " - "sudo ./trex-cfg'"\ - .format(trex_path)) + "sh -c 'cd {0}/scripts/ && sudo ./trex-cfg'".format(trex_path)) if int(ret) != 0: logger.error('trex-cfg failed: {0}'.format(stdout + stderr)) raise RuntimeError('trex-cfg failed') @@ -247,8 +247,8 @@ class TrafficGenerator(object): ssh.connect(node) (ret, stdout, stderr) = ssh.exec_command( - "sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-stateless-stop.py'") + "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) @@ -288,44 +288,44 @@ class TrafficGenerator(object): if traffic_type in ["3-node-xconnect", "3-node-bridge"]: (ret, stdout, stderr) = ssh.exec_command( - "sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-stateless.py " - "--duration={0} -r {1} -s {2} " - "--p{3}_src_start_ip 10.10.10.1 " - "--p{3}_src_end_ip 10.10.10.254 " - "--p{3}_dst_start_ip 20.20.20.1 " - "--p{4}_src_start_ip 20.20.20.1 " - "--p{4}_src_end_ip 20.20.20.254 " - "--p{4}_dst_start_ip 10.10.10.1 " - "{5} --warmup_time={6}'".format(duration, rate, framesize, _p0, + "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " + "--duration={1} -r {2} -s {3} " + "--p{4}_src_start_ip 10.10.10.1 " + "--p{4}_src_end_ip 10.10.10.254 " + "--p{4}_dst_start_ip 20.20.20.1 " + "--p{5}_src_start_ip 20.20.20.1 " + "--p{5}_src_end_ip 20.20.20.254 " + "--p{5}_dst_start_ip 10.10.10.1 " + "{6} --warmup_time={7}'".format(Constants.REMOTE_FW_DIR, + duration, rate, framesize, _p0, _p1, _async, warmup_time), timeout=int(duration)+60) elif traffic_type in ["3-node-IPv4"]: (ret, stdout, stderr) = ssh.exec_command( - "sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-stateless.py " - "--duration={0} -r {1} -s {2} " - "--p{3}_src_start_ip 10.10.10.2 " - "--p{3}_src_end_ip 10.10.10.254 " - "--p{3}_dst_start_ip 20.20.20.2 " - "--p{4}_src_start_ip 20.20.20.2 " - "--p{4}_src_end_ip 20.20.20.254 " - "--p{4}_dst_start_ip 10.10.10.2 " - "{5} --warmup_time={6}'".format(duration, rate, framesize, _p0, + "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " + "--duration={1} -r {2} -s {3} " + "--p{4}_src_start_ip 10.10.10.2 " + "--p{4}_src_end_ip 10.10.10.254 " + "--p{4}_dst_start_ip 20.20.20.2 " + "--p{5}_src_start_ip 20.20.20.2 " + "--p{5}_src_end_ip 20.20.20.254 " + "--p{5}_dst_start_ip 10.10.10.2 " + "{6} --warmup_time={7}'".format(Constants.REMOTE_FW_DIR, + duration, rate, framesize, _p0, _p1, _async, warmup_time), timeout=int(duration)+60) elif traffic_type in ["3-node-IPv6"]: (ret, stdout, stderr) = ssh.exec_command( - "sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-stateless.py " - "--duration={0} -r {1} -s {2} -6 " - "--p{3}_src_start_ip 2001:1::2 " - "--p{3}_src_end_ip 2001:1::FE " - "--p{3}_dst_start_ip 2001:2::2 " - "--p{4}_src_start_ip 2001:2::2 " - "--p{4}_src_end_ip 2001:2::FE " - "--p{4}_dst_start_ip 2001:1::2 " - "{5} --warmup_time={6}'".format(duration, rate, framesize, _p0, + "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " + "--duration={1} -r {2} -s {3} -6 " + "--p{4}_src_start_ip 2001:1::2 " + "--p{4}_src_end_ip 2001:1::FE " + "--p{4}_dst_start_ip 2001:2::2 " + "--p{5}_src_start_ip 2001:2::2 " + "--p{5}_src_end_ip 2001:2::FE " + "--p{5}_dst_start_ip 2001:1::2 " + "{6} --warmup_time={7}'".format(Constants.REMOTE_FW_DIR, + duration, rate, framesize, _p0, _p1, _async, warmup_time), timeout=int(duration)+60) else: diff --git a/resources/tools/t-rex/t-rex-installer.sh b/resources/tools/t-rex/t-rex-installer.sh index 13b990072e..1bf665c2de 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.00" +TREX_VERSION="2.03" 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 e9accbe3ab..4f222a75b1 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.00/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.03/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 5a03273339..77895d7b68 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.00/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.03/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * -- 2.16.6