For pretty printing I initially used multiples of 1024. This is a bit confusing therefore I changed the conversion by using multiples of 1000.

Additionally I've added missing conversion for kbits, mbits, gbits, tbits when conversion unit is specified.

Signed-off-by: Jan Tluka jtluka@redhat.com --- test_modules/Netperf.py | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py index bc6b264..6367808 100644 --- a/test_modules/Netperf.py +++ b/test_modules/Netperf.py @@ -344,21 +344,21 @@ class Netperf(TestGeneric): def _pretty_rate(self, rate, unit=None): pretty_rate = {} if unit is None: - if rate < 1024: + if rate < 1000: pretty_rate["unit"] = "bits/sec" pretty_rate["rate"] = rate - elif rate < 1024 * 1024: - pretty_rate["unit"] = "Kbits/sec" - pretty_rate["rate"] = rate / 1024 - elif rate < 1024 * 1024 * 1024: - pretty_rate["unit"] = "Mbits/sec" - pretty_rate["rate"] = rate / (1024 * 1024) - elif rate < 1024 * 1024 * 1024 * 1024: - pretty_rate["unit"] = "Gbits/sec" - pretty_rate["rate"] = rate / (1024 * 1024 * 1024) - elif rate < 1024 * 1024 * 1024 * 1024 * 1024: + elif rate < 1000 * 1000: + pretty_rate["unit"] = "kbits/sec" + pretty_rate["rate"] = rate / 1000 + elif rate < 1000 * 1000 * 1000: + pretty_rate["unit"] = "mbits/sec" + pretty_rate["rate"] = rate / (1000 * 1000) + elif rate < 1000 * 1000 * 1000 * 1000: + pretty_rate["unit"] = "gbits/sec" + pretty_rate["rate"] = rate / (1000 * 1000 * 1000) + elif rate < 1000 * 1000 * 1000 * 1000 * 1000: pretty_rate["unit"] = "tbits/sec" - pretty_rate["rate"] = rate / (1024 * 1024 * 1024 * 1024) + pretty_rate["rate"] = rate / (1000 * 1000 * 1000 * 1000) else: if unit == "bits/sec": pretty_rate["unit"] = "bits/sec" @@ -366,15 +366,27 @@ class Netperf(TestGeneric): elif unit == "Kbits/sec": pretty_rate["unit"] = "Kbits/sec" pretty_rate["rate"] = rate / 1024 + elif unit == "kbits/sec": + pretty_rate["unit"] = "kbits/sec" + pretty_rate["rate"] = rate / 1000 elif unit == "Mbits/sec": pretty_rate["unit"] = "Mbits/sec" pretty_rate["rate"] = rate / (1024 * 1024) + elif unit == "mbits/sec": + pretty_rate["unit"] = "mbits/sec" + pretty_rate["rate"] = rate / (1000 * 1000) elif unit == "Gbits/sec": pretty_rate["unit"] = "Gbits/sec" pretty_rate["rate"] = rate / (1024 * 1024 * 1024) + elif unit == "gbits/sec": + pretty_rate["unit"] = "gbits/sec" + pretty_rate["rate"] = rate / (1000 * 1000 * 1000) elif unit == "Tbits/sec": pretty_rate["unit"] = "Tbits/sec" - pretty_rate["rate"] = rate / (1024 * 1024 * 1024) + pretty_rate["rate"] = rate / (1024 * 1024 * 1024 * 1024) + elif unit == "tbits/sec": + pretty_rate["unit"] = "tbits/sec" + pretty_rate["rate"] = rate / (1000 * 1000 * 1000 * 1000)

return pretty_rate