summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/results/results_constants.py12
-rwxr-xr-xtools/pkt_gen/dummy/dummy.py12
-rwxr-xr-xtools/pkt_gen/ixia/ixia.py6
-rwxr-xr-xtools/pkt_gen/ixnet/ixnet.py6
-rw-r--r--tools/pkt_gen/testcenter/testcenter.py6
5 files changed, 21 insertions, 21 deletions
diff --git a/core/results/results_constants.py b/core/results/results_constants.py
index 263e07a3..58086e32 100644
--- a/core/results/results_constants.py
+++ b/core/results/results_constants.py
@@ -27,11 +27,11 @@ class ResultsConstants(object):
#Traffic Constants
#RFC2544 Throughput & Continuous
- THROUGHPUT_TX_FPS = 'throughput_tx_fps'
+ TX_RATE_FPS = 'tx_rate_fps'
THROUGHPUT_RX_FPS = 'throughput_rx_fps'
- THROUGHPUT_TX_MBPS = 'throughput_tx_mbps'
+ TX_RATE_MBPS = 'tx_rate_mbps'
THROUGHPUT_RX_MBPS = 'throughput_rx_mbps'
- THROUGHPUT_TX_PERCENT = 'throughput_tx_percent'
+ TX_RATE_PERCENT = 'tx_rate_percent'
THROUGHPUT_RX_PERCENT = 'throughput_rx_percent'
MIN_LATENCY_NS = 'min_latency_ns'
MAX_LATENCY_NS = 'max_latency_ns'
@@ -67,11 +67,11 @@ class ResultsConstants(object):
ResultsConstants.ID,
ResultsConstants.PACKET_SIZE,
ResultsConstants.DEPLOYMENT,
- ResultsConstants.THROUGHPUT_TX_FPS,
+ ResultsConstants.TX_RATE_FPS,
ResultsConstants.THROUGHPUT_RX_FPS,
- ResultsConstants.THROUGHPUT_TX_MBPS,
+ ResultsConstants.TX_RATE_MBPS,
ResultsConstants.THROUGHPUT_RX_MBPS,
- ResultsConstants.THROUGHPUT_TX_PERCENT,
+ ResultsConstants.TX_RATE_PERCENT,
ResultsConstants.THROUGHPUT_RX_PERCENT,
ResultsConstants.MIN_LATENCY_NS,
ResultsConstants.MAX_LATENCY_NS,
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