Increase the sleep time needed for ports to become active to 30 seconds, as
15 seconds are not always enough.
Signed-off-by: Yotam Gigi <yotamg(a)mellanox.com>
---
recipes/switchdev/l2-000-minimal.py | 2 +-
recipes/switchdev/l2-001-bridge.py | 2 +-
recipes/switchdev/l2-002-bridge_fdb.py | 4 ++--
recipes/switchdev/l2-003-bridge_stp.py | 4 ++--
recipes/switchdev/l2-004-bridge_bond.py | 2 +-
recipes/switchdev/l2-005-bridge_bond_failover.py | 2 +-
recipes/switchdev/l2-006-bridge_team.py | 6 +++---
recipes/switchdev/l2-007-bridge_team_failover.py | 2 +-
recipes/switchdev/l2-008-bridge_vlan1q_sanity.py | 4 ++--
recipes/switchdev/l2-009-bridge_vlan1q.py | 2 +-
recipes/switchdev/l2-010-bridge_vlan1d_sanity.py | 4 ++--
recipes/switchdev/l2-011-bridge_vlan1d.py | 2 +-
recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py | 2 +-
recipes/switchdev/l2-013-bridge_bond_vlan1d.py | 2 +-
recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py | 2 +-
recipes/switchdev/l2-015-bridge_team_vlan1d.py | 6 +++---
recipes/switchdev/l2-017-bridge_fdb_vlan1d.py | 4 ++--
recipes/switchdev/l2-018-bridge_fdb_team.py | 10 +++++-----
recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py | 10 +++++-----
recipes/switchdev/l2-020-bridge_mdb.py | 2 +-
recipes/switchdev/l2-021-span.py | 2 +-
21 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/recipes/switchdev/l2-000-minimal.py b/recipes/switchdev/l2-000-minimal.py
index dcc9532..2b4dda7 100644
--- a/recipes/switchdev/l2-000-minimal.py
+++ b/recipes/switchdev/l2-000-minimal.py
@@ -21,7 +21,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw.create_bridge(slaves=[sw_if1, sw_if2], options={"vlan_filtering": 1})
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_if1, m2_if1)
diff --git a/recipes/switchdev/l2-001-bridge.py b/recipes/switchdev/l2-001-bridge.py
index f92dae9..0b530b1 100644
--- a/recipes/switchdev/l2-001-bridge.py
+++ b/recipes/switchdev/l2-001-bridge.py
@@ -21,7 +21,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw.create_bridge(slaves=[sw_if1, sw_if2], options={"vlan_filtering": 1})
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_if1, m2_if1)
diff --git a/recipes/switchdev/l2-002-bridge_fdb.py
b/recipes/switchdev/l2-002-bridge_fdb.py
index 0dfb11b..f28997a 100644
--- a/recipes/switchdev/l2-002-bridge_fdb.py
+++ b/recipes/switchdev/l2-002-bridge_fdb.py
@@ -28,14 +28,14 @@ def do_task(ctl, hosts, ifaces, aliases):
br_options = {"vlan_filtering": 1, "ageing_time": 1000}
sw_br = sw.create_bridge(slaves = [sw_if1, sw_if2], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_if1, m2_if1)
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "software")
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "software", False)
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "hardware", False)
diff --git a/recipes/switchdev/l2-003-bridge_stp.py
b/recipes/switchdev/l2-003-bridge_stp.py
index 94bd6be..44e87e7 100644
--- a/recipes/switchdev/l2-003-bridge_stp.py
+++ b/recipes/switchdev/l2-003-bridge_stp.py
@@ -53,7 +53,7 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "software")
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "software", False)
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "hardware", False)
@@ -65,7 +65,7 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "software")
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "software", False)
tl.check_fdb(sw_if1, m1_if1.get_hwaddr(), 1, "hardware", False)
diff --git a/recipes/switchdev/l2-004-bridge_bond.py
b/recipes/switchdev/l2-004-bridge_bond.py
index 8378bbd..9599760 100644
--- a/recipes/switchdev/l2-004-bridge_bond.py
+++ b/recipes/switchdev/l2-004-bridge_bond.py
@@ -27,7 +27,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw.create_bridge(slaves=[sw_lag1, sw_lag2], options={"vlan_filtering": 1})
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_lag1, m2_lag1)
diff --git a/recipes/switchdev/l2-005-bridge_bond_failover.py
b/recipes/switchdev/l2-005-bridge_bond_failover.py
index f5c7c63..f3e0b76 100644
--- a/recipes/switchdev/l2-005-bridge_bond_failover.py
+++ b/recipes/switchdev/l2-005-bridge_bond_failover.py
@@ -27,7 +27,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw.create_bridge(slaves=[sw_lag1, sw_lag2], options={"vlan_filtering": 1})
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_lag1, m2_lag1)
diff --git a/recipes/switchdev/l2-006-bridge_team.py
b/recipes/switchdev/l2-006-bridge_team.py
index 5366b39..a649e6f 100644
--- a/recipes/switchdev/l2-006-bridge_team.py
+++ b/recipes/switchdev/l2-006-bridge_team.py
@@ -34,7 +34,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_br = sw.create_bridge(slaves=[sw_lag1, sw_lag2],
options={"vlan_filtering": 1})
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_lag1, m2_lag1)
@@ -50,7 +50,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_if1.reset(ip=["192.168.102.10/24", "2003::1/64"])
m1_if1.reset(ip=["192.168.102.11/24", "2003::2/64"])
- sleep(15)
+ sleep(30)
tl.ping_simple(sw_if1, m1_if1)
@@ -61,7 +61,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_br.slave_add(sw_lag3.get_id())
m1_lag1.slave_add(m1_if1.get_id())
- sleep(15)
+ sleep(30)
tl.ping_simple(m1_lag1, m2_lag1)
tl.netperf_tcp(m1_lag1, m2_lag1)
diff --git a/recipes/switchdev/l2-007-bridge_team_failover.py
b/recipes/switchdev/l2-007-bridge_team_failover.py
index d3a8ee5..c89db02 100644
--- a/recipes/switchdev/l2-007-bridge_team_failover.py
+++ b/recipes/switchdev/l2-007-bridge_team_failover.py
@@ -33,7 +33,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw.create_bridge(slaves=[sw_lag1, sw_lag2], options={"vlan_filtering": 1})
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_lag1, m2_lag1)
diff --git a/recipes/switchdev/l2-008-bridge_vlan1q_sanity.py
b/recipes/switchdev/l2-008-bridge_vlan1q_sanity.py
index d415caf..0133df4 100644
--- a/recipes/switchdev/l2-008-bridge_vlan1q_sanity.py
+++ b/recipes/switchdev/l2-008-bridge_vlan1q_sanity.py
@@ -52,7 +52,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_if1.add_br_vlan(20)
sw_if2.add_br_vlan(20)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
@@ -95,7 +95,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_br.slave_del(sw_if1.get_id())
sw_if1.reset(ip=test_ip(1, 3))
- sleep(15)
+ sleep(30)
tl.ping_simple(sw_if1, m1_if1)
diff --git a/recipes/switchdev/l2-009-bridge_vlan1q.py
b/recipes/switchdev/l2-009-bridge_vlan1q.py
index 7a982cd..5b8dea6 100644
--- a/recipes/switchdev/l2-009-bridge_vlan1q.py
+++ b/recipes/switchdev/l2-009-bridge_vlan1q.py
@@ -37,7 +37,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_if1.add_br_vlan(20)
sw_if2.add_br_vlan(20)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
diff --git a/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py
b/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py
index fc43ab3..6df2b2d 100644
--- a/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py
+++ b/recipes/switchdev/l2-010-bridge_vlan1d_sanity.py
@@ -42,7 +42,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_if2_21 = sw.create_vlan(sw_if2, 21)
sw.create_bridge(slaves=[sw_if1_20, sw_if2_21], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_if1, m2_if1)
@@ -53,7 +53,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_br.slave_del(sw_if1_10.get_id())
sw_if1_10.reset(ip=test_ip(2, 3))
- sleep(15)
+ sleep(30)
tl.ping_simple(sw_if1_10, m1_if1_10)
diff --git a/recipes/switchdev/l2-011-bridge_vlan1d.py
b/recipes/switchdev/l2-011-bridge_vlan1d.py
index ccacf79..0885720 100644
--- a/recipes/switchdev/l2-011-bridge_vlan1d.py
+++ b/recipes/switchdev/l2-011-bridge_vlan1d.py
@@ -40,7 +40,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_if2_21 = sw.create_vlan(sw_if2, 21)
sw.create_bridge(slaves=[sw_if1_20, sw_if2_21], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
diff --git a/recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py
b/recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py
index 66c3eff..4c408e9 100644
--- a/recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py
+++ b/recipes/switchdev/l2-012-bridge_bond_vlan1d_sanity.py
@@ -46,7 +46,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_lag2_21 = sw.create_vlan(sw_lag2, 21)
sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_lag1, m2_lag1)
diff --git a/recipes/switchdev/l2-013-bridge_bond_vlan1d.py
b/recipes/switchdev/l2-013-bridge_bond_vlan1d.py
index f2f68d2..e0d3160 100644
--- a/recipes/switchdev/l2-013-bridge_bond_vlan1d.py
+++ b/recipes/switchdev/l2-013-bridge_bond_vlan1d.py
@@ -44,7 +44,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_lag2_21 = sw.create_vlan(sw_lag2, 21)
sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
diff --git a/recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py
b/recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py
index 58753ca..5924eaf 100644
--- a/recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py
+++ b/recipes/switchdev/l2-014-bridge_team_vlan1d_sanity.py
@@ -46,7 +46,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_lag2_21 = sw.create_vlan(sw_lag2, 21)
sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_lag1, m2_lag1)
diff --git a/recipes/switchdev/l2-015-bridge_team_vlan1d.py
b/recipes/switchdev/l2-015-bridge_team_vlan1d.py
index 4078b94..64c4156 100644
--- a/recipes/switchdev/l2-015-bridge_team_vlan1d.py
+++ b/recipes/switchdev/l2-015-bridge_team_vlan1d.py
@@ -46,7 +46,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_br3 = sw.create_bridge(slaves=[sw_lag1_20, sw_lag2_21],
options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
@@ -71,7 +71,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw_if1.reset(ip=test_ip(4, 1))
m1_if1.reset(ip=test_ip(4, 2))
- sleep(15)
+ sleep(30)
tl.ping_simple(sw_if1, m1_if1)
@@ -89,7 +89,7 @@ def do_task(ctl, hosts, ifaces, aliases):
m1_lag1.slave_add(m1_if1.get_id())
- sleep(15)
+ sleep(30)
tl.ping_simple(m1_lag1, m2_lag1)
tl.netperf_tcp(m1_lag1, m2_lag1)
diff --git a/recipes/switchdev/l2-017-bridge_fdb_vlan1d.py
b/recipes/switchdev/l2-017-bridge_fdb_vlan1d.py
index 26a0020..eb3fc60 100644
--- a/recipes/switchdev/l2-017-bridge_fdb_vlan1d.py
+++ b/recipes/switchdev/l2-017-bridge_fdb_vlan1d.py
@@ -30,14 +30,14 @@ def do_task(ctl, hosts, ifaces, aliases):
br_options = {"vlan_filtering": 0, "ageing_time": 1000}
sw_br = sw.create_bridge(slaves = [sw_if1_10, sw_if2_20], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_if1_10, m2_if1_20)
tl.check_fdb(sw_if1_10, m1_if1_10.get_hwaddr(), 0, "software")
tl.check_fdb(sw_if1_10, m1_if1_10.get_hwaddr(), 0, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_if1_10, m1_if1_10.get_hwaddr(), 0, "software", False)
tl.check_fdb(sw_if1_10, m1_if1_10.get_hwaddr(), 0, "hardware", False)
diff --git a/recipes/switchdev/l2-018-bridge_fdb_team.py
b/recipes/switchdev/l2-018-bridge_fdb_team.py
index 0cf75e8..f7b70a4 100644
--- a/recipes/switchdev/l2-018-bridge_fdb_team.py
+++ b/recipes/switchdev/l2-018-bridge_fdb_team.py
@@ -32,14 +32,14 @@ def do_task(ctl, hosts, ifaces, aliases):
br_options = {"vlan_filtering": 1, "ageing_time": 1000}
sw_br = sw.create_bridge(slaves = [sw_lag1, sw_lag2], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_lag1, m2_lag1)
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "software")
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "software", False)
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "hardware", False)
@@ -74,7 +74,7 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "software")
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "software", False)
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "hardware", False)
@@ -101,7 +101,7 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "software")
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "software", False)
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "hardware", False)
@@ -113,7 +113,7 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "software", False)
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "hardware")
- sleep(20)
+ sleep(30)
# Make sure static entry is not aged out.
tl.check_fdb(sw_lag1, m1_lag1.get_hwaddr(), 1, "software", False)
diff --git a/recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py
b/recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py
index 7784997..b3a20d5 100644
--- a/recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py
+++ b/recipes/switchdev/l2-019-bridge_fdb_team_vlan1d.py
@@ -39,14 +39,14 @@ def do_task(ctl, hosts, ifaces, aliases):
br_options = {"vlan_filtering": 0, "ageing_time": 1000}
sw_br = sw.create_bridge(slaves = [sw_lag1_10, sw_lag2_20], options=br_options)
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.ping_simple(m1_lag1_10, m2_lag1_20)
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "software")
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "software", False)
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "hardware", False)
@@ -81,7 +81,7 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "software")
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "software", False)
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "hardware", False)
@@ -108,7 +108,7 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "software")
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "hardware")
- sleep(20)
+ sleep(30)
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "software", False)
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "hardware", False)
@@ -120,7 +120,7 @@ def do_task(ctl, hosts, ifaces, aliases):
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "software", False)
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "hardware")
- sleep(20)
+ sleep(30)
# Make sure static entry is not aged out.
tl.check_fdb(sw_lag1_10, m1_lag1_10.get_hwaddr(), 0, "software", False)
diff --git a/recipes/switchdev/l2-020-bridge_mdb.py
b/recipes/switchdev/l2-020-bridge_mdb.py
index fdd85e8..04bcae9 100644
--- a/recipes/switchdev/l2-020-bridge_mdb.py
+++ b/recipes/switchdev/l2-020-bridge_mdb.py
@@ -29,7 +29,7 @@ def do_task(ctl, hosts, ifaces, aliases):
m2_if.set_addresses(["192.168.101.11/24", "2002::2/64"])
m3_if.set_addresses(["192.168.101.13/24", "2002::3/64"])
m4_if.set_addresses(["192.168.101.14/24", "2002::4/64"])
- sleep(15)
+ sleep(30)
tl = TestLib(ctl, aliases)
tl.iperf_mc(m1_if, [m2_if, m4_if], [m3_if], "239.255.1.3")
diff --git a/recipes/switchdev/l2-021-span.py b/recipes/switchdev/l2-021-span.py
index dfa0e99..92dea37 100644
--- a/recipes/switchdev/l2-021-span.py
+++ b/recipes/switchdev/l2-021-span.py
@@ -100,7 +100,7 @@ def do_task(ctl, hosts, ifaces, aliases):
sw.create_bridge(slaves=[sw_if1, sw_if2], options={"vlan_filtering": 1})
mirred_port = MirredPort(sw_if2)
- sleep(15)
+ sleep(30)
mirror_status = {"ingress": False, "egress": False }
for i in range(10):
--
2.8.4