11:16 a.m.
Changes in v2:
- discarded patch split _pretty_rate method in two and add support for RR tests
- added patch fix non omni output_parsing
- added patch print actual supported tests in warning message
Jiri Prochazka (4):
test_modules/netperf: use bit/s in STREAM tests and parse RR tests
test_modules/netperf: add TCP_CRR to supported and omni tests
test_modules/netperf: print actual supported tests in warning message
test_modules/netperf: fix non omni output parsing
test_modules/Netperf.py | 55 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 38 insertions(+), 17 deletions(-)
--
2.9.3
11:16 a.m.
New subject: [PATCH v2 1/4] test_modules/netperf: use bit/s in STREAM tests and parse RR tests
We used kbit/s as output rate for STREAM tests, then we converted it to
bit/s. This patch changes that so the output rate is in bit/s for STREAM
tests and Trans/s for RR tests.
It also adds THROUGHPUT_UNITS omni output selector for omni tests and
adds support for parsing units - both bps and tps
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
test_modules/Netperf.py | 39 ++++++++++++++++++++++++++++++---------
1 file changed, 30 insertions(+), 9 deletions(-)
diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index 5a0e989..8d30601 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -68,7 +68,12 @@ class Netperf(TestGeneric):
composes commands for netperf and netserver based on xml recipe
"""
if self._role == "client":
- cmd = "netperf -H %s -f k" % self._netperf_server
+ # 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:
+ cmd = "netperf -H %s -f b" % self._netperf_server
if self._is_omni():
# -P 0 disables banner header of output
cmd += " -P 0"
@@ -134,7 +139,8 @@ class Netperf(TestGeneric):
# Print only relevant output
if self._is_omni():
- cmd += ' -- -k "THROUGHPUT, LOCAL_CPU_UTIL, REMOTE_CPU_UTIL,
'\
+ cmd += ' -- -k "THROUGHPUT, THROUGHPUT_UNITS, '\
+ 'LOCAL_CPU_UTIL, REMOTE_CPU_UTIL, '\
'CONFIDENCE_LEVEL, THROUGHPUT_CONFID, LOCAL_SEND_SIZE, '\
'REMOTE_RECV_SIZE, LOCAL_SEND_THROUGHPUT, '\
'REMOTE_RECV_THROUGHPUT, LOCAL_CPU_PEAK_UTIL, '\
@@ -195,13 +201,20 @@ class Netperf(TestGeneric):
pattern_throughput = "THROUGHPUT=(\d+\.\d+)"
throughput = re.search(pattern_throughput, output)
+ pattern_throughput_units = "THROUGHPUT_UNITS=(.*)"
+ throughput_units = re.search(pattern_throughput_units, output).group(1)
+
if throughput is None:
- rate_in_kb = 0.0
+ rate = 0.0
else:
- rate_in_kb = float(throughput.group(1))
+ rate = float(throughput.group(1))
- res_val["rate"] = rate_in_kb*1000
- res_val["unit"] = "bps"
+ if throughput_units == "10^0bits/s":
+ res_val["unit"] = "bps"
+ elif throughput_units == "Trans/s":
+ res_val["unit"] = "tps"
+
+ res_val["rate"] = rate
if self._cpu_util is not None:
if self._cpu_util == "local" or self._cpu_util ==
"both":
@@ -229,14 +242,14 @@ class Netperf(TestGeneric):
r2 = re.search(pattern, output.lower())
if r2 is None:
- rate_in_kb = 0.0
+ rate = 0.0
else:
- rate_in_kb = float(r2.group(1))
+ rate = float(r2.group(1))
if self._cpu_util != 'None':
res_val["LOCAL_CPU_UTIL"] = float(r2.group(2))
res_val["REMOTE_CPU_UTIL"] = float(r2.group(3))
- res_val["rate"] = rate_in_kb*1000
+ res_val["rate"] = rate
res_val["unit"] = "bps"
return res_val
@@ -381,6 +394,14 @@ class Netperf(TestGeneric):
def _pretty_rate(self, rate, unit=None):
pretty_rate = {}
+
+ # For Request/Response tests we don't need any conversions
+ if "RR" in self._testname:
+ pretty_rate["unit"] = "Trans/sec"
+ pretty_rate["rate"] = rate
+ return pretty_rate
+
+ # For STREAM tests we want to convert the rate from bits
if unit is None:
if rate < 1000:
pretty_rate["unit"] = "bits/sec"
--
2.9.3
11:16 a.m.
New subject: [PATCH v2 2/4] test_modules/netperf: add TCP_CRR to supported and omni tests
This test will be used in short-lived connections test. Since all
Request/Response test will use parsing from omni output, it needs
to be added in list of omni output supported tests.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
test_modules/Netperf.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index 8d30601..cef1447 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -16,9 +16,9 @@ from lnst.Common.Utils import std_deviation, is_installed, int_it
class Netperf(TestGeneric):
supported_tests = ["TCP_STREAM", "TCP_RR",
"UDP_STREAM", "UDP_RR",
- "SCTP_STREAM", "SCTP_STREAM_MANY",
"SCTP_RR"]
+ "SCTP_STREAM", "SCTP_STREAM_MANY",
"SCTP_RR", "TCP_CRR"]
- omni_tests = ["TCP_STREAM", "TCP_RR", "UDP_STREAM",
"UDP_RR"]
+ omni_tests = ["TCP_STREAM", "UDP_STREAM", "TCP_RR",
"UDP_RR", "TCP_CRR"]
def __init__(self, command):
super(Netperf, self).__init__(command)
--
2.9.3
11:16 a.m.
New subject: [PATCH v2 3/4] test_modules/netperf: print actual supported tests in warning message
This patch prints all supported test names in the logging warning
message automatically based on supported_tests variable in Netperf
class, so we don't have to update it manually any more.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
test_modules/Netperf.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index cef1447..8081070 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -97,10 +97,10 @@ class Netperf(TestGeneric):
test that will be performed
"""
if self._testname not in self.supported_tests:
- logging.warning("Only TCP_STREAM, TCP_RR, UDP_STREAM, "
- "UDP_RR, SCTP_STREAM, SCTP_STREAM_MANY and SCTP_RR tests "
- "are now officialy supported by LNST. You "
- "can use other tests, but test result may not be
correct.")
+ 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)
cmd += " -t %s" % self._testname
if self._confidence is not None and self._num_parallel <= 1:
--
2.9.3
11:16 a.m.
New subject: [PATCH v2 4/4] test_modules/netperf: fix non omni output parsing
There is a bug when running non omni output test, like SCTP tests,
with nperf_cpu_util alias not defined, the value stored in
self._cpu_util is None and not 'None' and the result rate is set 0
because the condition is met, bad regex is created and this regex
does not match the output.
This patch fixes that.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
test_modules/Netperf.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index 8081070..6cbd504 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -235,7 +235,7 @@ class Netperf(TestGeneric):
# pattern for SCTP streams and other tests
# decimal decimal decimal float (float)
pattern = "\d+\s+\d+\s+\d+\s+\d+\.\d+\s+(\d+(?:\.\d+){0,1})"
- if self._cpu_util != 'None':
+ if self._cpu_util != 'None' and self._cpu_util is not None:
# cpu utilization data in format: float float
pattern += "\s+(\d+(?:\.\d+){0,1})\s+(\d+(?:\.\d+){0,1})"
@@ -245,7 +245,7 @@ class Netperf(TestGeneric):
rate = 0.0
else:
rate = float(r2.group(1))
- if self._cpu_util != 'None':
+ if self._cpu_util != 'None' and self._cpu_util is not None:
res_val["LOCAL_CPU_UTIL"] = float(r2.group(2))
res_val["REMOTE_CPU_UTIL"] = float(r2.group(3))
--
2.9.3
7:03 a.m.
New subject: [PATCH v2 0/4] Netperf minor refactorization and support for RR
tests
On Thu, May 04, 2017 at 06:16:46PM +0200, Jiri Prochazka wrote:
Changes in v2:
- discarded patch split _pretty_rate method in two and add support for RR tests
- added patch fix non omni output_parsing
- added patch print actual supported tests in warning message
Jiri Prochazka (4):
test_modules/netperf: use bit/s in STREAM tests and parse RR tests
test_modules/netperf: add TCP_CRR to supported and omni tests
test_modules/netperf: print actual supported tests in warning message
test_modules/netperf: fix non omni output parsing
test_modules/Netperf.py | 55 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 38 insertions(+), 17 deletions(-)
--
2.9.3
_______________________________________________
LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org
Looks ok to me. Ack to set.
Acked-by: Ondrej Lichtner <olichtne(a)redhat.com>
9:17 a.m.
New subject: [PATCH v2 0/4] Netperf minor refactorization and support for RR
tests
Thu, May 04, 2017 at 06:16:46PM CEST, jprochaz(a)redhat.com wrote:
Changes in v2:
- discarded patch split _pretty_rate method in two and add support for RR tests
- added patch fix non omni output_parsing
- added patch print actual supported tests in warning message
Jiri Prochazka (4):
test_modules/netperf: use bit/s in STREAM tests and parse RR tests
test_modules/netperf: add TCP_CRR to supported and omni tests
test_modules/netperf: print actual supported tests in warning message
test_modules/netperf: fix non omni output parsing
test_modules/Netperf.py | 55 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 38 insertions(+), 17 deletions(-)
Looks ok. Thanks for fixing the SCTP issue! I like 3rd patch as well.
Acked-by: Jan Tluka <jtluka(a)redhat.com>
3:05 a.m.
New subject: [PATCH v2 0/4] Netperf minor refactorization and support for RR
tests
On Thu, May 04, 2017 at 06:16:46PM +0200, Jiri Prochazka wrote:
Changes in v2:
- discarded patch split _pretty_rate method in two and add support for RR tests
- added patch fix non omni output_parsing
- added patch print actual supported tests in warning message
Jiri Prochazka (4):
test_modules/netperf: use bit/s in STREAM tests and parse RR tests
test_modules/netperf: add TCP_CRR to supported and omni tests
test_modules/netperf: print actual supported tests in warning message
test_modules/netperf: fix non omni output parsing
test_modules/Netperf.py | 55 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 38 insertions(+), 17 deletions(-)
--
2.9.3
_______________________________________________
LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org
pushed, thanks
-Ondrej
2537
days inactive
2542
days old
lnst-developers@lists.fedorahosted.org
7 comments
3 participants
participants (3)
-
Jan Tluka -
Jiri Prochazka -
Ondrej Lichtner