This patch fixes latest regression related to multithreaded netperf. Originally the nperf_num_parallel was converted to int() but when it is used while generating hash the controller fails with exception since only string is accepted.

The Netperf module converts the parameter to int anyway, so removing the conversion from python task is an easy fix.

Signed-off-by: Jan Tluka jtluka@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 2 +- recipes/regression_tests/phase1/3_vlans_over_bond.py | 2 +- recipes/regression_tests/phase1/bonding_test.py | 2 +- recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py | 2 +- recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py | 2 +- recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py | 2 +- recipes/regression_tests/phase2/3_vlans_over_team.py | 2 +- recipes/regression_tests/phase2/team_test.py | 2 +- .../phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 2 +- recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py | 2 +- recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 907ad3c..b795496 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -39,7 +39,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

m1_phy1 = m1.get_interface("eth1") m1_phy1.set_mtu(mtu) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index c14f1f0..5e1adec 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -38,7 +38,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

m1_bond = m1.get_interface("test_bond") m1_bond.set_mtu(mtu) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index cc93af0..cfb03e3 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -38,7 +38,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

test_if1 = m1.get_interface("test_if") test_if1.set_mtu(mtu) 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 1b908cf..50ae7e4 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 @@ -43,7 +43,7 @@ nperf_confidence = ctl.get_alias("nperf_confidence") 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_num_parallel = ctl.get_alias("nperf_num_parallel")

mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf") 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 d3cc786..cb7839a 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -39,7 +39,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf") 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 ca169af..2d87c9b 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -39,7 +39,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf") diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index dc163c0..038117b 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -38,7 +38,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

m1_team = m1.get_interface("test_if") m1_team.set_mtu(mtu) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 8a1d275..eab0b05 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -37,7 +37,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

test_if1 = m1.get_interface("test_if") test_if1.set_mtu(mtu) 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 240f056..08fadf3 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 @@ -43,7 +43,7 @@ nperf_confidence = ctl.get_alias("nperf_confidence") 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_num_parallel = ctl.get_alias("nperf_num_parallel")

h1_nic1 = h1.get_interface("nic1") h1_nic2 = h1.get_interface("nic2") 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 76aa386..2ca1222 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 @@ -39,7 +39,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

h2_vlan10 = h2.get_interface("vlan10") g1_vlan10 = g1.get_interface("vlan10") 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 dcde1b2..25066bf 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 @@ -39,7 +39,7 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) 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_num_parallel = ctl.get_alias("nperf_num_parallel")

h2_vlan10 = h2.get_interface("vlan10") g1_guestnic = g1.get_interface("guestnic")