X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftrex%2Ftrex_stateless_stop.py;h=d4461ffd395e2683030c093d0838e5d9a65dedd6;hb=b41156890e8871e8f9cd1f57cca7a6fe9ef3f3fa;hp=9ded59a041470ecef7dd513349e5a6651a5c1da7;hpb=dc3efb44b1b30554f2aa46752cf0db119b79ee6c;p=csit.git

diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 9ded59a041..d4461ffd39 100755
--- a/resources/tools/trex/trex_stateless_stop.py
+++ b/resources/tools/trex/trex_stateless_stop.py
@@ -23,42 +23,81 @@ Requirements:
 
 Functionality:
 1. Stop any running traffic
+2. Optionally restore reference counter values.
+3. Return conter differences.
 """
 
-import sys
+import argparse
 import json
+import sys
+
+from collections import OrderedDict  # Needed to parse xstats representation.
 
-sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\
-                   "trex_control_plane/interactive/")
+sys.path.insert(
+    0, u"/opt/trex-core-2.73/scripts/automation/trex_control_plane/interactive/"
+)
 from trex.stl.api import *
 
 
 def main():
-    """Stop traffic if any is running."""
+    """Stop traffic if any is running. Report xstats."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        u"--xstat0", type=str, default=u"",
+        help=u"Reference xstat object if any."
+    )
+    parser.add_argument(
+        u"--xstat1", type=str, default=u"",
+        help=u"Reference xstat object if any."
+    )
+    args = parser.parse_args()
+
     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=(',', ': ')))
-
-        lost_a = stats[0]["opackets"] - stats[1]["ipackets"]
-        lost_b = stats[1]["opackets"] - stats[0]["ipackets"]
+        # Read the stats after the test,
+        # we need to update values before the last trial started.
+        if args.xstat0:
+            snapshot = eval(args.xstat0)
+            client.ports[0].get_xstats().reference_stats = snapshot
+        if args.xstat1:
+            snapshot = eval(args.xstat1)
+            client.ports[1].get_xstats().reference_stats = snapshot
+        # Now we can call the official method to get differences.
+        xstats0 = client.get_xstats(0)
+        xstats1 = client.get_xstats(1)
 
-        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(ex_error, file=sys.stderr)
-        sys.exit(1)
+    # If STLError happens, let the script fail with stack trace.
     finally:
         client.disconnect()
 
-if __name__ == "__main__":
+    print(u"##### statistics port 0 #####")
+    print(json.dumps(xstats0, indent=4, separators=(u",", u": ")))
+    print(u"##### statistics port 1 #####")
+    print(json.dumps(xstats1, indent=4, separators=(u",", u": ")))
+
+    tx_0, rx_0 = xstats0[u"tx_good_packets"], xstats0[u"rx_good_packets"]
+    tx_1, rx_1 = xstats1[u"tx_good_packets"], xstats1[u"rx_good_packets"]
+    lost_a, lost_b = tx_0 - rx_1, tx_1 - rx_0
+
+    print(f"\npackets lost from 0 --> 1:   {lost_a} pkts")
+    print(f"packets lost from 1 --> 0:   {lost_b} pkts")
+
+    total_rcvd, total_sent = rx_0 + rx_1, tx_0 + tx_1
+    total_lost = total_sent - total_rcvd
+    # TODO: Add latency.
+    print(
+        f"rate='unknown', totalReceived={total_rcvd}, totalSent={total_sent}, "
+        f"frameLoss={total_lost}, latencyStream0(usec)=-1/-1/-1, "
+        f"latencyStream1(usec)=-1/-1/-1, targetDuration='manual'"
+    )
+
+
+if __name__ == u"__main__":
     main()