X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftrex%2Ftrex_stateless_stop.py;h=5e8721d28c72a1736c42c23c4a470af363d3f3f3;hb=16ef90a2415aa3b65341fdb6517cf58721bfff7a;hp=9421356bc1b814f35c3274236ac94048d2c688a9;hpb=ff820e3d53434889aacde2373314c3be8d00f765;p=csit.git

diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 9421356bc1..5e8721d28c 100755
--- a/resources/tools/trex/trex_stateless_stop.py
+++ b/resources/tools/trex/trex_stateless_stop.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -23,18 +23,35 @@ 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. 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
@@ -44,7 +61,15 @@ def main():
         # TODO: Support unidirection.
         client.stop(ports=[0, 1])
 
-        # read the stats after the test
+        # 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)
 
@@ -52,26 +77,28 @@ def main():
     finally:
         client.disconnect()
 
-    print("##### statistics port 0 #####")
-    print(json.dumps(xstats0, indent=4, separators=(',', ': ')))
-    print("##### statistics port 1 #####")
-    print(json.dumps(xstats1, indent=4, separators=(',', ': ')))
+    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["tx_good_packets"], xstats0["rx_good_packets"]
-    tx_1, rx_1 = xstats1["tx_good_packets"], xstats1["rx_good_packets"]
+    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("\npackets lost from 0 --> 1:   {0} pkts".format(lost_a))
-    print("packets lost from 1 --> 0:   {0} pkts".format(lost_b))
+    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(
-        "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))
+        f"rate='unknown', totalReceived={total_rcvd}, totalSent={total_sent}, "
+        f"frameLoss={total_lost}, targetDuration='manual', "
+        f"approximatedDuration='manual', approximatedRate='unknown', "
+        f"latencyStream0(usec)=-1/-1/-1, latencyStream1(usec)=-1/-1/-1"
+    )
+
 
-if __name__ == "__main__":
+if __name__ == u"__main__":
     main()