Netperf test module now takes optional parameter 'nperf_debug'. The value is number and means verbosity level. E.g. debug=0 => netperf ... (no debug) debug=1 => netperf -d ... debug=2 => netperf -dd ... debug=3 => netperf -ddd ... This is the maximum level of verbosity
Signed-off-by: Jan Tluka jtluka@redhat.com --- test_modules/Netperf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py index 7b9d7f7..ada3c36 100644 --- a/test_modules/Netperf.py +++ b/test_modules/Netperf.py @@ -11,7 +11,7 @@ import errno import re from lnst.Common.TestsCommon import TestGeneric from lnst.Common.ShellProcess import ShellProcess -from lnst.Common.Utils import std_deviation, is_installed +from lnst.Common.Utils import std_deviation, is_installed, int_it
class Netperf(TestGeneric):
@@ -39,6 +39,7 @@ class Netperf(TestGeneric): self._cpu_util = self.get_opt("cpu_util") self._num_parallel = int(self.get_opt("num_parallel", default=1)) self._runs = self.get_opt("runs", default=1) + self._debug = int_it(self.get_opt("debug", default=0))
self._threshold = self._parse_threshold(self.get_opt("threshold")) self._threshold_deviation = self._parse_threshold( @@ -105,6 +106,9 @@ class Netperf(TestGeneric): elif self._cpu_util.lower() == "remote": cmd += " -C"
+ if self._debug > 0: + cmd += " -%s" % ('d' * self._debug) + if self._netperf_opts is not None: """ custom options for netperf
This can be useful when debugging problems with netperf testing.
Signed-off-by: Jan Tluka jtluka@redhat.com --- test_modules/Netperf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py index ada3c36..67d63f3 100644 --- a/test_modules/Netperf.py +++ b/test_modules/Netperf.py @@ -398,8 +398,10 @@ class Netperf(TestGeneric): if e.errno == errno.EINTR: client.kill()
+ output = client.read_nonblocking() + logging.debug(output) + if ret_code == 0: - output = client.read_nonblocking() client_results.append(self._parse_output(output))
if len(client_results) > 0:
The ret_code might be undefined when SIGINT is sent to the test module.
v2: Fix the if condition if ret_code is 0
Signed-off-by: Jan Tluka jtluka@redhat.com --- test_modules/Netperf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py index 67d63f3..1b9046b 100644 --- a/test_modules/Netperf.py +++ b/test_modules/Netperf.py @@ -391,6 +391,7 @@ class Netperf(TestGeneric): clients.append(ShellProcess(cmd))
for client in clients: + ret_code = None try: ret_code = client.wait() rv += ret_code @@ -401,7 +402,7 @@ class Netperf(TestGeneric): output = client.read_nonblocking() logging.debug(output)
- if ret_code == 0: + if ret_code is not None and ret_code == 0: client_results.append(self._parse_output(output))
if len(client_results) > 0:
The recipes now take an optional nperf_debug alias that enables netperf debugging. The default value is 0 meaning no debugging.
Signed-off-by: Jan Tluka jtluka@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 13 +++++++++---- recipes/regression_tests/phase1/3_vlans.xml | 1 + .../phase1/3_vlans_over_active_backup_bond.xml | 1 + recipes/regression_tests/phase1/3_vlans_over_bond.py | 13 +++++++++---- recipes/regression_tests/phase1/active_backup_bond.xml | 1 + .../regression_tests/phase1/active_backup_double_bond.xml | 1 + recipes/regression_tests/phase1/bonding_test.py | 13 +++++++++---- recipes/regression_tests/phase1/simple_netperf.py | 13 +++++++++---- recipes/regression_tests/phase1/simple_netperf.xml | 1 + .../virtual_bridge_2_vlans_over_active_backup_bond.xml | 1 + .../phase1/virtual_bridge_2_vlans_over_bond.py | 13 +++++++++---- .../regression_tests/phase1/virtual_bridge_vlan_in_guest.py | 13 +++++++++---- .../phase1/virtual_bridge_vlan_in_guest.xml | 1 + .../regression_tests/phase1/virtual_bridge_vlan_in_host.py | 13 +++++++++---- .../regression_tests/phase1/virtual_bridge_vlan_in_host.xml | 1 + .../phase2/3_vlans_over_active_backup_team.xml | 1 + recipes/regression_tests/phase2/3_vlans_over_team.py | 13 +++++++++---- .../regression_tests/phase2/active_backup_double_team.xml | 1 + recipes/regression_tests/phase2/active_backup_team.xml | 1 + .../phase2/active_backup_team_vs_active_backup_bond.xml | 1 + recipes/regression_tests/phase2/team_test.py | 13 +++++++++---- .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 13 +++++++++---- .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml | 1 + .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 13 +++++++++---- .../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 1 + .../phase2/virtual_ovs_bridge_vlan_in_host.py | 13 +++++++++---- .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 1 + 27 files changed, 123 insertions(+), 48 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index b9420b6..49020db 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -42,6 +42,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -109,7 +110,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts + "netperf_opts": p_opts, + "debug" : nperf_debug }) netperf_cli_udp = ctl.get_module("Netperf", options={ @@ -120,7 +122,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts + "netperf_opts": p_opts, + "debug" : nperf_debug }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -131,7 +134,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts6 + "netperf_opts": p_opts6, + "debug" : nperf_debug }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -142,7 +146,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts6 + "netperf_opts": p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase1/3_vlans.xml b/recipes/regression_tests/phase1/3_vlans.xml index b530269..03cf350 100644 --- a/recipes/regression_tests/phase1/3_vlans.xml +++ b/recipes/regression_tests/phase1/3_vlans.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="3_vlans.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml index 4ecb507..9f4f932 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="3_vlans_over_active_backup_bond.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 07d5f5c..a96e604 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -41,6 +41,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -110,7 +111,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts + "netperf_opts": p_opts, + "debug" : nperf_debug }) netperf_cli_udp = ctl.get_module("Netperf", options={ @@ -121,7 +123,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts + "netperf_opts": p_opts, + "debug" : nperf_debug }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -132,7 +135,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts6 + "netperf_opts": p_opts6, + "debug" : nperf_debug }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -143,7 +147,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts6 + "netperf_opts": p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml b/recipes/regression_tests/phase1/active_backup_bond.xml index 76e8f75..11c5f28 100644 --- a/recipes/regression_tests/phase1/active_backup_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_bond.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="active_backup_bond.mapping" /> <alias name="net" value="192.168.0"/> </define> diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml b/recipes/regression_tests/phase1/active_backup_double_bond.xml index 92f486b..ccf1ba1 100644 --- a/recipes/regression_tests/phase1/active_backup_double_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="active_backup_double_bond.mapping" /> <alias name="net" value="192.168.0"/> </define> diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index d56955d..7d8a48e 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -41,6 +41,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -115,7 +116,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -127,7 +129,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -140,7 +143,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -152,7 +156,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index 3eb2a61..811dd58 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.py @@ -41,6 +41,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -75,7 +76,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs" : nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -87,7 +89,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs" : nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -99,7 +102,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs" : nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -111,7 +115,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs" : nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
netperf_srv = ctl.get_module("Netperf", diff --git a/recipes/regression_tests/phase1/simple_netperf.xml b/recipes/regression_tests/phase1/simple_netperf.xml index 8f0884e..cfc2d85 100644 --- a/recipes/regression_tests/phase1/simple_netperf.xml +++ b/recipes/regression_tests/phase1/simple_netperf.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default" /> <alias name="nperf_num_parallel" value="2" /> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="simple_netperf.mapping" /> <alias name="net" value="192.168.101" /> </define> diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml index 1cdd708..ff5d8d6 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml @@ -7,6 +7,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_2_vlans_over_active_backup_bond.mapping" /> <alias name="vlan10_net" value="192.168.10"/> diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py index e2a9449..780e85b 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py @@ -46,6 +46,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment) @@ -123,7 +124,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : "-L %s" % - (g3_guestnic.get_ip(0)) + (g3_guestnic.get_ip(0)), + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -136,7 +138,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : "-L %s" % - (g3_guestnic.get_ip(0)) + (g3_guestnic.get_ip(0)), + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -150,7 +153,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : - "-L %s -6" % (g3_guestnic.get_ip(1)) + "-L %s -6" % (g3_guestnic.get_ip(1)), + "debug" : nperf_debug })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -164,7 +168,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : - "-L %s -6" % (g3_guestnic.get_ip(1)) + "-L %s -6" % (g3_guestnic.get_ip(1)), + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py index cf83070..416f469 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -42,6 +42,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -109,7 +110,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -121,7 +123,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -134,7 +137,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -147,7 +151,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml index a483e3b..33a1ae7 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -7,6 +7,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_vlan_in_guest.mapping" /> <alias name="vlan10_net" value="192.168.10"/> diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py index 2ee4c60..03dd3bf 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -42,6 +42,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -108,7 +109,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -120,7 +122,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -133,7 +136,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -146,7 +150,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml index 2318cfb..48884d5 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -7,6 +7,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_vlan_in_host.mapping" /> <alias name="vlan10_net" value="192.168.10"/> diff --git a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml index d323141..2bcfc88 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml +++ b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="3_vlans_over_active_backup_team.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index f66a38d..2a33268 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -41,6 +41,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -110,7 +111,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts + "netperf_opts": p_opts, + "debug" : nperf_debug }) netperf_cli_udp = ctl.get_module("Netperf", options={ @@ -121,7 +123,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts + "netperf_opts": p_opts, + "debug" : nperf_debug }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -132,7 +135,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts6 + "netperf_opts": p_opts6, + "debug" : nperf_debug }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -143,7 +147,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts": p_opts6 + "netperf_opts": p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml b/recipes/regression_tests/phase2/active_backup_double_team.xml index 6639907..235872b 100644 --- a/recipes/regression_tests/phase2/active_backup_double_team.xml +++ b/recipes/regression_tests/phase2/active_backup_double_team.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="active_backup_double_team.mapping" /> <alias name="net" value="192.168.0"/> </define> diff --git a/recipes/regression_tests/phase2/active_backup_team.xml b/recipes/regression_tests/phase2/active_backup_team.xml index a9a18a4..721edeb 100644 --- a/recipes/regression_tests/phase2/active_backup_team.xml +++ b/recipes/regression_tests/phase2/active_backup_team.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="active_backup_team.mapping" /> <alias name="net" value="192.168.0"/> </define> diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml index 8f246c2..b2fc512 100644 --- a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="active_backup_team_vs_active_backup_bond.mapping" /> <alias name="net" value="192.168.0"/> </define> diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 6327528..8ad9758 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -40,6 +40,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -114,7 +115,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -126,7 +128,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -139,7 +142,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -151,7 +155,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py index a65c4ba..9ce9048 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py @@ -46,6 +46,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment) @@ -122,7 +123,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : "-L %s" % - (g3_guestnic.get_ip(0)) + (g3_guestnic.get_ip(0)), + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -135,7 +137,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : "-L %s" % - (g3_guestnic.get_ip(0)) + (g3_guestnic.get_ip(0)), + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -149,7 +152,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : - "-L %s -6" % (g3_guestnic.get_ip(1)) + "-L %s -6" % (g3_guestnic.get_ip(1)), + "debug" : nperf_debug })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -163,7 +167,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : - "-L %s -6" % (g3_guestnic.get_ip(1)) + "-L %s -6" % (g3_guestnic.get_ip(1)), + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml index b692461..172f02f 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml @@ -7,6 +7,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="virtual_ovs_bridge_2_vlans_over_active_backup_bond.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py index dfc54e3..b72b660 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py @@ -42,6 +42,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -106,7 +107,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -118,7 +120,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -131,7 +134,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -144,7 +148,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml index 5dad461..28fce58 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml @@ -7,6 +7,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="virtual_ovs_bridge_vlan_in_guest.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py index 154f0b9..a2382cd 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py @@ -42,6 +42,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +nperf_debug = ctl.get_alias("nperf_debug") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -105,7 +106,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_udp = ctl.get_module("Netperf", @@ -117,7 +119,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts + "netperf_opts" : p_opts, + "debug" : nperf_debug })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -130,7 +133,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -143,7 +147,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "confidence" : nperf_confidence, "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, - "netperf_opts" : p_opts6 + "netperf_opts" : p_opts6, + "debug" : nperf_debug })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml index 5398d93..8222f13 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml @@ -7,6 +7,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_debug" value="0"/> <alias name="mapping_file" value="virtual_ovs_bridge_vlan_in_host.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/>
This is not very useful and simply fills the log with garbage. If a user needs to have the data in log he can do so from the task.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Common/ShellProcess.py | 1 - 1 file changed, 1 deletion(-)
diff --git a/lnst/Common/ShellProcess.py b/lnst/Common/ShellProcess.py index 56e2339..a4928ed 100644 --- a/lnst/Common/ShellProcess.py +++ b/lnst/Common/ShellProcess.py @@ -230,7 +230,6 @@ class ShellProcess: return data if r and (r[0][1] & select.POLLIN): new_data = os.read(fd, 1024) - logging.log(self.logging_level, "data:\n" + new_data.rstrip()) if not new_data: return data data += new_data
On Mon, Apr 25, 2016 at 01:57:58PM +0200, Jan Tluka wrote:
Netperf test module now takes optional parameter 'nperf_debug'. The value is number and means verbosity level. E.g. debug=0 => netperf ... (no debug) debug=1 => netperf -d ... debug=2 => netperf -dd ... debug=3 => netperf -ddd ... This is the maximum level of verbosity
Signed-off-by: Jan Tluka jtluka@redhat.com
ack to set Acked-by: Ondrej Lichtner olichtne@redhat.com
lnst-developers@lists.fedorahosted.org
-
Jan Tluka -
Ondrej Lichtner