dnl an ovsdb-server on it for ovs-vsctl to connect to.
m4_define([OVS_VSCTL_SETUP],
[OVS_CHECK_LCOV(
- [ovsdb-tool create db $abs_builddir/../vswitchd/vswitch-idl.ovsschema],
+ [SCHEMA=$abs_top_builddir/vswitchd/vswitch-idl.ovsschema
+ if test ! -e $SCHEMA; then
+ SCHEMA=$abs_top_srcdir/vswitchd/vswitch-idl.ovsschema
+ if test ! -e $SCHEMA; then
+ echo 'Failed to find vswitch-idl.ovsschema'
+ exit 1
+ fi
+ fi
+ ovsdb-tool create db $SCHEMA],
[0], [stdout], [ignore])
OVS_CHECK_LCOV(
[[ovsdb-tool transact db \
"table": "Open_vSwitch",
"row": {}}]']],
[0], [ignore], [ignore])
- AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --listen=punix:socket --unixctl=$PWD/unixctl db >/dev/null 2>&1], [0], [ignore], [ignore])])
+ AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=punix:socket --unixctl=$PWD/unixctl db >/dev/null 2>&1], [0], [ignore], [ignore])])
dnl OVS_VSCTL_CLEANUP
dnl
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], ...)