From: Ido Schimmel <idosch(a)mellanox.com>
As explained in the previous commit, we currently have some ordering
problems in the switchdev infrastructure. These prevent us from
offloading an existing IP configuration on a bridge port once it's
unbridged.
Therefore, set the IP configuration on the port only after it's removed
from the bridge.
Signed-off-by: Ido Schimmel <idosch(a)mellanox.com>
---
recipes/switchdev/l2-008-bridge_vlan1q_sanity.py | 5 ++---
recipes/switchdev/l2-010-bridge_vlan1d_sanity.py | 5 +++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/recipes/switchdev/l2-008-bridge_vlan1q_sanity.py
b/recipes/switchdev/l2-008-bridge_vlan1q_sanity.py
index 555891b..d415caf 100644
--- a/recipes/switchdev/l2-008-bridge_vlan1q_sanity.py
+++ b/recipes/switchdev/l2-008-bridge_vlan1q_sanity.py
@@ -44,8 +44,6 @@ def do_task(ctl, hosts, ifaces, aliases):
m2_if1_20 = m2.create_vlan(m2_if1, 20, ip=test_ip(3, 2))
m2_if1_30 = m2.create_vlan(m2_if1, 30, ip=test_ip(4, 2))
- sw_if1.reset(ip=test_ip(1, 3))
-
br_options = {"vlan_filtering": 1}
sw_br = sw.create_bridge(slaves=[sw_if1, sw_if2], options=br_options)
@@ -95,8 +93,9 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.ping_simple(m1_if1, m2_if1)
sw_br.slave_del(sw_if1.get_id())
+ sw_if1.reset(ip=test_ip(1, 3))
- sleep(5)
+ sleep(15)
tl.ping_simple(sw_if1, m1_if1)
diff --git a/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py
b/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py
index b30f741..fc43ab3 100644
--- a/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py
+++ b/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py
@@ -34,7 +34,7 @@ def do_task(ctl, hosts, ifaces, aliases):
br_options = {"vlan_filtering": 1}
sw.create_bridge(slaves=[sw_if1, sw_if2], options=br_options)
- sw_if1_10 = sw.create_vlan(sw_if1, 10, ip=test_ip(2, 3))
+ 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)
@@ -51,8 +51,9 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.ping_simple(m1_if1_30, m2_if1_30, fail_expected=True)
sw_br.slave_del(sw_if1_10.get_id())
+ sw_if1_10.reset(ip=test_ip(2, 3))
- sleep(5)
+ sleep(15)
tl.ping_simple(sw_if1_10, m1_if1_10)
--
2.7.4