diff options
Diffstat (limited to 'tools/pkt_gen')
| -rwxr-xr-x | tools/pkt_gen/dummy/dummy.py | 12 | ||||
| -rwxr-xr-x | tools/pkt_gen/ixia/ixia.py | 6 | ||||
| -rwxr-xr-x | tools/pkt_gen/ixnet/ixnet.py | 6 | ||||
| -rw-r--r-- | tools/pkt_gen/testcenter/testcenter.py | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/tools/pkt_gen/dummy/dummy.py b/tools/pkt_gen/dummy/dummy.py index 33c7eec9..dab59bea 100755 --- a/tools/pkt_gen/dummy/dummy.py +++ b/tools/pkt_gen/dummy/dummy.py @@ -154,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]) / duration + 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]) @@ -192,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]) diff --git a/tools/pkt_gen/ixia/ixia.py b/tools/pkt_gen/ixia/ixia.py index 0bf21414..10ed1fb2 100755 --- a/tools/pkt_gen/ixia/ixia.py +++ b/tools/pkt_gen/ixia/ixia.py @@ -294,10 +294,10 @@ class Ixia(trafficgen.ITrafficGenerator): # addition, IxExplorer does not support latency or % line rate # metrics so we have to return dummy values for these metrics result_dict[ResultsConstants.THROUGHPUT_RX_FPS] = result[4] - result_dict[ResultsConstants.THROUGHPUT_TX_FPS] = result[5] + result_dict[ResultsConstants.TX_RATE_FPS] = result[5] result_dict[ResultsConstants.THROUGHPUT_RX_MBPS] = result[6] - result_dict[ResultsConstants.THROUGHPUT_TX_MBPS] = result[7] - result_dict[ResultsConstants.THROUGHPUT_TX_PERCENT] = \ + result_dict[ResultsConstants.TX_RATE_MBPS] = result[7] + result_dict[ResultsConstants.TX_RATE_PERCENT] = \ ResultsConstants.UNKNOWN_VALUE result_dict[ResultsConstants.THROUGHPUT_RX_PERCENT] = \ ResultsConstants.UNKNOWN_VALUE diff --git a/tools/pkt_gen/ixnet/ixnet.py b/tools/pkt_gen/ixnet/ixnet.py index 9a705f44..aaedf05a 100755 --- a/tools/pkt_gen/ixnet/ixnet.py +++ b/tools/pkt_gen/ixnet/ixnet.py @@ -363,11 +363,11 @@ class IxNet(trafficgen.ITrafficGenerator): prev_percent_rx = \ float(results.get(ResultsConstants.THROUGHPUT_RX_FPS)) if float(row[5]) >= prev_percent_rx: - results[ResultsConstants.THROUGHPUT_TX_FPS] = tx_fps + results[ResultsConstants.TX_RATE_FPS] = tx_fps results[ResultsConstants.THROUGHPUT_RX_FPS] = row[5] - results[ResultsConstants.THROUGHPUT_TX_MBPS] = tx_mbps + results[ResultsConstants.TX_RATE_MBPS] = tx_mbps results[ResultsConstants.THROUGHPUT_RX_MBPS] = row[6] - results[ResultsConstants.THROUGHPUT_TX_PERCENT] = row[3] + results[ResultsConstants.TX_RATE_PERCENT] = row[3] results[ResultsConstants.THROUGHPUT_RX_PERCENT] = row[4] results[ResultsConstants.MIN_LATENCY_NS] = row[11] results[ResultsConstants.MAX_LATENCY_NS] = row[12] diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py index 3579b3f7..4ba5bc89 100644 --- a/tools/pkt_gen/testcenter/testcenter.py +++ b/tools/pkt_gen/testcenter/testcenter.py @@ -140,11 +140,11 @@ class TestCenter(trafficgen.ITrafficGenerator): csvreader = csv.DictReader(csvfile) for row in csvreader: print("Row: %s" % row) - result[ResultsConstants.THROUGHPUT_TX_FPS] = 0.0 + result[ResultsConstants.TX_RATE_FPS] = 0.0 result[ResultsConstants.THROUGHPUT_RX_FPS] = 0.0 - result[ResultsConstants.THROUGHPUT_TX_MBPS] = 0.0 + result[ResultsConstants.TX_RATE_MBPS] = 0.0 result[ResultsConstants.THROUGHPUT_RX_MBPS] = 0.0 - result[ResultsConstants.THROUGHPUT_TX_PERCENT] = float(row["OfferedLoad(%)"]) + result[ResultsConstants.TX_RATE_PERCENT] = float(row["OfferedLoad(%)"]) result[ResultsConstants.THROUGHPUT_RX_PERCENT] = float(row["Throughput(%)"]) result[ResultsConstants.MIN_LATENCY_NS] = float(row["MinimumLatency(us)"]) * 1000 result[ResultsConstants.MAX_LATENCY_NS] = float(row["MaximumLatency(us)"]) * 1000 |