Code Review
/
nfvbench.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[NFVBENCH-168] Improve config properties managed after a REST call
[nfvbench.git]
/
nfvbench
/
traffic_gen
/
traffic_utils.py
diff --git
a/nfvbench/traffic_gen/traffic_utils.py
b/nfvbench/traffic_gen/traffic_utils.py
index
c875a5d
..
4366a6c
100644
(file)
--- a/
nfvbench/traffic_gen/traffic_utils.py
+++ b/
nfvbench/traffic_gen/traffic_utils.py
@@
-14,7
+14,6
@@
import bitmath
import bitmath
-from nfvbench.utils import multiplier_map
# IMIX frame size including the 4-byte FCS field
IMIX_L2_SIZES = [64, 594, 1518]
# IMIX frame size including the 4-byte FCS field
IMIX_L2_SIZES = [64, 594, 1518]
@@
-23,6
+22,11
@@
IMIX_RATIOS = [7, 4, 1]
IMIX_AVG_L2_FRAME_SIZE = sum(
[1.0 * imix[0] * imix[1] for imix in zip(IMIX_L2_SIZES, IMIX_RATIOS)]) / sum(IMIX_RATIOS)
IMIX_AVG_L2_FRAME_SIZE = sum(
[1.0 * imix[0] * imix[1] for imix in zip(IMIX_L2_SIZES, IMIX_RATIOS)]) / sum(IMIX_RATIOS)
+multiplier_map = {
+ 'K': 1000,
+ 'M': 1000000,
+ 'G': 1000000000
+}
def convert_rates(l2frame_size, rate, intf_speed):
"""Convert a given rate unit into the other rate units.
def convert_rates(l2frame_size, rate, intf_speed):
"""Convert a given rate unit into the other rate units.