From: Ondrej Lichtner olichtne@redhat.com

Instead of changing the device features (offloads) one by one by calling multiple ethtool commands we will be calling just one big ethtool command changing all the features of the specific offload setting. This avoids any dependencies between offloads.

Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 19 ++++---- .../regression_tests/phase1/3_vlans_over_bond.py | 25 ++++++----- recipes/regression_tests/phase1/bonding_test.py | 16 +++---- .../phase1/virtual_bridge_2_vlans_over_bond.py | 52 +++++++++------------- .../phase1/virtual_bridge_vlan_in_guest.py | 22 +++++---- .../phase1/virtual_bridge_vlan_in_host.py | 22 +++++---- .../regression_tests/phase2/3_vlans_over_team.py | 25 ++++++----- recipes/regression_tests/phase2/team_test.py | 32 ++++++------- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 52 +++++++++------------- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 22 +++++---- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 22 +++++---- 11 files changed, 141 insertions(+), 168 deletions(-)

diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 68974e7..7dbcf41 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -129,11 +129,14 @@ for vlan1 in vlans: # These tests should pass # Ping between same VLANs for setting in offload_settings: + dev_features = "" for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), - offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + + m1.run("ethtool -K %s %s" % (m1_phy1.get_devname(), + dev_features)) + m2.run("ethtool -K %s %s" % (m2_phy1.get_devname(), + dev_features))

if ipv in [ 'ipv4', 'both' ]: # Ping test @@ -247,8 +250,8 @@ for vlan1 in vlans: m1.run(ping_mod6, expect="fail")

#reset offload states +dev_features = "" for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), - offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +m1.run("ethtool -K %s %s" % (m1_phy1.get_devname(), dev_features)) +m2.run("ethtool -K %s %s" % (m2_phy1.get_devname(), dev_features)) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index d382036..55dfa3b 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -132,13 +132,15 @@ for vlan1 in vlans: # Ping between same VLANs for setting in offload_settings: #apply offload setting + dev_features = "" for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), - offload[0], offload[1])) - m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), - offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + m1.run("ethtool -K %s %s" % (m1_phy1.get_devname(), + dev_features)) + m1.run("ethtool -K %s %s" % (m1_phy2.get_devname(), + dev_features)) + m2.run("ethtool -K %s %s" % (m2_phy1.get_devname(), + dev_features))

if ipv in [ 'ipv4', 'both' ]: # Ping test @@ -253,10 +255,9 @@ for vlan1 in vlans: m1.run(ping_mod6, expect="fail")

#reset offload states +dev_features = "" for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), - offload, "on")) - m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), - offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +m1.run("ethtool -K %s %s" % (m1_phy1.get_devname(), dev_features)) +m1.run("ethtool -K %s %s" % (m1_phy2.get_devname(), dev_features)) +m2.run("ethtool -K %s %s" % (m2_phy1.get_devname(), dev_features)) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 079a8fe..da2ac82 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -117,11 +117,11 @@ netperf_cli_udp6 = ctl.get_module("Netperf", ctl.wait(15)

for setting in offload_settings: + dev_features = "" for offload in setting: - m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), - offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + m1.run("ethtool -K %s %s" % (test_if1.get_devname(), dev_features)) + m2.run("ethtool -K %s %s" % (test_if2.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: m1.run(ping_mod) @@ -216,8 +216,8 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), - offload, "on")) - m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +m1.run("ethtool -K %s %s" % (test_if1.get_devname(), dev_features)) +m2.run("ethtool -K %s %s" % (test_if2.get_devname(), dev_features)) 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 e1c7796..c9eac90 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 @@ -202,23 +202,17 @@ g4.get_interface("guestnic").set_mtu(mtu) ctl.wait(15)

for setting in offload_settings: + dev_features = "" for offload in setting: - h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(), - offload[0], offload[1])) - h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(), - offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(), - offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(), - offload[0], offload[1])) - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload[0], offload[1])) - g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(), - offload[0], offload[1])) - g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(), - offload[0], offload[1])) - g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + h1.run("ethtool -K %s %s" % (h1_nic1.get_devname(), dev_features)) + h1.run("ethtool -K %s %s" % (h1_nic2.get_devname(), dev_features)) + h2.run("ethtool -K %s %s" % (h2_nic1.get_devname(), dev_features)) + h2.run("ethtool -K %s %s" % (h2_nic2.get_devname(), dev_features)) + g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) + g2.run("ethtool -K %s %s" % (g2_guestnic.get_devname(), dev_features)) + g3.run("ethtool -K %s %s" % (g3_guestnic.get_devname(), dev_features)) + g4.run("ethtool -K %s %s" % (g4_guestnic.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: g1.run(ping_mod) @@ -325,20 +319,14 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(), - offload, "on")) - h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(), - offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(), - offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(), - offload, "on")) - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload, "on")) - g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(), - offload, "on")) - g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(), - offload, "on")) - g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(), - offload, "on")) + dev_features = " %s %s" % (offload, "on") +h1.run("ethtool -K %s %s" % (h1_nic1.get_devname(), dev_features)) +h1.run("ethtool -K %s %s" % (h1_nic2.get_devname(), dev_features)) +h2.run("ethtool -K %s %s" % (h2_nic1.get_devname(), dev_features)) +h2.run("ethtool -K %s %s" % (h2_nic2.get_devname(), dev_features)) +g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) +g2.run("ethtool -K %s %s" % (g2_guestnic.get_devname(), dev_features)) +g3.run("ethtool -K %s %s" % (g3_guestnic.get_devname(), dev_features)) +g4.run("ethtool -K %s %s" % (g4_guestnic.get_devname(), dev_features)) 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 81e4a25..16b51bc 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -134,13 +134,12 @@ h2.get_interface("nic").set_mtu(mtu) ctl.wait(15)

