X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftrex%2Ftrex_stateless_stop.py;h=9421356bc1b814f35c3274236ac94048d2c688a9;hb=refs%2Fchanges%2F89%2F21489%2F2;hp=37988e72f4d1951cf2e2bf3122b4360b7ef14893;hpb=f90655a9efa6c97a8901ce5095bc64b0c7518739;p=csit.git

diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 37988e72f4..9421356bc1 100755
--- a/resources/tools/trex/trex_stateless_stop.py
+++ b/resources/tools/trex/trex_stateless_stop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,44 +33,45 @@ sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\
 from trex.stl.api import *
 
 
-def stop_all_traffic_streams():
-    """Stop traffic if any is running.
-
-    :return: nothing
-    """
-    # create client
+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))
+        xstats0 = client.get_xstats(0)
+        xstats1 = client.get_xstats(1)
 
-        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:
-        sys.stderr.write(str(ex_error))
-        sys.exit(1)
+    # If STLError happens, let the script fail with stack trace.
     finally:
         client.disconnect()
 
-
-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()