[PATCH] regression_tests: remove rx off from bonding and team recipes

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Following up on the meeting today we decided not to test rx=off for bond
and team recipes since neither of them support it.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 recipes/regression_tests/phase1/3_vlans_over_bond.py                   | 3 +--
 recipes/regression_tests/phase1/bonding_test.py                        | 3 +--
 recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py    | 3 +--
 recipes/regression_tests/phase2/3_vlans_over_team.py                   | 3 +--
 recipes/regression_tests/phase2/team_test.py                           | 3 +--
 .../phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py       | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index 734d426..291df08 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -27,8 +27,7 @@ offloads = ["gro", "gso", "tso",
"rx", "tx"]
 offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
+                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
 
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 25f36cd..49632ab 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -27,8 +27,7 @@ offloads = ["gro", "gso", "tso",
"rx", "tx"]
 offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
+                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
 
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("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 b6b10c0..9b255c5 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
@@ -34,8 +34,7 @@ offloads = ["gro", "gso", "tso",
"rx", "tx"]
 offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
+                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
 
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 0968dc5..0920d69 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -27,8 +27,7 @@ offloads = ["gro", "gso", "tso",
"rx", "tx"]
 offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
+                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
 
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index 41781d1..b17a5c0 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -26,8 +26,7 @@ offloads = ["gro", "gso", "tso",
"rx", "tx"]
 offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
+                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
 
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("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 e93226d..4b9b096 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
@@ -34,8 +34,7 @@ offloads = ["gro", "gso", "tso",
"rx", "tx"]
 offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
                      [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
+                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
 
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
-- 
2.6.2

[Jan Tluka]

Fri, Oct 30, 2015 at 04:20:45PM CET, olichtne(a)redhat.com wrote:
> From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
> Following up on the meeting today we decided not to test rx=off for bond
> and team recipes since neither of them support it.
>
> Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
> ---
>  recipes/regression_tests/phase1/3_vlans_over_bond.py                   | 3 +--
>  recipes/regression_tests/phase1/bonding_test.py                        | 3 +--
>  recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py    | 3 +--
>  recipes/regression_tests/phase2/3_vlans_over_team.py                   | 3 +--
>  recipes/regression_tests/phase2/team_test.py                           | 3 +--
>  .../phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py       | 3 +--
>  6 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
> b/recipes/regression_tests/phase1/3_vlans_over_bond.py
> index 734d426..291df08 100644
> --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
> +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
> @@ -27,8 +27,7 @@ offloads = ["gro", "gso", "tso",
> "rx", "tx"]
>  offload_settings = [ [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "off"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "on"), ("gso",
> "off"),  ("tso", "off"), ("tx", "on"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "off")]]
> +                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")]]
>  
>  ipv = ctl.get_alias("ipv")
>  mtu = ctl.get_alias("mtu")
> diff --git a/recipes/regression_tests/phase1/bonding_test.py
> b/recipes/regression_tests/phase1/bonding_test.py
> index 25f36cd..49632ab 100644
> --- a/recipes/regression_tests/phase1/bonding_test.py
> +++ b/recipes/regression_tests/phase1/bonding_test.py
> @@ -27,8 +27,7 @@ offloads = ["gro", "gso", "tso",
> "rx", "tx"]
>  offload_settings = [ [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "off"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "on"), ("gso",
> "off"),  ("tso", "off"), ("tx", "on"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "off")]]
> +                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")]]
>  
>  ipv = ctl.get_alias("ipv")
>  mtu = ctl.get_alias("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 b6b10c0..9b255c5 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
> @@ -34,8 +34,7 @@ offloads = ["gro", "gso", "tso",
> "rx", "tx"]
>  offload_settings = [ [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "off"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "on"), ("gso",
> "off"),  ("tso", "off"), ("tx", "on"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "off")]]
> +                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")]]
>  
>  ipv = ctl.get_alias("ipv")
>  netperf_duration = int(ctl.get_alias("netperf_duration"))
> diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
> b/recipes/regression_tests/phase2/3_vlans_over_team.py
> index 0968dc5..0920d69 100644
> --- a/recipes/regression_tests/phase2/3_vlans_over_team.py
> +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
> @@ -27,8 +27,7 @@ offloads = ["gro", "gso", "tso",
> "rx", "tx"]
>  offload_settings = [ [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "off"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "on"), ("gso",
> "off"),  ("tso", "off"), ("tx", "on"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "off")]]
> +                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")]]
>  
>  ipv = ctl.get_alias("ipv")
>  mtu = ctl.get_alias("mtu")
> diff --git a/recipes/regression_tests/phase2/team_test.py
> b/recipes/regression_tests/phase2/team_test.py
> index 41781d1..b17a5c0 100644
> --- a/recipes/regression_tests/phase2/team_test.py
> +++ b/recipes/regression_tests/phase2/team_test.py
> @@ -26,8 +26,7 @@ offloads = ["gro", "gso", "tso",
> "rx", "tx"]
>  offload_settings = [ [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "off"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "on"), ("gso",
> "off"),  ("tso", "off"), ("tx", "on"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "off")]]
> +                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")]]
>  
>  ipv = ctl.get_alias("ipv")
>  mtu = ctl.get_alias("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 e93226d..4b9b096 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
> @@ -34,8 +34,7 @@ offloads = ["gro", "gso", "tso",
> "rx", "tx"]
>  offload_settings = [ [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "off"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "on")],
>                       [("gro", "on"), ("gso",
> "off"),  ("tso", "off"), ("tx", "on"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")],
> -                     [("gro", "on"), ("gso",
> "on"), ("tso", "on"), ("tx", "on"),
> ("rx", "off")]]
> +                     [("gro", "on"), ("gso",
> "on"), ("tso", "off"), ("tx", "off"),
> ("rx", "on")]]
>  
>  ipv = ctl.get_alias("ipv")
>  netperf_duration = int(ctl.get_alias("netperf_duration"))
> -- 
> 2.6.2
>
> _______________________________________________
> LNST-developers mailing list
> LNST-developers(a)lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/lnst-developers 
Acked-by: Jan Tluka <jtluka(a)redhat.com&gt;