pkt_gen: rename throughput_tx_* to tx_rate_*

[vswitchperf.git] / tools / pkt_gen / dummy / dummy.py

diff --git a/tools/pkt_gen/dummy/dummy.py b/tools/pkt_gen/dummy/dummy.py
index f9ad1c8..dab59be 100755 (executable)
--- a/tools/pkt_gen/dummy/dummy.py
+++ b/tools/pkt_gen/dummy/dummy.py
@@ -104,7 +104,7 @@ class Dummy(trafficgen.ITrafficGenerator):
         """
         pass
 
-    def send_burst_traffic(self, traffic=None, numpkts=100, time=20, framerate=100):
+    def send_burst_traffic(self, traffic=None, numpkts=100, duration=20):
         """
         Send a burst of traffic.
         """
@@ -116,7 +116,7 @@ class Dummy(trafficgen.ITrafficGenerator):
 
         results = get_user_traffic(
             'burst',
-            '%dpkts, %dmS' % (numpkts, time),
+            '%dpkts, %dmS' % (numpkts, duration),
             traffic_,
             ('frames rx', 'payload errors', 'sequence errors'))
 
@@ -133,8 +133,7 @@ class Dummy(trafficgen.ITrafficGenerator):
 
         return trafficgen.BurstResult(*results)
 
-    def send_cont_traffic(self, traffic=None, time=20, framerate=0,
-                          multistream=False):
+    def send_cont_traffic(self, traffic=None, duration=30, multistream=False):
         """
         Send a continuous flow of traffic.
         """
@@ -146,8 +145,8 @@ class Dummy(trafficgen.ITrafficGenerator):
 
         results = get_user_traffic(
             'continuous',
-            '%dmS, %dmpps, multistream %s' % (time, framerate,
-                                              multistream), traffic_,
+            '%dmpps, multistream %s duration %d' % (traffic['frame_rate'],
+                                                    multistream, duration), traffic_,
             ('frames tx', 'frames rx', 'min latency', 'max latency',
              'avg latency'))
 
@@ -155,13 +154,13 @@ class Dummy(trafficgen.ITrafficGenerator):
 
         # builds results by using user-supplied values where possible
         # and guessing remainder using available info
-        result[ResultsConstants.THROUGHPUT_TX_FPS] = float(results[0]) / time
-        result[ResultsConstants.THROUGHPUT_RX_FPS] = float(results[1]) / time
-        result[ResultsConstants.THROUGHPUT_TX_MBPS] = (float(results[0]) \
-                                                      * framesize) / time
+        result[ResultsConstants.TX_RATE_FPS] = float(results[0]) / duration
+        result[ResultsConstants.THROUGHPUT_RX_FPS] = float(results[1]) / duration
+        result[ResultsConstants.TX_RATE_MBPS] = (float(results[0]) \
+                                                      * framesize) / duration
         result[ResultsConstants.THROUGHPUT_RX_MBPS] = (float(results[1]) \
-                                                      * framesize) / time
-        result[ResultsConstants.THROUGHPUT_TX_PERCENT] = 0.0
+                                                      * framesize) / duration
+        result[ResultsConstants.TX_RATE_PERCENT] = 0.0
         result[ResultsConstants.THROUGHPUT_RX_PERCENT] = 0.0
         result[ResultsConstants.MIN_LATENCY_NS] = float(results[2])
         result[ResultsConstants.MAX_LATENCY_NS] = float(results[3])
@@ -193,15 +192,15 @@ class Dummy(trafficgen.ITrafficGenerator):
 
         # builds results by using user-supplied values where possible
         # and guessing remainder using available info
-        result[ResultsConstants.THROUGHPUT_TX_FPS] = float(results[0]) \
+        result[ResultsConstants.TX_RATE_FPS] = float(results[0]) \
                                                      / duration
         result[ResultsConstants.THROUGHPUT_RX_FPS] = float(results[1]) \
                                                      / duration
-        result[ResultsConstants.THROUGHPUT_TX_MBPS] = (float(results[0]) \
+        result[ResultsConstants.TX_RATE_MBPS] = (float(results[0]) \
                                                       * framesize) / duration
         result[ResultsConstants.THROUGHPUT_RX_MBPS] = (float(results[1]) \
                                                       * framesize) / duration
-        result[ResultsConstants.THROUGHPUT_TX_PERCENT] = 0.0
+        result[ResultsConstants.TX_RATE_PERCENT] = 0.0
         result[ResultsConstants.THROUGHPUT_RX_PERCENT] = 0.0
         result[ResultsConstants.MIN_LATENCY_NS] = float(results[2])
         result[ResultsConstants.MAX_LATENCY_NS] = float(results[3])