for setting in offload_settings: + dev_features = "" for offload in setting: - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload[0], offload[1])) - h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), - offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) + h1.run("ethtool -K %s %s" % (h1_nic.get_devname(), dev_features)) + h2.run("ethtool -K %s %s" % (h2_nic.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: g1.run(ping_mod) @@ -241,10 +240,9 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload, "on")) - h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), - offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) +h1.run("ethtool -K %s %s" % (h1_nic.get_devname(), dev_features)) +h2.run("ethtool -K %s %s" % (h2_nic.get_devname(), dev_features)) 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 e5d4927..ad9f833 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -134,13 +134,12 @@ h2.get_interface("vlan10").set_mtu(mtu) ctl.wait(15)

for setting in offload_settings: + dev_features = "" for offload in setting: - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload[0], offload[1])) - h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), - offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) + h1.run("ethtool -K %s %s" % (h1_nic.get_devname(), dev_features)) + h2.run("ethtool -K %s %s" % (h2_nic.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: g1.run(ping_mod) @@ -241,10 +240,9 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload, "on")) - h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), - offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) +h1.run("ethtool -K %s %s" % (h1_nic.get_devname(), dev_features)) +h2.run("ethtool -K %s %s" % (h2_nic.get_devname(), dev_features)) diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 28914cc..ee3706f 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -132,13 +132,15 @@ for vlan1 in vlans: # These tests should pass # Ping between same VLANs for setting in offload_settings: + dev_features = "" for offload in setting: - m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), - offload[0], offload[1])) - m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), - offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + m1.run("ethtool -K %s %s" % (m1_phy1.get_devname(), + dev_features)) + m1.run("ethtool -K %s %s" % (m1_phy2.get_devname(), + dev_features)) + m2.run("ethtool -K %s %s" % (m2_phy1.get_devname(), + dev_features))

if ipv in [ 'ipv4', 'both' ]: # Ping test @@ -252,10 +254,9 @@ for vlan1 in vlans: m1.run(ping_mod6, expect="fail")

#reset offload states +dev_features = "" for offload in offloads: - m1.run("ethtool -K %s %s %s" % (m1_phy1.get_devname(), - offload, "on")) - m1.run("ethtool -K %s %s %s" % (m1_phy2.get_devname(), - offload, "on")) - m2.run("ethtool -K %s %s %s" % (m2_phy1.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +m1.run("ethtool -K %s %s" % (m1_phy1.get_devname(), dev_features)) +m1.run("ethtool -K %s %s" % (m1_phy2.get_devname(), dev_features)) +m2.run("ethtool -K %s %s" % (m2_phy1.get_devname(), dev_features)) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 9ee0ae0..ba7bd55 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -117,11 +117,11 @@ netperf_cli_udp6 = ctl.get_module("Netperf", ctl.wait(15)

for setting in offload_settings: + dev_features = "" for offload in setting: - m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), - offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + m1.run("ethtool -K %s %s" % (test_if1.get_devname(), dev_features)) + m2.run("ethtool -K %s %s" % (test_if2.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: m1.run(ping_mod) @@ -223,11 +223,11 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), - offload, "on")) - m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +m1.run("ethtool -K %s %s" % (test_if1.get_devname(), dev_features)) +m2.run("ethtool -K %s %s" % (test_if2.get_devname(), dev_features))

ping_mod.update_options({"addr" : test_if1.get_ip(0), "iface" : test_if2.get_devname()}) @@ -252,11 +252,11 @@ netperf_cli_udp6.update_options({"netperf_server" : test_if2.get_ip(1), "netperf_opts" : "-i %s -L %s -6" % (nperf_max_runs, test_if1.get_ip(1))})

