X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftrex%2Ftrex_server_info.py;h=b9574957a561215df41288eb7fbc22f55f552a30;hb=bab0b570345ceb6ffeaec9e47a50e62d7303387e;hp=ff1350d3066c32b8da9e389abde6fc0ea8bc2682;hpb=ab94abd6fea7e4015c3fdc3130beb35b59582d58;p=csit.git

diff --git a/resources/tools/trex/trex_server_info.py b/resources/tools/trex/trex_server_info.py
index ff1350d306..b9574957a5 100755
--- a/resources/tools/trex/trex_server_info.py
+++ b/resources/tools/trex/trex_server_info.py
@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-# 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,50 +28,25 @@ Functionality:
 
 import sys
 
-sys.path.insert(0, "/opt/trex-core-2.34/scripts/automation/"+\
-                   "trex_control_plane/stl/")
-from trex_stl_lib.api import *
+sys.path.insert(0, "/opt/trex-core-2.61/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
+def main():
+    """Check server info and quit."""
     client = STLClient()
-
     try:
         # connect to server
         client.connect()
-        # get server info
-        print client.get_server_system_info()
 
+        # get server info
+        print(client.get_server_system_info())
     except STLError as ex_error:
-        print_error(str(ex_error))
+        print(ex_error, file=sys.stderr)
         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()
-
-
 if __name__ == "__main__":
     main()