diff options
author | Tibor Frank <tifrank@cisco.com> | 2017-11-10 09:06:32 +0100 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2018-01-02 07:47:12 +0000 |
commit | ab94abd6fea7e4015c3fdc3130beb35b59582d58 (patch) | |
tree | a3cd8c99b04826a06061d1ec40c22ea9554f741c /resources/tools | |
parent | 7cb42e0a9f7785a7ffbc6076a1d5784b203cf9eb (diff) |
Upgrade to T-rex v2.34
Change-Id: I7e18ba8beaac507af376a859821ef7d571cbff80
Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources/tools')
-rwxr-xr-x | resources/tools/trex/trex_installer.sh | 3 | ||||
-rwxr-xr-x | resources/tools/trex/trex_server_info.py | 3 | ||||
-rwxr-xr-x | resources/tools/trex/trex_stateless_profile.py | 8 | ||||
-rwxr-xr-x | resources/tools/trex/trex_stateless_stop.py | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/resources/tools/trex/trex_installer.sh b/resources/tools/trex/trex_installer.sh index c9a41ce525..1e9b4ba734 100755 --- a/resources/tools/trex/trex_installer.sh +++ b/resources/tools/trex/trex_installer.sh @@ -1,6 +1,6 @@ #!/bin/sh -TREX_VERSION="2.29" +TREX_VERSION="2.34" TREX_DOWNLOAD_REPO="https://github.com/cisco-system-traffic-generator/trex-core/archive/" TREX_DOWNLOAD_PACKAGE="v${TREX_VERSION}.zip" @@ -34,4 +34,3 @@ test $? -eq 0 || exit 1 cd ${TREX_INSTALL_DIR}/linux_dpdk/ && ./b configure && ./b build || exit 1 cd ${TREX_INSTALL_DIR}/scripts/ko/src && make && make install || exit 1 - diff --git a/resources/tools/trex/trex_server_info.py b/resources/tools/trex/trex_server_info.py index 9a98637c3b..ff1350d306 100755 --- a/resources/tools/trex/trex_server_info.py +++ b/resources/tools/trex/trex_server_info.py @@ -28,7 +28,7 @@ Functionality: import sys -sys.path.insert(0, "/opt/trex-core-2.29/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.34/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * @@ -72,5 +72,6 @@ def main(): get_server_system_info() + if __name__ == "__main__": main() diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py index a3072cfaed..311c85f5d8 100755 --- a/resources/tools/trex/trex_stateless_profile.py +++ b/resources/tools/trex/trex_stateless_profile.py @@ -22,7 +22,7 @@ import sys import argparse import json -sys.path.insert(0, "/opt/trex-core-2.29/scripts/automation/" +sys.path.insert(0, "/opt/trex-core-2.34/scripts/automation/" "trex_control_plane/stl/") from trex_stl_lib.api import * @@ -109,11 +109,9 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, print("### Profile file:\n{}".format(profile_file)) profile = STLProfile.load(profile_file, direction=0, port_id=0, framesize=framesize) - print("\n### Profiles ###\n") - print(profile.dump_to_yaml()) streams = profile.get_streams() - except STLError: - print("Error while loading profile '{0}'\n".format(profile_file)) + except STLError as err: + print("Error while loading profile '{0}' {1}".format(profile_file, err)) sys.exit(1) try: diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py index 0a2aabfba2..67dd2d277e 100755 --- a/resources/tools/trex/trex_stateless_stop.py +++ b/resources/tools/trex/trex_stateless_stop.py @@ -29,7 +29,7 @@ Functionality: import sys import json -sys.path.insert(0, "/opt/trex-core-2.29/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.34/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * @@ -87,5 +87,6 @@ def main(): stop_all_traffic_streams() + if __name__ == "__main__": main() |