CSIT-1425 Upgrade TRex to v2.54

Change-Id: I71010c18210e88828ded0bc679997d76f34886cb
Signed-off-by: Peter Mikus <pmikus@cisco.com>

4 files changed, 21 insertions, 54 deletions

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 342abcdef2..4026ac6b19 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -119,7 +119,7 @@ rst_epilog = """
            vpp_prev_release='19.01',
            dpdkrelease='19.02',
            sdpdkrelease='1902',
-           trex_version='v2.35',
+           trex_version='v2.54',
            csit_ubuntu_ver='csit-ubuntu-16.04.1_2019-03-27_2.4',
            csit_centos_ver='csit-centos-7.6-1810_2019-04-15_2.4',
            vpp_release_commit_id='3d18a191aaf31ef8b1524ab80fed22a304adf75d')
diff --git a/resources/tools/trex/trex_server_info.py b/resources/tools/trex/trex_server_info.py
index e9de6f9413..da49bfc742 100755
--- a/resources/tools/trex/trex_server_info.py
+++ b/resources/tools/trex/trex_server_info.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -17,8 +17,8 @@
 
 Requirements:
 - T-REX: https://github.com/cisco-system-traffic-generator/trex-core
- - compiled and running T-REX process (eg. ./t-rex-64 -i -c 4)
- - trex_stl_lib.api library
+ - compiled and running T-REX process (eg. ./t-rex-64 -i)
+ - trex.stl.api library
 - Script must be executed on a node with T-REX instance
 
 Functionality:
@@ -28,17 +28,15 @@ Functionality:
 
 import sys
 
-sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/"+\
-                   "trex_control_plane/stl/")
-from trex_stl_lib.api import *
-
+sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\
+                   "trex_control_plane/interactive/")
+from trex.stl.api import *
 
 def get_server_system_info():
     """Check server info and quit.
 
     :return: nothing
     """
-
     # create client
     client = STLClient()
 
@@ -46,30 +44,16 @@ def get_server_system_info():
         # connect to server
         client.connect()
         # get server info
-        print client.get_server_system_info()
-
+        print(client.get_server_system_info())
     except STLError as ex_error:
-        print_error(str(ex_error))
+        sys.stderr.write(str(ex_error))
         sys.exit(1)
-
     finally:
         client.disconnect()
 
 
-def print_error(msg):
-    """Print error message on stderr.
-
-    :param msg: Error message to print.
-    :type msg: string
-    :return: nothing
-    """
-
-    sys.stderr.write(msg+'\n')
-
-
 def main():
     """Main function."""
-
     get_server_system_info()
 
 
diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py
index aa68a014b8..4b2d7701ce 100755
--- a/resources/tools/trex/trex_stateless_profile.py
+++ b/resources/tools/trex/trex_stateless_profile.py
@@ -22,10 +22,9 @@ import sys
 import argparse
 import json
 
-sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/"
-                   "trex_control_plane/stl/")
-
-from trex_stl_lib.api import *
+sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"
+                   "trex_control_plane/interactive/")
+from trex.stl.api import *
 
 
 def fmt_latency(lat_min, lat_avg, lat_max):
@@ -118,7 +117,7 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0,
 
     try:
         # Create the client:
-        client = STLClient(verbose_level=LoggerApi.VERBOSE_QUIET)
+        client = STLClient()
         # Connect to server:
         client.connect()
         # Prepare our ports (the machine has 0 <--> 1 with static route):
diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 778bd05e01..37988e72f4 100755
--- a/resources/tools/trex/trex_stateless_stop.py
+++ b/resources/tools/trex/trex_stateless_stop.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -17,21 +17,20 @@
 
 Requirements:
 - T-REX: https://github.com/cisco-system-traffic-generator/trex-core
- - compiled and running T-REX process (eg. ./t-rex-64 -i -c 4)
- - trex_stl_lib.api library
+ - compiled and running T-REX process (eg. ./t-rex-64 -i)
+ - trex.stl.api library
 - Script must be executed on a node with T-REX instance
 
 Functionality:
 1. Stop any running traffic
-
 """
 
 import sys
 import json
 
-sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/"+\
-                   "trex_control_plane/stl/")
-from trex_stl_lib.api import *
+sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\
+                   "trex_control_plane/interactive/")
+from trex.stl.api import *
 
 
 def stop_all_traffic_streams():
@@ -39,9 +38,8 @@ def stop_all_traffic_streams():
 
     :return: nothing
     """
-
     # create client
-    client = STLClient(verbose_level=LoggerApi.VERBOSE_QUIET)
+    client = STLClient()
 
     try:
         # connect to server
@@ -62,29 +60,15 @@ def stop_all_traffic_streams():
 
         print("\npackets lost from 0 --> 1:   {0} pkts".format(lost_a))
         print("packets lost from 1 --> 0:   {0} pkts".format(lost_b))
-
     except STLError as ex_error:
-        print_error(str(ex_error))
+        sys.stderr.write(str(ex_error))
         sys.exit(1)
-
     finally:
         client.disconnect()
 
 
-def print_error(msg):
-    """Print error message on stderr.
-
-    :param msg: Error message to print.
-    :type msg: string
-    :return: nothing
-    """
-
-    sys.stderr.write(msg+'\n')
-
-
 def main():
     """Main function."""
-
     stop_all_traffic_streams()