When running parallel netperf tests in phase1 and phase2 recipes it does not make sense to run with improper qdisc like pfifo_fast. This patch sets the qdisc to mq so that netperf results are appropriate.
Signed-off-by: Jan Tluka jtluka@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 4 ++++ recipes/regression_tests/phase1/3_vlans_over_bond.py | 5 +++++ recipes/regression_tests/phase1/bonding_test.py | 15 +++++++++++++++ recipes/regression_tests/phase1/simple_netperf.py | 4 ++++ .../phase1/virtual_bridge_2_vlans_over_bond.py | 6 ++++++ .../phase1/virtual_bridge_vlan_in_guest.py | 4 ++++ .../phase1/virtual_bridge_vlan_in_host.py | 4 ++++ recipes/regression_tests/phase2/3_vlans_over_team.py | 5 +++++ recipes/regression_tests/phase2/team_test.py | 15 +++++++++++++++ .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 6 ++++++ .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 4 ++++ .../phase2/virtual_ovs_bridge_vlan_in_host.py | 4 ++++ 12 files changed, 76 insertions(+)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index df1b3fa..6b6cfc1 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -209,6 +209,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + m1.run("tc qdisc replace dev %s root mq" % m1_phy1.get_devname()) + m2.run("tc qdisc replace dev %s root mq" % m2_phy1.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 3a06fc1..198a4cc 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -210,6 +210,11 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + m1.run("tc qdisc replace dev %s root mq" % m1_phy1.get_devname()) + m1.run("tc qdisc replace dev %s root mq" % m1_phy2.get_devname()) + m2.run("tc qdisc replace dev %s root mq" % m2_phy1.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index e075152..9991205 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -218,6 +218,21 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + m1.run("tc qdisc replace dev %s root mq" % + m1.get_interface("eth1").get_devname()) + m1.run("tc qdisc replace dev %s root mq" % + m1.get_interface("eth2").get_devname()) + + if test_if2.get_type() == "bond": + m2.run("tc qdisc replace dev %s root mq" % + m2.get_interface("eth1").get_devname()) + m2.run("tc qdisc replace dev %s root mq" % + m2.get_interface("eth2").get_devname()) + else: + m2.run("tc qdisc replace dev %s root mq" % + test_if2.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index 4a7f0d8..cc401f4 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.py @@ -189,6 +189,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel" : nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel" : nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + m1.run("tc qdisc replace dev %s root mq" % m1_testiface.get_devname()) + m2.run("tc qdisc replace dev %s root mq" % m2_testiface.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 5baafab..ad958a6 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 @@ -234,6 +234,12 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + h1.run("tc qdisc replace dev %s root mq" % h1_nic1.get_devname()) + h1.run("tc qdisc replace dev %s root mq" % h1_nic2.get_devname()) + h2.run("tc qdisc replace dev %s root mq" % h2_nic1.get_devname()) + h2.run("tc qdisc replace dev %s root mq" % h2_nic2.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 8c1ea70..c32845c 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -215,6 +215,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + h1.run("tc qdisc replace dev %s root mq" % h1_nic.get_devname()) + h2.run("tc qdisc replace dev %s root mq" % h2_nic.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 5c0c7a0..9901d2b 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -214,6 +214,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + h1.run("tc qdisc replace dev %s root mq" % h1_nic.get_devname()) + h2.run("tc qdisc replace dev %s root mq" % h2_nic.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index ec49100..a43a091 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -210,6 +210,11 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + m1.run("tc qdisc replace dev %s root mq" % m1_phy1.get_devname()) + m1.run("tc qdisc replace dev %s root mq" % m1_phy2.get_devname()) + m2.run("tc qdisc replace dev %s root mq" % m2_phy1.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 5bb03c2..ee60488 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -217,6 +217,21 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + m1.run("tc qdisc replace dev %s root mq" % + m1.get_interface("eth1").get_devname()) + m1.run("tc qdisc replace dev %s root mq" % + m1.get_interface("eth2").get_devname()) + + if test_if2.get_type() in [ "team", "bond" ]: + m2.run("tc qdisc replace dev %s root mq" % + m2.get_interface("eth1").get_devname()) + m2.run("tc qdisc replace dev %s root mq" % + m2.get_interface("eth2").get_devname()) + else: + m2.run("tc qdisc replace dev %s root mq" % + test_if2.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 c994d3e..5cbdbd7 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 @@ -234,6 +234,12 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + h1.run("tc qdisc replace dev %s root mq" % h1_nic1.get_devname()) + h1.run("tc qdisc replace dev %s root mq" % h1_nic2.get_devname()) + h2.run("tc qdisc replace dev %s root mq" % h2_nic1.get_devname()) + h2.run("tc qdisc replace dev %s root mq" % h2_nic2.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 f6823b2..84b0063 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 @@ -213,6 +213,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + h1.run("tc qdisc replace dev %s root mq" % h1_nic.get_devname()) + h2.run("tc qdisc replace dev %s root mq" % h2_nic.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 47e7b31..52241d1 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 @@ -212,6 +212,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
+ # we have to use multiqueue qdisc to get appropriate data + h1.run("tc qdisc replace dev %s root mq" % h1_nic.get_devname()) + h2.run("tc qdisc replace dev %s root mq" % h2_nic.get_devname()) + if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size})
On Fri, Nov 25, 2016 at 10:24:06AM +0100, Jan Tluka wrote:
When running parallel netperf tests in phase1 and phase2 recipes it does not make sense to run with improper qdisc like pfifo_fast. This patch sets the qdisc to mq so that netperf results are appropriate.
Signed-off-by: Jan Tluka jtluka@redhat.com
recipes/regression_tests/phase1/3_vlans.py | 4 ++++ recipes/regression_tests/phase1/3_vlans_over_bond.py | 5 +++++ recipes/regression_tests/phase1/bonding_test.py | 15 +++++++++++++++ recipes/regression_tests/phase1/simple_netperf.py | 4 ++++ .../phase1/virtual_bridge_2_vlans_over_bond.py | 6 ++++++ .../phase1/virtual_bridge_vlan_in_guest.py | 4 ++++ .../phase1/virtual_bridge_vlan_in_host.py | 4 ++++ recipes/regression_tests/phase2/3_vlans_over_team.py | 5 +++++ recipes/regression_tests/phase2/team_test.py | 15 +++++++++++++++ .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 6 ++++++ .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 4 ++++ .../phase2/virtual_ovs_bridge_vlan_in_host.py | 4 ++++ 12 files changed, 76 insertions(+)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index df1b3fa..6b6cfc1 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -209,6 +209,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- m1.run("tc qdisc replace dev %s root mq" % m1_phy1.get_devname())
- m2.run("tc qdisc replace dev %s root mq" % m2_phy1.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 3a06fc1..198a4cc 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -210,6 +210,11 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- m1.run("tc qdisc replace dev %s root mq" % m1_phy1.get_devname())
- m1.run("tc qdisc replace dev %s root mq" % m1_phy2.get_devname())
- m2.run("tc qdisc replace dev %s root mq" % m2_phy1.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index e075152..9991205 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -218,6 +218,21 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- m1.run("tc qdisc replace dev %s root mq" %
m1.get_interface("eth1").get_devname())
- m1.run("tc qdisc replace dev %s root mq" %
m1.get_interface("eth2").get_devname())
- if test_if2.get_type() == "bond":
m2.run("tc qdisc replace dev %s root mq" %
m2.get_interface("eth1").get_devname())
m2.run("tc qdisc replace dev %s root mq" %
m2.get_interface("eth2").get_devname())
- else:
m2.run("tc qdisc replace dev %s root mq" %
test_if2.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index 4a7f0d8..cc401f4 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.py @@ -189,6 +189,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel" : nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel" : nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- m1.run("tc qdisc replace dev %s root mq" % m1_testiface.get_devname())
- m2.run("tc qdisc replace dev %s root mq" % m2_testiface.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 5baafab..ad958a6 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 @@ -234,6 +234,12 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- h1.run("tc qdisc replace dev %s root mq" % h1_nic1.get_devname())
- h1.run("tc qdisc replace dev %s root mq" % h1_nic2.get_devname())
- h2.run("tc qdisc replace dev %s root mq" % h2_nic1.get_devname())
- h2.run("tc qdisc replace dev %s root mq" % h2_nic2.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 8c1ea70..c32845c 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -215,6 +215,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- h1.run("tc qdisc replace dev %s root mq" % h1_nic.get_devname())
- h2.run("tc qdisc replace dev %s root mq" % h2_nic.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 5c0c7a0..9901d2b 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -214,6 +214,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- h1.run("tc qdisc replace dev %s root mq" % h1_nic.get_devname())
- h2.run("tc qdisc replace dev %s root mq" % h2_nic.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index ec49100..a43a091 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -210,6 +210,11 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- m1.run("tc qdisc replace dev %s root mq" % m1_phy1.get_devname())
- m1.run("tc qdisc replace dev %s root mq" % m1_phy2.get_devname())
- m2.run("tc qdisc replace dev %s root mq" % m2_phy1.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 5bb03c2..ee60488 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -217,6 +217,21 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- m1.run("tc qdisc replace dev %s root mq" %
m1.get_interface("eth1").get_devname())
- m1.run("tc qdisc replace dev %s root mq" %
m1.get_interface("eth2").get_devname())
- if test_if2.get_type() in [ "team", "bond" ]:
m2.run("tc qdisc replace dev %s root mq" %
m2.get_interface("eth1").get_devname())
m2.run("tc qdisc replace dev %s root mq" %
m2.get_interface("eth2").get_devname())
- else:
m2.run("tc qdisc replace dev %s root mq" %
test_if2.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 c994d3e..5cbdbd7 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 @@ -234,6 +234,12 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- h1.run("tc qdisc replace dev %s root mq" % h1_nic1.get_devname())
- h1.run("tc qdisc replace dev %s root mq" % h1_nic2.get_devname())
- h2.run("tc qdisc replace dev %s root mq" % h2_nic1.get_devname())
- h2.run("tc qdisc replace dev %s root mq" % h2_nic2.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 f6823b2..84b0063 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 @@ -213,6 +213,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- h1.run("tc qdisc replace dev %s root mq" % h1_nic.get_devname())
- h2.run("tc qdisc replace dev %s root mq" % h2_nic.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) 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 47e7b31..52241d1 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 @@ -212,6 +212,10 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) netperf_cli_sctp6.update_options({"num_parallel": nperf_num_parallel})
- # we have to use multiqueue qdisc to get appropriate data
- h1.run("tc qdisc replace dev %s root mq" % h1_nic.get_devname())
- h2.run("tc qdisc replace dev %s root mq" % h2_nic.get_devname())
if nperf_msg_size is not None: netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) -- 2.7.4 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org
pushed, thanks
-Ondrej
lnst-developers@lists.fedorahosted.org