X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ft-rex%2Ft-rex-stateless.py;h=21f3274af5f2c666148527e390f480ca0649d65f;hp=95c6cb150af61cfa9f39ee028c63a68c995a4e40;hb=318577024edcd1e54b9b4315e610fbacc8403511;hpb=490256818796108eb9fc169fc477517c490c5d6a

diff --git a/resources/tools/t-rex/t-rex-stateless.py b/resources/tools/t-rex/t-rex-stateless.py
index 95c6cb150a..21f3274af5 100755
--- a/resources/tools/t-rex/t-rex-stateless.py
+++ b/resources/tools/t-rex/t-rex-stateless.py
@@ -134,19 +134,19 @@ def create_streams_v46(base_pkt_a, base_pkt_b, vm1, vm2, frame_size):
             max(0, fsize_no_fcs-len(base_pkt_b))))
         lat_stream1 = STLStream(packet=pkt_lat_a,
                                 flow_stats=STLFlowLatencyStats(pg_id=0),
-                                mode=STLTXCont(pps=1000))
+                                mode=STLTXCont(pps=9000))
         # second traffic stream with a phase of 10ns (inter stream gap)
         lat_stream2 = STLStream(packet=pkt_lat_b,
                                 isg=10.0,
                                 flow_stats=STLFlowLatencyStats(pg_id=1),
-                                mode=STLTXCont(pps=1000))
+                                mode=STLTXCont(pps=9000))
 
         stream1 = STLStream(packet=pkt_a,
-                            mode=STLTXCont(pps=1000))
+                            mode=STLTXCont(pps=9000))
         # second traffic stream with a phase of 10ns (inter stream gap)
         stream2 = STLStream(packet=pkt_b,
                             isg=10.0,
-                            mode=STLTXCont(pps=1000))
+                            mode=STLTXCont(pps=9000))
     elif type(frame_size) is str:
         lat_stream1 = []
         lat_stream2 = []
@@ -315,6 +315,34 @@ def create_streams_v6(traffic_options, frame_size=78):
 
     return create_streams_v46(base_pkt_a, base_pkt_b, vm1, vm2, frame_size)
 
+def fmt_latency(lat_min, lat_avg, lat_max):
+    """ Return formatted, rounded latency
+
+    :param lat_min: Min latency
+    :param lat_avg: Average latency
+    :param lat_max: Max latency
+    :type lat_min: string
+    :type lat_avg: string
+    :type lat_max: string
+    :return: Formatted and rounded output "min/avg/max"
+    :rtype: string
+    """
+
+    try:
+        t_min = int(round(float(lat_min)))
+    except ValueError:
+        t_min = int(-1)
+    try:
+        t_avg = int(round(float(lat_avg)))
+    except ValueError:
+        t_avg = int(-1)
+    try:
+        t_max = int(round(float(lat_max)))
+    except ValueError:
+        t_max = int(-1)
+
+    return "/".join(str(tmp) for tmp in (t_min, t_avg, t_max))
+
 def simple_burst(stream_a, stream_b, stream_lat_a, stream_lat_b, duration, rate,
                  warmup_time, async_start, latency):
     """Run the traffic with specific parameters.
@@ -347,8 +375,8 @@ def simple_burst(stream_a, stream_b, stream_lat_a, stream_lat_b, duration, rate,
     total_sent = 0
     lost_a = 0
     lost_b = 0
-    lat_a = "0/0/0"
-    lat_b = "0/0/0"
+    lat_a = "-1/-1/-1"
+    lat_b = "-1/-1/-1"
 
     try:
         # turn this off if too many logs
@@ -364,8 +392,13 @@ def simple_burst(stream_a, stream_b, stream_lat_a, stream_lat_b, duration, rate,
         client.add_streams(stream_b, ports=[1])
 
         if latency:
-            client.add_streams(stream_lat_a, ports=[0])
-            client.add_streams(stream_lat_b, ports=[1])
+            try:
+                client.add_streams(stream_lat_a, ports=[0])
+                client.add_streams(stream_lat_b, ports=[1])
+            except:
+                #Disable latency if NIC does not support requested stream type
+                print "##### FAILED to add latency streams #####"
+                latency = False
 
         #warmup phase
         if warmup_time > 0:
@@ -420,14 +453,14 @@ def simple_burst(stream_a, stream_b, stream_lat_a, stream_lat_b, duration, rate,
             lost_b = stats[1]["opackets"] - stats[0]["ipackets"]
 
             if latency:
-                lat_a = "/".join((\
+                lat_a = fmt_latency(\
                     str(stats["latency"][0]["latency"]["total_min"]),\
                     str(stats["latency"][0]["latency"]["average"]),\
-                    str(stats["latency"][0]["latency"]["total_max"])))
-                lat_b = "/".join((\
+                    str(stats["latency"][0]["latency"]["total_max"]))
+                lat_b = fmt_latency(\
                     str(stats["latency"][1]["latency"]["total_min"]),\
                     str(stats["latency"][1]["latency"]["average"]),\
-                    str(stats["latency"][1]["latency"]["total_max"])))
+                    str(stats["latency"][1]["latency"]["total_max"]))
 
             total_sent = stats[0]["opackets"] + stats[1]["opackets"]
             total_rcvd = stats[0]["ipackets"] + stats[1]["ipackets"]