[PATCH 1/2] test_modules/Netperf: fix typo in message for supported_test

[Jiri Prochazka]

The attribute is called supported tests, not supported test.

Thanks to Jan Tluka (jtluka(a)redhat.com) for discovering this issue.

Fixes: 9dae9cf9 ("test_modules/netperf: print actual supported tests in
warning message")

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 test_modules/Netperf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index 6cbd504..f74d06a 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -100,7 +100,7 @@ class Netperf(TestGeneric):
                     supported_tests = ', '.join(self.supported_tests)
                     logging.warning("Only %s tests are now officialy supported
"
                     "by LNST. You can use other tests, but test result may not
"
-                    "be correct." % supported_test)
+                    "be correct." % supported_tests)
                 cmd += " -t %s" % self._testname
 
             if self._confidence is not None and self._num_parallel <= 1:
-- 
2.9.4

[PATCH 2/2] test_modules/Netperf: fix output format in execution of STREAM tests

[Jiri Prochazka]

In current version of netperf (2.7.1) there is a bug with formatting
option b, which should represent bits, but it represents Bytes instead
(the same as option B). Due to this bug, we are reverting back to
kilobits.

Thanks to Jan Tluka (jtluka(a)redhat.com) for discovering this issue.

Fixes: a7f6aad8 ("test_modules/netperf: use bit/s in STREAM tests and
parse RR tests")

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 test_modules/Netperf.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index f74d06a..de39925 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -71,9 +71,9 @@ class Netperf(TestGeneric):
             # for request response test transactions per seconds are used as unit
             if "RR" in self._testname:
                 cmd = "netperf -H %s -f x" % self._netperf_server
-            # else 10^0bits/s are used as unit
+            # else 10^3bits/s are used as unit
             else:
-                cmd = "netperf -H %s -f b" % self._netperf_server
+                cmd = "netperf -H %s -f k" % self._netperf_server
             if self._is_omni():
                 # -P 0 disables banner header of output
                 cmd += " -P 0"
@@ -209,12 +209,13 @@ class Netperf(TestGeneric):
         else:
             rate = float(throughput.group(1))
 
-        if throughput_units == "10^0bits/s":
+        if throughput_units == "10^3bits/s":
             res_val["unit"] = "bps"
+            res_val["rate"] = rate*1000
         elif throughput_units == "Trans/s":
             res_val["unit"] = "tps"
+            res_val["rate"] = rate
 
-        res_val["rate"] = rate
 
         if self._cpu_util is not None:
             if self._cpu_util == "local" or self._cpu_util ==
"both":
@@ -249,7 +250,7 @@ class Netperf(TestGeneric):
                 res_val["LOCAL_CPU_UTIL"] = float(r2.group(2))
                 res_val["REMOTE_CPU_UTIL"] = float(r2.group(3))
 
-        res_val["rate"] = rate
+        res_val["rate"] = rate*1000
         res_val["unit"] = "bps"
 
         return res_val
-- 
2.9.4

[Jan Tluka]

Tue, Jun 06, 2017 at 03:06:42PM CEST, jprochaz(a)redhat.com wrote:
> The attribute is called supported tests, not supported test.
>
> Thanks to Jan Tluka (jtluka(a)redhat.com) for discovering this issue.
>
> Fixes: 9dae9cf9 ("test_modules/netperf: print actual supported tests in
> warning message")
>
> Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt; 
Ack to series.

I gave this few checks:
    works fine for OMNI test with PerfRepo PASS
    works fine for non-OMNI test PASS

Acked-by: Jan Tluka <jtluka(a)redhat.com&gt;

[Ondrej Lichtner]

On Tue, Jun 06, 2017 at 03:06:42PM +0200, Jiri Prochazka wrote:
>  The attribute is called supported tests, not supported test.
>  
>  Thanks to Jan Tluka (jtluka(a)redhat.com) for discovering this issue.
>  
>  Fixes: 9dae9cf9 ("test_modules/netperf: print actual supported tests in
>  warning message")
>  
>  Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
>  ---
>   test_modules/Netperf.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>   
set pushed, thanks

-Ondrej