Fixes: bfa1f380f017 ("recipes: Add recipeset for testing switchdev based
switches")
Signed-off-by: Ido Schimmel <idosch(a)mellanox.com>
---
v1->v2:
* No change.
---
recipes/switchdev/l2-002-bridge_fdb.py | 15 +++++----------
recipes/switchdev/l2-017-bridge_fdb_vlan1d.py | 15 +++++----------
recipes/switchdev/l2-018-bridge_fdb_team.py | 15 +++++----------
recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py | 15 +++++----------
4 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/recipes/switchdev/l2-002-bridge_fdb.py
b/recipes/switchdev/l2-002-bridge_fdb.py
index 8e35758..0dfb11b 100644
--- a/recipes/switchdev/l2-002-bridge_fdb.py
+++ b/recipes/switchdev/l2-002-bridge_fdb.py
@@ -121,16 +121,11 @@ def do_task(ctl, hosts, ifaces, aliases):
# bridge code will flush it himself, instead of driver. Unlike the
# previous case, here we check if the driver correctly removes the static
# entry.
- # XXX: This currently fails because firmware doesn't flush static FDBs.
- # Uncomment it when it's introduced.
- #sw_br.slave_del(sw_if1.get_id())
- #sw_br.slave_add(sw_if1.get_id())
- #sw_if1.set_br_learning(on=False, self=True)
- #sw_if1.set_br_flooding(on=False, self=True)
- #tl.ping_simple(m1_if1, m2_if1, fail_expected=True)
-
- # XXX: Cleanup because firmware doesn't do it.
- sw_if1.del_br_fdb(str(m1_if1.get_hwaddr()), self=True, vlan_tci=1)
+ sw_br.slave_del(sw_if1.get_id())
+ sw_br.slave_add(sw_if1.get_id())
+ sw_if1.set_br_learning(on=False, self=True)
+ sw_if1.set_br_flooding(on=False, self=True)
+ tl.ping_simple(m1_if1, m2_if1, fail_expected=True)
do_task(ctl, [ctl.get_host("machine1"),
ctl.get_host("machine2"),
diff --git a/recipes/switchdev/l2-017-bridge_fdb_vlan1d.py
b/recipes/switchdev/l2-017-bridge_fdb_vlan1d.py
index 3edcfc6..26a0020 100644
--- a/recipes/switchdev/l2-017-bridge_fdb_vlan1d.py
+++ b/recipes/switchdev/l2-017-bridge_fdb_vlan1d.py
@@ -123,16 +123,11 @@ def do_task(ctl, hosts, ifaces, aliases):
# bridge code will flush it himself, instead of driver. Unlike the
# previous case, here we check if the driver correctly removes the static
# entry.
- # XXX: This currently fails because firmware doesn't flush static FDBs.
- # Uncomment it when it's introduced.
- #sw_br.slave_del(sw_if1_10.get_id())
- #sw_br.slave_add(sw_if1_10.get_id())
- #sw_if1_10.set_br_learning(on=False, self=True)
- #sw_if1_10.set_br_flooding(on=False, self=True)
- #tl.ping_simple(m1_if1_10, m2_if1_20, fail_expected=True)
-
- # XXX: Cleanup because firmware doesn't do it.
- sw_if1_10.del_br_fdb(str(m1_if1_10.get_hwaddr()), self=True)
+ sw_br.slave_del(sw_if1_10.get_id())
+ sw_br.slave_add(sw_if1_10.get_id())
+ sw_if1_10.set_br_learning(on=False, self=True)
+ sw_if1_10.set_br_flooding(on=False, self=True)
+ tl.ping_simple(m1_if1_10, m2_if1_20, fail_expected=True)
do_task(ctl, [ctl.get_host("machine1"),
ctl.get_host("machine2"),
diff --git a/recipes/switchdev/l2-018-bridge_fdb_team.py
b/recipes/switchdev/l2-018-bridge_fdb_team.py
index a4443f6..0cf75e8 100644
--- a/recipes/switchdev/l2-018-bridge_fdb_team.py
+++ b/recipes/switchdev/l2-018-bridge_fdb_team.py
@@ -125,16 +125,11 @@ def do_task(ctl, hosts, ifaces, aliases):
# bridge code will flush it himself, instead of driver. Unlike the
# previous case, here we check if the driver correctly removes the static
# entry.
- # XXX: This currently fails because firmware doesn't flush static FDBs.
- # Uncomment it when it's introduced.
- #sw_br.slave_del(sw_lag1.get_id())
- #sw_br.slave_add(sw_lag1.get_id())
- #sw_lag1.set_br_learning(on=False, self=True)
- #sw_lag1.set_br_flooding(on=False, self=True)
- #tl.ping_simple(m1_lag1, m2_lag1, fail_expected=True)
-
- # XXX: Cleanup because firmware doesn't do it.
- sw_lag1.del_br_fdb(str(m1_lag1.get_hwaddr()), self=True, vlan_tci=1)
+ sw_br.slave_del(sw_lag1.get_id())
+ sw_br.slave_add(sw_lag1.get_id())
+ sw_lag1.set_br_learning(on=False, self=True)
+ sw_lag1.set_br_flooding(on=False, self=True)
+ tl.ping_simple(m1_lag1, m2_lag1, fail_expected=True)
do_task(ctl, [ctl.get_host("machine1"),
ctl.get_host("machine2"),
diff --git a/recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py
b/recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py
index 3d588d0..7784997 100644
--- a/recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py
+++ b/recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py
@@ -132,16 +132,11 @@ def do_task(ctl, hosts, ifaces, aliases):
# bridge code will flush it himself, instead of driver. Unlike the
# previous case, here we check if the driver correctly removes the static
# entry.
- # XXX: This currently fails because firmware doesn't flush static FDBs.
- # Uncomment it when it's introduced.
- #sw_br.slave_del(sw_lag1_10.get_id())
- #sw_br.slave_add(sw_lag1_10.get_id())
- #sw_lag1_10.set_br_learning(on=False, self=True)
- #sw_lag1_10.set_br_flooding(on=False, self=True)
- #tl.ping_simple(m1_lag1_10, m2_lag1_20, fail_expected=True)
-
- # XXX: Cleanup because firmware doesn't do it.
- sw_lag1_10.del_br_fdb(str(m1_lag1_10.get_hwaddr()), self=True)
+ sw_br.slave_del(sw_lag1_10.get_id())
+ sw_br.slave_add(sw_lag1_10.get_id())
+ sw_lag1_10.set_br_learning(on=False, self=True)
+ sw_lag1_10.set_br_flooding(on=False, self=True)
+ tl.ping_simple(m1_lag1_10, m2_lag1_20, fail_expected=True)
do_task(ctl, [ctl.get_host("machine1"),
ctl.get_host("machine2"),
--
2.4.10