git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://openvswitch.org/openvswitch
[sliver-openvswitch.git]
/
tests
/
lacp.at
diff --git
a/tests/lacp.at
b/tests/lacp.at
index
408b1ec
..
0bcd4b3
100644
(file)
--- a/
tests/lacp.at
+++ b/
tests/lacp.at
@@
-40,7
+40,7
@@
AT_CLEANUP
AT_SETUP([lacp - multi port config])
OVS_VSWITCHD_START([dnl
add-bond br0 bond p1 p2 --\
AT_SETUP([lacp - multi port config])
OVS_VSWITCHD_START([dnl
add-bond br0 bond p1 p2 --\
- set Port bond lacp=active \
+ set Port bond lacp=active
bond-mode=active-backup
\
other_config:lacp-time="fast" \
other_config:lacp-system-id=11:22:33:44:55:66 \
other_config:lacp-system-priority=54321 --\
other_config:lacp-time="fast" \
other_config:lacp-system-id=11:22:33:44:55:66 \
other_config:lacp-system-priority=54321 --\
@@
-141,6
+141,8
@@
OVS_VSWITCHD_START(
AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK
])
AT_CHECK([ovs-appctl netdev-dummy/set-admin-state up], 0, [OK
])
+ovs-appctl time/stop
+
# Wait for up to 5 (simulated) seconds, until LACP negotiation finishes.
i=0
while :; do
# Wait for up to 5 (simulated) seconds, until LACP negotiation finishes.
i=0
while :; do
@@
-290,7
+292,7
@@
AT_CHECK([grep 'active slave' stdout], [0], [dnl
])
# Redirect the patch link between p0 and p2 so that no packets get
])
# Redirect the patch link between p0 and p2 so that no packets get
-# back and forth across them anymore. Then wait
4
simulated
+# back and forth across them anymore. Then wait
2.5
simulated
# seconds. The LACP state should become "expired" for p0 and p2.
AT_CHECK([ovs-vsctl \
-- add-port br0 null0 -- set int null0 type=patch options:peer=p2 -- set int p2 options:peer=null0 \
# seconds. The LACP state should become "expired" for p0 and p2.
AT_CHECK([ovs-vsctl \
-- add-port br0 null0 -- set int null0 type=patch options:peer=p2 -- set int p2 options:peer=null0 \