[PATCH 1/2] recipes: switchdev: Don't unnecessarily configure VLAN-aware bridges

When VLAN filtering isn't needed we can do with VLAN-unaware bridges. This is necessary for devices that refuse to offload multiple VLAN-aware bridges. Signed-off-by: Ido Schimmel <idosch(a)mellanox.com&gt; --- recipes/switchdev/l2-010-bridge_vlan1d_sanity.py | 4 ++-- recipes/switchdev/l2-011-bridge_vlan1d.py | 4 ++-- recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py | 4 ++-- recipes/switchdev/l2-013-bridge_bond_vlan1d.py | 4 ++-- recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py | 4 ++-- recipes/switchdev/l2-015-bridge_team_vlan1d.py | 6 ++---- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py b/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py index fc43ab3..fc8be86 100644 --- a/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py +++ b/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py @@ -36,11 +36,11 @@ def do_task(ctl, hosts, ifaces, aliases): sw_if1_10 = sw.create_vlan(sw_if1, 10) sw_if2_10 = sw.create_vlan(sw_if2, 10) - sw_br = sw.create_bridge(slaves=[sw_if1_10, sw_if2_10], options=br_options) + sw_br = sw.create_bridge(slaves=[sw_if1_10, sw_if2_10]) sw_if1_20 = sw.create_vlan(sw_if1, 20) sw_if2_21 = sw.create_vlan(sw_if2, 21) - sw.create_bridge(slaves=[sw_if1_20, sw_if2_21], options=br_options) + sw.create_bridge(slaves=[sw_if1_20, sw_if2_21]) sleep(15) diff --git a/recipes/switchdev/l2-011-bridge_vlan1d.py b/recipes/switchdev/l2-011-bridge_vlan1d.py index ccacf79..b199332 100644 --- a/recipes/switchdev/l2-011-bridge_vlan1d.py +++ b/recipes/switchdev/l2-011-bridge_vlan1d.py @@ -34,11 +34,11 @@ def do_task(ctl, hosts, ifaces, aliases): sw_if1_10 = sw.create_vlan(sw_if1, 10) sw_if2_10 = sw.create_vlan(sw_if2, 10) - sw.create_bridge(slaves=[sw_if1_10, sw_if2_10], options=br_options) + sw.create_bridge(slaves=[sw_if1_10, sw_if2_10]) sw_if1_20 = sw.create_vlan(sw_if1, 20) sw_if2_21 = sw.create_vlan(sw_if2, 21) - sw.create_bridge(slaves=[sw_if1_20, sw_if2_21], options=br_options) + sw.create_bridge(slaves=[sw_if1_20, sw_if2_21]) sleep(15) diff --git a/recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py b/recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py index 66c3eff..1c3351d 100644 --- a/recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py +++ b/recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py @@ -40,11 +40,11 @@ def do_task(ctl, hosts, ifaces, aliases): sw_lag1_10 = sw.create_vlan(sw_lag1, 10) sw_lag2_10 = sw.create_vlan(sw_lag2, 10) - sw.create_bridge(slaves=[sw_lag1_10, sw_lag2_10], options=br_options) + sw.create_bridge(slaves=[sw_lag1_10, sw_lag2_10]) sw_lag1_20 = sw.create_vlan(sw_lag1, 20) sw_lag2_21 = sw.create_vlan(sw_lag2, 21) - sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21], options=br_options) + sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21]) sleep(15) diff --git a/recipes/switchdev/l2-013-bridge_bond_vlan1d.py b/recipes/switchdev/l2-013-bridge_bond_vlan1d.py index f2f68d2..e31fd7a 100644 --- a/recipes/switchdev/l2-013-bridge_bond_vlan1d.py +++ b/recipes/switchdev/l2-013-bridge_bond_vlan1d.py @@ -38,11 +38,11 @@ def do_task(ctl, hosts, ifaces, aliases): sw_lag1_10 = sw.create_vlan(sw_lag1, 10) sw_lag2_10 = sw.create_vlan(sw_lag2, 10) - sw.create_bridge(slaves=[sw_lag1_10, sw_lag2_10], options=br_options) + sw.create_bridge(slaves=[sw_lag1_10, sw_lag2_10]) sw_lag1_20 = sw.create_vlan(sw_lag1, 20) sw_lag2_21 = sw.create_vlan(sw_lag2, 21) - sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21], options=br_options) + sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21]) sleep(15) diff --git a/recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py b/recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py index 58753ca..51888eb 100644 --- a/recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py +++ b/recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py @@ -40,11 +40,11 @@ def do_task(ctl, hosts, ifaces, aliases): sw_lag1_10 = sw.create_vlan(sw_lag1, 10) sw_lag2_10 = sw.create_vlan(sw_lag2, 10) - sw.create_bridge(slaves=[sw_lag1_10, sw_lag2_10], options=br_options) + sw.create_bridge(slaves=[sw_lag1_10, sw_lag2_10]) sw_lag1_20 = sw.create_vlan(sw_lag1, 20) sw_lag2_21 = sw.create_vlan(sw_lag2, 21) - sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21], options=br_options) + sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21]) sleep(15) diff --git a/recipes/switchdev/l2-015-bridge_team_vlan1d.py b/recipes/switchdev/l2-015-bridge_team_vlan1d.py index 4078b94..3b9a6ec 100644 --- a/recipes/switchdev/l2-015-bridge_team_vlan1d.py +++ b/recipes/switchdev/l2-015-bridge_team_vlan1d.py @@ -38,13 +38,11 @@ def do_task(ctl, hosts, ifaces, aliases): sw_lag1_10 = sw.create_vlan(sw_lag1, 10) sw_lag2_10 = sw.create_vlan(sw_lag2, 10) - sw_br2 = sw.create_bridge(slaves=[sw_lag1_10, sw_lag2_10], - options=br_options) + sw_br2 = sw.create_bridge(slaves=[sw_lag1_10, sw_lag2_10]) sw_lag1_20 = sw.create_vlan(sw_lag1, 20) sw_lag2_21 = sw.create_vlan(sw_lag2, 21) - sw_br3 = sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21], - options=br_options) + sw_br3 = sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21]) sleep(15) -- 2.9.3