X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftrex%2Ftrex_stateless_stop.py;h=9ded59a041470ecef7dd513349e5a6651a5c1da7;hb=refs%2Fchanges%2F01%2F20001%2F3;hp=67dd2d277e8b4d3f1ba6c3e1a1d7f4bf6cd76bc9;hpb=ab94abd6fea7e4015c3fdc3130beb35b59582d58;p=csit.git

diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 67dd2d277e..9ded59a041 100755
--- a/resources/tools/trex/trex_stateless_stop.py
+++ b/resources/tools/trex/trex_stateless_stop.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,32 +17,25 @@
 
 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.34/scripts/automation/"+\
-                   "trex_control_plane/stl/")
-from trex_stl_lib.api import *
-
-
-def stop_all_traffic_streams():
-    """Stop traffic if any is running.
-
-    :return: nothing
-    """
+sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\
+                   "trex_control_plane/interactive/")
+from trex.stl.api import *
 
-    # create client
-    client = STLClient(verbose_level=LoggerApi.VERBOSE_QUIET)
 
+def main():
+    """Stop traffic if any is running."""
+    client = STLClient()
     try:
         # connect to server
         client.connect()
@@ -54,39 +47,18 @@ def stop_all_traffic_streams():
         stats = client.get_stats()
 
         print("#####statistics (approx.)#####")
-        print(json.dumps(stats, indent=4,
-                         separators=(',', ': '), sort_keys=True))
+        print(json.dumps(stats, indent=4, separators=(',', ': ')))
 
         lost_a = stats[0]["opackets"] - stats[1]["ipackets"]
         lost_b = stats[1]["opackets"] - stats[0]["ipackets"]
 
         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))
+        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."""
-
-    stop_all_traffic_streams()
-
-
 if __name__ == "__main__":
     main()