[PATCH] recipes: swap order of offload settings

With some drivers like ixgbe or e1000e setting tso offload on will return with non-zero exit code if the offload is already turned on. This makes the whole recipe fail. The simplest solution to this is reverse the order in which the offload is set. Setting offload off does not fail if already set on a device so this change should work. Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt; --- recipes/regression_tests/phase1/3_vlans.py | 4 ++-- recipes/regression_tests/phase1/3_vlans_over_bond.py | 4 ++-- 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 | 4 ++-- recipes/regression_tests/phase2/team_test.py | 4 ++-- .../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, 15 insertions(+), 15 deletions(-) diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 0f1749d..d3406a7 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -98,7 +98,7 @@ for vlan1 in vlans: # These tests should pass # Ping between same VLANs if vlan1 == vlan2: - for state in ["on", "off"]: + for state in ["off", "on"]: # Offload setup m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), offload, state)) @@ -146,7 +146,7 @@ for vlan1 in vlans: # These tests should fail # Ping across different VLAN elif vlan1 != vlan2: - for state in ["on", "off"]: + for state in ["off", "on"]: # Offload setup m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), offload, state)) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 865e2cc..c922719 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -98,7 +98,7 @@ for vlan1 in vlans: # These tests should pass # Ping between same VLANs if vlan1 == vlan2: - for state in ["on", "off"]: + for state in ["off", "on"]: # Offload setup m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), offload, state)) @@ -148,7 +148,7 @@ for vlan1 in vlans: # These tests should fail # Ping across different VLAN elif vlan1 != vlan2: - for state in ["on", "off"]: + for state in ["off", "on"]: # Offload setup m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), offload, state)) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 165978b..5d94f1d 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -88,7 +88,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", }) for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), offload, state)) m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), offload, 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 57d24cf..ecc423d 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 @@ -145,7 +145,7 @@ ping_mod6_bad2 = ctl.get_module("Icmp6Ping", }) for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), offload, state)) h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic2"), 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 aefda4a..e4efece 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -92,7 +92,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", }) for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), 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 e2d32d6..a3b6153 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -92,7 +92,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", }) for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), offload, state)) h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index e8d6281..f7982a9 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -97,7 +97,7 @@ for vlan1 in vlans: # These tests should pass # Ping between same VLANs if vlan1 == vlan2: - for state in ["on", "off"]: + for state in ["off", "on"]: # Offload setup m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), offload, state)) @@ -149,7 +149,7 @@ for vlan1 in vlans: # These tests should fail # Ping across different VLAN elif vlan1 != vlan2: - for state in ["on", "off"]: + for state in ["off", "on"]: # Offload setup m1.run("ethtool -K %s %s %s" % (m1.get_devname("eth1"), offload, state)) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index ba9941d..0482c90 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -87,7 +87,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", }) for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), offload, state)) m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), offload, @@ -190,7 +190,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", }) for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: m1.run("ethtool -K %s %s %s" % (m1.get_devname("test_if"), offload, state)) m2.run("ethtool -K %s %s %s" % (m2.get_devname("test_if"), offload, 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 7238e1b..0b192bc 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 @@ -148,7 +148,7 @@ ping_mod6_bad2 = ctl.get_module("Icmp6Ping", for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic1"), offload, state)) h1.run("ethtool -K %s %s %s" % (h1.get_devname("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 9adf380..9e61372 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 @@ -93,7 +93,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), 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 fbda2cb..a6958d3 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 @@ -92,7 +92,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf", }) for offload in offloads: - for state in ["on", "off"]: + for state in ["off", "on"]: h1.run("ethtool -K %s %s %s" % (h1.get_devname("nic"), offload, state)) g1.run("ethtool -K %s %s %s" % (g1.get_devname("guestnic"), -- 1.9.3