for setting in offload_settings: + dev_features = "" for offload in setting: - m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), - offload[0], offload[1])) - m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + m1.run("ethtool -K %s %s" % (test_if1.get_devname(), dev_features)) + m2.run("ethtool -K %s %s" % (test_if2.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: m2.run(ping_mod) @@ -358,8 +358,8 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - m1.run("ethtool -K %s %s %s" % (test_if1.get_devname(), - offload, "on")) - m2.run("ethtool -K %s %s %s" % (test_if2.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload "on") +m1.run("ethtool -K %s %s" % (test_if1.get_devname(), dev_features)) +m2.run("ethtool -K %s %s" % (test_if2.get_devname(), dev_features)) 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 4f824a0..43a8dde 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 @@ -179,23 +179,17 @@ ping_mod6_bad2 = ctl.get_module("Icmp6Ping", ctl.wait(15)

for setting in offload_settings: + dev_features = "" for offload in setting: - h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(), - offload[0], offload[1])) - h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(), - offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(), - offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(), - offload[0], offload[1])) - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload[0], offload[1])) - g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(), - offload[0], offload[1])) - g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(), - offload[0], offload[1])) - g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + h1.run("ethtool -K %s %s" % (h1_nic1.get_devname(), dev_features)) + h1.run("ethtool -K %s %s" % (h1_nic2.get_devname(), dev_features)) + h2.run("ethtool -K %s %s" % (h2_nic1.get_devname(), dev_features)) + h2.run("ethtool -K %s %s" % (h2_nic2.get_devname(), dev_features)) + g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) + g2.run("ethtool -K %s %s" % (g2_guestnic.get_devname(), dev_features)) + g3.run("ethtool -K %s %s" % (g3_guestnic.get_devname(), dev_features)) + g4.run("ethtool -K %s %s" % (g4_guestnic.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: g1.run(ping_mod) @@ -295,20 +289,14 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - h1.run("ethtool -K %s %s %s" % (h1_nic1.get_devname(), - offload, "on")) - h1.run("ethtool -K %s %s %s" % (h1_nic2.get_devname(), - offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2_nic1.get_devname(), - offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2_nic2.get_devname(), - offload, "on")) - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload, "on")) - g2.run("ethtool -K %s %s %s" % (g2_guestnic.get_devname(), - offload, "on")) - g3.run("ethtool -K %s %s %s" % (g3_guestnic.get_devname(), - offload, "on")) - g4.run("ethtool -K %s %s %s" % (g4_guestnic.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +h1.run("ethtool -K %s %s" % (h1_nic1.get_devname(), dev_features)) +h1.run("ethtool -K %s %s" % (h1_nic2.get_devname(), dev_features)) +h2.run("ethtool -K %s %s" % (h2_nic1.get_devname(), dev_features)) +h2.run("ethtool -K %s %s" % (h2_nic2.get_devname(), dev_features)) +g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) +g2.run("ethtool -K %s %s" % (g2_guestnic.get_devname(), dev_features)) +g3.run("ethtool -K %s %s" % (g3_guestnic.get_devname(), dev_features)) +g4.run("ethtool -K %s %s" % (g4_guestnic.get_devname(), dev_features)) 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 9ab7398..afc8c7d 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 @@ -121,13 +121,12 @@ netperf_cli_udp6 = ctl.get_module("Netperf", ctl.wait(15)

for setting in offload_settings: + dev_features = "" for offload in setting: - h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), - offload[0], offload[1])) - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + h1.run("ethtool -K %s %s" % (h1_nic.get_devname(), dev_features)) + g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) + h2.run("ethtool -K %s %s" % (h2_nic.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: g1.run(ping_mod) @@ -221,10 +220,9 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), - offload, "on")) - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +h1.run("ethtool -K %s %s" % (h1_nic.get_devname(), dev_features)) +g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) +h2.run("ethtool -K %s %s" % (h2_nic.get_devname(), dev_features)) 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 024369e..6378e0d 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 @@ -119,13 +119,12 @@ netperf_cli_udp6 = ctl.get_module("Netperf", ctl.wait(15)

for setting in offload_settings: + dev_features = "" for offload in setting: - h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), - offload[0], offload[1])) - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload[0], offload[1])) - h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), - offload[0], offload[1])) + dev_features += " %s %s" % (offload[0], offload[1]) + h1.run("ethtool -K %s %s" % (h1_nic.get_devname(), dev_features)) + g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) + h2.run("ethtool -K %s %s" % (h2_nic.get_devname(), dev_features))

if ipv in [ 'ipv4', 'both' ]: g1.run(ping_mod) @@ -220,10 +219,9 @@ for setting in offload_settings: server_proc.intr()

#reset offload states +dev_features = "" for offload in offloads: - h1.run("ethtool -K %s %s %s" % (h1_nic.get_devname(), - offload, "on")) - g1.run("ethtool -K %s %s %s" % (g1_guestnic.get_devname(), - offload, "on")) - h2.run("ethtool -K %s %s %s" % (h2_nic.get_devname(), - offload, "on")) + dev_features += " %s %s" % (offload, "on") +h1.run("ethtool -K %s %s" % (h1_nic.get_devname(), dev_features)) +g1.run("ethtool -K %s %s" % (g1_guestnic.get_devname(), dev_features)) +h2.run("ethtool -K %s %s" % (h2_nic.get_devname(), dev_features))