diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-12-16 16:26:17 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-12-16 16:26:17 -0800 |
| commit | b54e22e91eee43eb04ad53e2fa919be44f34e731 (patch) | |
| tree | 5e08313135b3cb46de1e5ec9596450a2fbf0a172 /tests/ovs-vsctl.at | |
| parent | 722f63016f302da114e3afb145bd0c1af5aaeb8f (diff) | |
| download | openvswitch-b54e22e91eee43eb04ad53e2fa919be44f34e731.tar.gz | |
Make ovs-vswitchd report when it is done configuring; make ovs-vsctl wait.
Until now the ovsdb-based vswitch has provided no way to know when it has
finished applying the configuration from the database. This commit
introduces a way:
* The client who wants to wait increments the "next_cfg" column of the
Open_vSwitch record.
* When ovs-vswitchd finishes reconfiguring, it sets the value of the
"cur_cfg" column to that of the "next_cfg" column.
* The client waits until the "cur_cfg" column is at least as great as
the value it set into "next_cfg".
This allows us to drop the 5-second sleep in interface-reconfigure.
Diffstat (limited to 'tests/ovs-vsctl.at')
| -rw-r--r-- | tests/ovs-vsctl.at | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index cd4cab3d2..b1e794849 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -23,17 +23,17 @@ dnl RUN_OVS_VSCTL(COMMAND, ...) dnl dnl Executes each ovs-vsctl COMMAND. m4_define([RUN_OVS_VSCTL], - [m4_foreach([command], [$@], [ovs-vsctl -vreconnect:ANY:emer --db=unix:socket -- command + [m4_foreach([command], [$@], [ovs-vsctl --no-wait -vreconnect:ANY:emer --db=unix:socket -- command ])]) m4_define([RUN_OVS_VSCTL_ONELINE], - [m4_foreach([command], [$@], [ovs-vsctl -vreconnect:ANY:emer --db=unix:socket --oneline -- command + [m4_foreach([command], [$@], [ovs-vsctl --no-wait -vreconnect:ANY:emer --db=unix:socket --oneline -- command ])]) dnl RUN_OVS_VSCTL_TOGETHER(COMMAND, ...) dnl dnl Executes each ovs-vsctl COMMAND in a single run of ovs-vsctl. m4_define([RUN_OVS_VSCTL_TOGETHER], - [ovs-vsctl -vreconnect:ANY:emer --db=unix:socket --oneline dnl + [ovs-vsctl --no-wait -vreconnect:ANY:emer --db=unix:socket --oneline dnl m4_foreach([command], [$@], [ -- command])]) dnl CHECK_BRIDGES([BRIDGE, PARENT, VLAN], ...) |