X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftrex%2Ftrex_stateless_stop.py;h=e8b6fdf96ccac4d40dbc23020f8f79bdbfef8a71;hp=778bd05e01a584e449584a19e8ea6fe650c0ec46;hb=6a80c9028d71a1502a2f2a64b4646af4c5958733;hpb=45393e98c3162faaa2fdc86ef471798a8e4bb5f2

diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 778bd05e01..e8b6fdf96c 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,76 +17,61 @@
 
 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 *
-
-
-def stop_all_traffic_streams():
-    """Stop traffic if any is running.
+sys.path.insert(0, "/opt/trex-core-2.61/scripts/automation/"+\
+                   "trex_control_plane/interactive/")
+from trex.stl.api import *
 
-    :return: nothing
-    """
-
-    # create client
-    client = STLClient(verbose_level=LoggerApi.VERBOSE_QUIET)
 
+def main():
+    """Stop traffic if any is running. Report xstats."""
+    client = STLClient()
     try:
         # connect to server
         client.connect()
 
         client.acquire(force=True)
+        # TODO: Support unidirection.
         client.stop(ports=[0, 1])
 
         # read the stats after the test
-        stats = client.get_stats()
-
-        print("#####statistics (approx.)#####")
-        print(json.dumps(stats, indent=4,
-                         separators=(',', ': '), sort_keys=True))
-
-        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))
-        sys.exit(1)
+        xstats0 = client.get_xstats(0)
+        xstats1 = client.get_xstats(1)
 
+    # If STLError happens, let the script fail with stack trace.
     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()
-
+    print("##### statistics port 0 #####")
+    print(json.dumps(xstats0, indent=4, separators=(',', ': ')))
+    print("##### statistics port 1 #####")
+    print(json.dumps(xstats1, indent=4, separators=(',', ': ')))
+
+    tx_0, rx_0 = xstats0["tx_good_packets"], xstats0["rx_good_packets"]
+    tx_1, rx_1 = xstats1["tx_good_packets"], xstats1["rx_good_packets"]
+    lost_a, lost_b = tx_0 - rx_1, tx_1 - rx_0
+
+    print("\npackets lost from 0 --> 1:   {0} pkts".format(lost_a))
+    print("packets lost from 1 --> 0:   {0} pkts".format(lost_b))
+
+    total_rcvd, total_sent = rx_0 + rx_1, tx_0 + tx_1
+    total_lost = total_sent - total_rcvd
+    # TODO: Add latency.
+    print(
+        "rate='unknown', totalReceived={rec}, totalSent={sen}, frameLoss={los},"
+        " latencyStream0(usec)=-1/-1/-1, latencyStream1(usec)=-1/-1/-1,"
+        " targetDuration='manual'".format(
+            rec=total_rcvd, sen=total_sent, los=total_lost))
 
 if __name__ == "__main__":
     main()