We can not just make an alias for deamons because many of them has logging options in their command lines. Let's handle them one by one. Additionally, it's a good chance to wrap all the very long lines for better readability.
Signed-off-by: Ilya Maximets <i.maxim...@samsung.com> --- tests/ofproto-macros.at | 10 +- tests/ovn-controller-vtep.at | 35 +++++-- tests/ovn-nbctl.at | 4 +- tests/ovn-sbctl.at | 19 +++- tests/ovs-vsctl.at | 21 +++- tests/ovs-vswitchd.at | 17 +++- tests/ovsdb-idl.at | 8 +- tests/ovsdb-lock.at | 6 +- tests/ovsdb-monitor.at | 23 ++++- tests/ovsdb-rbac.at | 3 +- tests/ovsdb-server.at | 227 ++++++++++++++++++++++++++++++++----------- tests/vlog.at | 4 +- tests/vtep-ctl.at | 4 +- 13 files changed, 291 insertions(+), 90 deletions(-) diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index a4bcc41..b95b7d2 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -54,7 +54,7 @@ m4_define([PARSE_LISTENING_PORT], [OVS_WAIT_UNTIL([$2=`sed -n 's/.*0:.*: listening on port \([[0-9]]*\)$/\1/p' "$1"` && test X != X"[$]$2"])]) start_daemon () { - "$@" -vconsole:off --detach --no-chdir --pidfile --log-file + "$@" -vconsole:off -vsyslog:off --detach --no-chdir --pidfile --log-file pidfile="$OVS_RUNDIR"/$1.pid on_exit "test -e \"$pidfile\" && kill \`cat \"$pidfile\"\`" } @@ -335,7 +335,9 @@ m4_define([_OVS_VSWITCHD_START], AT_CHECK([ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema]) dnl Start ovsdb-server. - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock], [0], [], [stderr]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --log-file --remote=punix:$OVS_RUNDIR/db.sock], + [0], [], [stderr]) on_exit "kill `cat ovsdb-server.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d @@ -346,7 +348,9 @@ m4_define([_OVS_VSWITCHD_START], AT_CHECK([ovs-vsctl --no-wait init $2]) dnl Start ovs-vswitchd. - AT_CHECK([ovs-vswitchd $1 --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl], [0], [], [stderr]) + AT_CHECK([ovs-vswitchd $1 -vvconn -vofproto_dpif -vunixctl -vsyslog:off \ + --detach --no-chdir --pidfile --log-file], + [0], [], [stderr]) AT_CAPTURE_FILE([ovs-vswitchd.log]) on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`" AT_CHECK([[sed < stderr ' diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at index 416e954..e4f93a8 100644 --- a/tests/ovn-controller-vtep.at +++ b/tests/ovn-controller-vtep.at @@ -24,9 +24,21 @@ m4_define([OVN_CONTROLLER_VTEP_START], done dnl Start ovsdb-server. - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock vswitchd.db vtep.db], [0], [], [stderr]) - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile=ovsdb-nb-server.pid --log-file=ovsdb-nb-server.log --remote=punix:$OVS_RUNDIR/ovnnb_db.sock ovn-nb.db], [0], [], [stderr]) - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile=ovsdb-sb-server.pid --log-file=ovsdb-sb-server.log --remote=punix:$OVS_RUNDIR/ovnsb_db.sock ovn-sb.db ovn-sb.db], [0], [], [stderr]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --pidfile --log-file \ + --remote=punix:$OVS_RUNDIR/db.sock vswitchd.db vtep.db], + [0], [], [stderr]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --pidfile=ovsdb-nb-server.pid \ + --log-file=ovsdb-nb-server.log \ + --remote=punix:$OVS_RUNDIR/ovnnb_db.sock ovn-nb.db], + [0], [], [stderr]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --pidfile=ovsdb-sb-server.pid \ + --log-file=ovsdb-sb-server.log \ + --remote=punix:$OVS_RUNDIR/ovnsb_db.sock \ + ovn-sb.db ovn-sb.db], + [0], [], [stderr]) on_exit "kill `cat ovsdb-server.pid` `cat ovsdb-nb-server.pid` `cat ovsdb-sb-server.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d @@ -34,7 +46,10 @@ m4_define([OVN_CONTROLLER_VTEP_START], AT_CAPTURE_FILE([ovsdb-server.log]) dnl Start ovs-vswitchd. - AT_CHECK([ovs-vswitchd --enable-dummy=system --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif], [0], [], [stderr]) + AT_CHECK([ovs-vswitchd -vvconn -vofproto_dpif -vsyslog:off \ + --enable-dummy=system --disable-system \ + --detach --no-chdir --pidfile --log-file], + [0], [], [stderr]) AT_CAPTURE_FILE([ovs-vswitchd.log]) on_exit "kill `cat ovs-vswitchd.pid`" AT_CHECK([[sed < stderr ' @@ -52,7 +67,9 @@ m4_define([OVN_CONTROLLER_VTEP_START], dnl Start ovs-vtep. AT_CHECK([vtep-ctl add-ps br-vtep -- set Physical_Switch br-vtep tunnel_ips=1.2.3.4]) - AT_CHECK([ovs-vtep --log-file=ovs-vtep.log --pidfile=ovs-vtep.pid --detach br-vtep \], [0], [], [stderr]) + AT_CHECK([ovs-vtep -vsyslog:off --log-file=ovs-vtep.log \ + --pidfile=ovs-vtep.pid --detach br-vtep], + [0], [], [stderr]) on_exit "kill `cat ovs-vtep.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d']]) @@ -61,14 +78,18 @@ m4_define([OVN_CONTROLLER_VTEP_START], dnl Start ovn-northd. AT_CHECK([ovn-nbctl ls-add br-test]) - AT_CHECK([ovn-northd --detach --pidfile --log-file], [0], [], [stderr]) + AT_CHECK([ovn-northd -vsyslog:off --detach --pidfile --log-file], + [0], [], [stderr]) on_exit "kill `cat ovn-northd.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d']]) AT_CAPTURE_FILE([ovn-northd.log]) dnl Start ovn-controllger-vtep. - AT_CHECK([ovn-controller-vtep --detach --pidfile --log-file --vtep-db=unix:$OVS_RUNDIR/db.sock --ovnsb-db=unix:$OVS_RUNDIR/ovnsb_db.sock], [0], [], [stderr]) + AT_CHECK([ovn-controller-vtep -vsyslog:off --detach --pidfile --log-file \ + --vtep-db=unix:$OVS_RUNDIR/db.sock \ + --ovnsb-db=unix:$OVS_RUNDIR/ovnsb_db.sock], + [0], [], [stderr]) AT_CAPTURE_FILE([ovn-controller-vtep.log]) on_exit "kill `cat ovn-controller-vtep.pid`" AT_CHECK([[sed < stderr ' diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index 88e3719..75b2c9b 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -7,7 +7,9 @@ m4_define([OVN_NBCTL_TEST_START], AT_CHECK([ovsdb-tool create ovn-nb.db $abs_top_srcdir/ovn/ovn-nb.ovsschema]) dnl Start ovsdb-server. - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/ovnnb_db.sock ovn-nb.db], [0], [], [stderr]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile --log-file \ + --remote=punix:$OVS_RUNDIR/ovnnb_db.sock ovn-nb.db], + [0], [], [stderr]) on_exit "kill `cat ovsdb-server.pid`" AT_CHECK([ovn-nbctl init]) AT_CHECK([[sed < stderr ' diff --git a/tests/ovn-sbctl.at b/tests/ovn-sbctl.at index df9a8a2..8009ab5 100644 --- a/tests/ovn-sbctl.at +++ b/tests/ovn-sbctl.at @@ -9,8 +9,18 @@ m4_define([OVN_SBCTL_TEST_START], done dnl Start ovsdb-servers. - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile=ovnnb_db.pid --unixctl=$OVS_RUNDIR/ovnnb_db.ctl --log-file=ovsdb_nb.log --remote=punix:$OVS_RUNDIR/ovnnb_db.sock ovn-nb.db ], [0], [], [stderr]) - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile=ovnsb_db.pid --unixctl=$OVS_RUNDIR/ovnsb_db.ctl --log-file=ovsdb_sb.log --remote=punix:$OVS_RUNDIR/ovnsb_db.sock ovn-sb.db], [0], [], [stderr]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --pidfile=ovnnb_db.pid \ + --unixctl=$OVS_RUNDIR/ovnnb_db.ctl \ + --log-file=ovsdb_nb.log \ + --remote=punix:$OVS_RUNDIR/ovnnb_db.sock ovn-nb.db], + [0], [], [stderr]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --pidfile=ovnsb_db.pid \ + --unixctl=$OVS_RUNDIR/ovnsb_db.ctl \ + --log-file=ovsdb_sb.log \ + --remote=punix:$OVS_RUNDIR/ovnsb_db.sock ovn-sb.db], + [0], [], [stderr]) on_exit "kill `cat ovnnb_db.pid` `cat ovnsb_db.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d @@ -18,7 +28,10 @@ m4_define([OVN_SBCTL_TEST_START], AT_CAPTURE_FILE([ovsdb-server.log]) dnl Start ovn-northd. - AT_CHECK([ovn-northd --detach --pidfile --log-file --ovnnb-db=unix:$OVS_RUNDIR/ovnnb_db.sock --ovnsb-db=unix:$OVS_RUNDIR/ovnsb_db.sock], [0], [], [stderr]) + AT_CHECK([ovn-northd -vsyslog:off --detach --pidfile --log-file \ + --ovnnb-db=unix:$OVS_RUNDIR/ovnnb_db.sock \ + --ovnsb-db=unix:$OVS_RUNDIR/ovnsb_db.sock], + [0], [], [stderr]) on_exit "kill `cat ovn-northd.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d']]) diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index f9e7f3b..8395293 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -4,7 +4,9 @@ dnl Creates an empty database in the current directory and then starts dnl an ovsdb-server on it for ovs-vsctl to connect to. m4_define([OVS_VSCTL_SETUP], [OVSDB_INIT([db]) - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:db.sock db >/dev/null 2>&1], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --remote=punix:db.sock db >/dev/null 2>&1], + [0], [ignore], [ignore]) on_exit 'kill `cat ovsdb-server.pid`']) dnl OVS_VSCTL_CLEANUP @@ -1378,7 +1380,13 @@ AT_CHECK([$OVS_PKI -B 1024 init && $OVS_PKI -B 1024 req+sign vsctl switch && $OV dnl Create database. OVSDB_INIT([conf.db]) -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --private-key=$PKIDIR/ovsdbserver-privkey.pem --certificate=$PKIDIR/ovsdbserver-cert.pem --ca-cert=$PKIDIR/pki/switchca/cacert.pem --remote=pssl:0:127.0.0.1 --log-file="`pwd`"/ovsdb-server.log conf.db], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --private-key=$PKIDIR/ovsdbserver-privkey.pem \ + --certificate=$PKIDIR/ovsdbserver-cert.pem \ + --ca-cert=$PKIDIR/pki/switchca/cacert.pem \ + --remote=pssl:0:127.0.0.1 \ + --log-file="`pwd`"/ovsdb-server.log conf.db], + [0], [ignore], [ignore]) on_exit "kill `cat ovsdb-server.pid`" PARSE_LISTENING_PORT([ovsdb-server.log], [SSL_PORT]) @@ -1405,7 +1413,14 @@ AT_CHECK([$OVS_PKI -B 1024 init && $OVS_PKI -B 1024 req+sign vsctl switch && $OV dnl Create database. OVSDB_INIT([conf.db]) -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --private-key=$PKIDIR/ovsdbserver-privkey.pem --certificate=$PKIDIR/ovsdbserver-cert.pem --ca-cert=$PKIDIR/pki/switchca/cacert.pem --peer-ca-cert=$PKIDIR/pki/controllerca/cacert.pem --remote=pssl:0:127.0.0.1 --log-file="`pwd`"/ovsdb-server.log conf.db], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --private-key=$PKIDIR/ovsdbserver-privkey.pem \ + --certificate=$PKIDIR/ovsdbserver-cert.pem \ + --ca-cert=$PKIDIR/pki/switchca/cacert.pem \ + --peer-ca-cert=$PKIDIR/pki/controllerca/cacert.pem \ + --remote=pssl:0:127.0.0.1 \ + --log-file="`pwd`"/ovsdb-server.log conf.db], + [0], [ignore], [ignore]) on_exit "kill `cat ovsdb-server.pid`" PARSE_LISTENING_PORT([ovsdb-server.log], [SSL_PORT]) diff --git a/tests/ovs-vswitchd.at b/tests/ovs-vswitchd.at index a30792b..1c9b154 100644 --- a/tests/ovs-vswitchd.at +++ b/tests/ovs-vswitchd.at @@ -12,11 +12,15 @@ touch .conf.db.~lock~ AT_CHECK([ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema]) dnl Start ovsdb-server. *Don't* initialize database. -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile --log-file \ + --remote=punix:$OVS_RUNDIR/db.sock], + [0], [ignore], [ignore]) AT_CAPTURE_FILE([ovsdb-server.log]) dnl Start ovs-vswitchd. -AT_CHECK([ovs-vswitchd --detach --no-chdir --pidfile --enable-dummy --disable-system --log-file], [0], [], [stderr]) +AT_CHECK([ovs-vswitchd -vsyslog:off --detach --no-chdir --pidfile \ + --enable-dummy --disable-system --log-file], + [0], [], [stderr]) AT_CAPTURE_FILE([ovs-vswitchd.log]) dnl ovs-vswitchd detached OK or we wouldn't have made it this far. Success. @@ -70,7 +74,8 @@ AT_SETUP([ovs-vswitchd -- start additional ovs-vswitchd process]) OVS_VSWITCHD_START # start another ovs-vswitchd process. -ovs-vswitchd --log-file=fakelog --unixctl=unixctl2 --pidfile=ovs-vswitchd-2.pid & +ovs-vswitchd -vsyslog:off --log-file=fakelog \ + --unixctl=unixctl2 --pidfile=ovs-vswitchd-2.pid & on_exit 'kill `cat ovs-vswitchd-2.pid`' # sleep for a while @@ -95,7 +100,8 @@ AT_SETUP([ovs-vswitchd -- switch over to another ovs-vswitchd process]) OVS_VSWITCHD_START # start a new ovs-vswitchd process. -ovs-vswitchd --log-file=fakelog --enable-dummy --unixctl=unixctl2 --pidfile=ovs-vswitchd-2.pid & +ovs-vswitchd -vsyslog:off --log-file=fakelog --enable-dummy \ + --unixctl=unixctl2 --pidfile=ovs-vswitchd-2.pid & on_exit 'kill `cat ovs-vswitchd-2.pid`' # sleep for a while. @@ -134,7 +140,8 @@ dnl ---------------------------------------------------------------------- AT_SETUP([ovs-vswitchd -- invalid database path]) # start an ovs-vswitchd process with invalid db path. -ovs-vswitchd unix:invalid.db.sock --log-file --enable-dummy --pidfile & +ovs-vswitchd -vsyslog:off unix:invalid.db.sock --log-file --pidfile \ + --enable-dummy & on_exit 'kill `cat ovs-vswitchd.pid`' # sleep for a while. diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at index 0143828..487382a 100644 --- a/tests/ovsdb-idl.at +++ b/tests/ovsdb-idl.at @@ -8,7 +8,9 @@ m4_divert_text([PREPARE_TESTS], [ # specified). ovsdb_start_idltest () { ovsdb-tool create db ${2:-$abs_srcdir/idltest.ovsschema} || return $? - ovsdb-server -vconsole:warn --log-file --detach --no-chdir --pidfile --remote=punix:socket ${1:+--remote=$1} db || return $? + ovsdb-server -vsyslog:off -vconsole:warn --log-file --pidfile \ + --detach --no-chdir \ + --remote=punix:socket ${1:+--remote=$1} db || return $? on_exit 'kill `cat ovsdb-server.pid`' } ]) @@ -144,8 +146,8 @@ m4_define([OVSDB_CHECK_IDL_SSL_PYN], AT_CHECK([ovsdb-tool create db $abs_srcdir/idltest.ovsschema], [0], [stdout], [ignore]) PKIDIR=$abs_top_builddir/tests - AT_CHECK([ovsdb-server -vconsole:warn --log-file --detach --no-chdir \ - --pidfile \ + AT_CHECK([ovsdb-server -vsyslog:off -vconsole:warn --log-file \ + --detach --no-chdir --pidfile \ --private-key=$PKIDIR/testpki-privkey2.pem \ --certificate=$PKIDIR/testpki-cert2.pem \ --ca-cert=$PKIDIR/testpki-cacert.pem \ diff --git a/tests/ovsdb-lock.at b/tests/ovsdb-lock.at index 7152c5d..3e22c36 100644 --- a/tests/ovsdb-lock.at +++ b/tests/ovsdb-lock.at @@ -13,7 +13,11 @@ m4_define([OVSDB_CHECK_LOCK_SETUP], ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) AT_CAPTURE_FILE([ovsdb-server-log]) - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1], [0], [], [])]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --remote=punix:socket \ + --log-file="`pwd`"/ovsdb-server-log \ + db >/dev/null 2>&1], + [0], [], [])]) # # Two sessions create two locks. Both sessions should be able to get their diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at index 5458d42..318fdad 100644 --- a/tests/ovsdb-monitor.at +++ b/tests/ovsdb-monitor.at @@ -13,15 +13,23 @@ ovsdb_check_monitor () { shift done shift - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket --log-file db > ovsdb-server.stdout 2> ovsdb-server.stderr], + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --remote=punix:socket --log-file db \ + > ovsdb-server.stdout 2> ovsdb-server.stderr], [0], [], []) on_exit 'kill `cat ovsdb-server.pid`' if test "$IS_WIN32" = "yes"; then - AT_CHECK([ovsdb-client -vjsonrpc --pidfile --log-file -d json monitor --format=csv unix:socket $db $table $columns > output 2> ovsdb-client.stderr &], + AT_CHECK([ovsdb-client -vjsonrpc -vsyslog:off \ + --pidfile --log-file -d json monitor \ + --format=csv unix:socket $db $table $columns \ + > output 2> ovsdb-client.stderr &], [0], [ignore], [ignore]) sleep 1 else - AT_CHECK([ovsdb-client -vjsonrpc --detach --pidfile --log-file -d json monitor --format=csv unix:socket $db $table $columns > output 2> ovsdb-client.stderr], + AT_CHECK([ovsdb-client -vjsonrpc -vsyslog:off \ + --detach --pidfile --log-file -d json monitor \ + --format=csv unix:socket $db $table $columns \ + > output 2> ovsdb-client.stderr], [0], [ignore], [ignore]) fi on_exit 'kill `cat ovsdb-client.pid`' @@ -89,9 +97,14 @@ m4_define([OVSDB_CHECK_MONITOR_COND], AT_CHECK([ovsdb-tool transact db "$txn"], [0], [ignore], [ignore]) done AT_CAPTURE_FILE([ovsdb-server-log]) - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --remote=punix:socket \ + --log-file="`pwd`"/ovsdb-server-log db \ + > /dev/null 2>&1]) on_exit 'kill `cat ovsdb-server.pid`' - AT_CHECK([ovsdb-client -vjsonrpc --pidfile --detach --no-chdir -d json monitor-cond --format=csv unix:socket $4 '[$8]' $5 $9 > output], + AT_CHECK([ovsdb-client -vjsonrpc -vsyslog:off \ + --pidfile --detach --no-chdir -d json monitor-cond \ + --format=csv unix:socket $4 '[$8]' $5 $9 > output], [0], [ignore], [ignore]) on_exit 'kill `cat ovsdb-client.pid`' for txn in m4_foreach([txn], [$6], ['txn' ]); do diff --git a/tests/ovsdb-rbac.at b/tests/ovsdb-rbac.at index adefee4..9531217 100644 --- a/tests/ovsdb-rbac.at +++ b/tests/ovsdb-rbac.at @@ -115,7 +115,8 @@ AT_CHECK( "update": ["set", ["name", "value"]]}} ]']], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile --remote=db:mydb,Root,connections \ +AT_CHECK([ovsdb-server -vsyslog:off --log-file --detach --no-chdir --pidfile \ + --remote=db:mydb,Root,connections \ --private-key=$RBAC_PKIDIR/ovsdb-server-privkey.pem \ --certificate=$RBAC_PKIDIR/ovsdb-server-cert.pem \ --ca-cert=$RBAC_PKIDIR/pki/switchca/cacert.pem \ diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index edffae1..f94591a 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -27,8 +27,10 @@ m4_define([OVSDB_CHECK_EXECUTION], AT_KEYWORDS([ovsdb server positive unix $5]) $2 > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db], [0], [ignore], [ignore]) - m4_foreach([txn], [$3], + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --remote=punix:socket db], + [0], [ignore], [ignore]) + m4_foreach([txn], [$3], [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) cat stdout >> output @@ -54,7 +56,8 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "table": "ordinals", "row": {"number": 0, "name": "zero"}}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket db --run="sh txnfile"], [0], [stdout], []) +AT_CHECK([ovsdb-server -vsyslog:off --remote=punix:socket db --run="sh txnfile"], + [0], [stdout], []) cat stdout >> output dnl Add some crap to the database log and run another transaction, which should dnl ignore the crap and truncate it out of the log. @@ -65,7 +68,8 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "table": "ordinals", "row": {"number": 1, "name": "one"}}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket db --run="sh txnfile"], [0], [stdout], [stderr]) +AT_CHECK([ovsdb-server -vsyslog:off --remote=punix:socket db --run="sh txnfile"], + [0], [stdout], [stderr]) AT_CHECK([grep 'syntax error: db: parse error.* in header line "xxx"' stderr], [0], [ignore]) cat stdout >> output @@ -79,7 +83,8 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "where": [], "sort": ["number"]}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket db --run="sh txnfile"], [0], [stdout], []) +AT_CHECK([ovsdb-server -vsyslog:off --remote=punix:socket db --run="sh txnfile"], + [0], [stdout], []) cat stdout >> output AT_CHECK([uuidfilt output], [0], [[[{"uuid":["uuid","<0>"]}] @@ -101,7 +106,8 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "table": "ordinals", "row": {"number": 0, "name": "zero"}}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket db --run="sh txnfile"], [0], [stdout], []) +AT_CHECK([ovsdb-server -vsyslog:off --remote=punix:socket db --run="sh txnfile"], + [0], [stdout], []) cat stdout >> output dnl Add some crap to the database log and run another transaction, which should dnl ignore the crap and truncate it out of the log. @@ -113,7 +119,8 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "table": "ordinals", "row": {"number": 1, "name": "one"}}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket db --run="sh txnfile"], [0], [stdout], [stderr]) +AT_CHECK([ovsdb-server -vsyslog:off --remote=punix:socket db --run="sh txnfile"], + [0], [stdout], [stderr]) AT_CHECK([grep 'syntax "{"invalid":{}}": unknown table: No table named invalid.' stderr], [0], [ignore]) cat stdout >> output @@ -127,7 +134,8 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "where": [], "sort": ["number"]}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket db --run="sh txnfile"], [0], [stdout], []) +AT_CHECK([ovsdb-server -vsyslog:off --remote=punix:socket db --run="sh txnfile"], + [0], [stdout], []) cat stdout >> output AT_CHECK([uuidfilt output], [0], [[[{"uuid":["uuid","<0>"]}] @@ -156,7 +164,9 @@ ordinal_schema > schema1 constraint_schema > schema2 AT_CHECK([ovsdb-tool create db1 schema1], [0], [ignore], [ignore]) AT_CHECK([ovsdb-tool create db2 schema2], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:db.sock db1 db2], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --remote=punix:db.sock db1 db2], + [0], [ignore], [ignore]) CHECK_DBS([constraints ordinals ]) @@ -176,7 +186,8 @@ AT_CHECK([ovsdb-tool create db1 schema1], [0], [ignore], [ignore]) AT_CHECK([ovsdb-tool create db2 schema2], [0], [ignore], [ignore]) # Start ovsdb-server with just a single database - db1. -AT_CHECK([ovsdb-server -vfile -vvlog:off --log-file --detach --no-chdir --pidfile --remote=punix:db.sock db1], [0]) +AT_CHECK([ovsdb-server -vfile -vvlog:off -vsyslog:off --log-file --detach \ + --no-chdir --pidfile --remote=punix:db.sock db1], [0]) CHECK_DBS([ordinals ]) @@ -185,8 +196,13 @@ AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/remove-db ordinals], [0]) CHECK_DBS([]) # Start monitoring processes. -AT_CHECK([ovsdb-client --detach --pidfile=ovsdb-client-1.pid --no-db-change-aware --no-headings monitor _Server Database name > db-change-unaware.stdout 2> db-change-unaware.stderr]) -AT_CHECK([ovsdb-client --detach --pidfile=ovsdb-client-2.pid --db-change-aware --no-headings monitor _Server Database name > db-change-aware.stdout 2> db-change-aware.stderr]) +AT_CHECK([ovsdb-client --detach --pidfile=ovsdb-client-1.pid \ + --no-db-change-aware --no-headings \ + monitor _Server Database name \ + > db-change-unaware.stdout 2> db-change-unaware.stderr]) +AT_CHECK([ovsdb-client --detach --pidfile=ovsdb-client-2.pid --db-change-aware \ + --no-headings monitor _Server Database name \ + > db-change-aware.stdout 2> db-change-aware.stderr]) AT_CAPTURE_FILE([db-change-unaware.stdout]) AT_CAPTURE_FILE([db-change-unaware.stderr]) AT_CAPTURE_FILE([db-change-aware.stdout]) @@ -289,7 +305,9 @@ AT_SKIP_IF([test "$IS_WIN32" = "yes"]) ordinal_schema > schema AT_CHECK([ovsdb-tool create db1 schema], [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' -AT_CHECK([ovsdb-server -vfile -vvlog:off --monitor --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db1]) +AT_CHECK([ovsdb-server -vfile -vvlog:off -vsyslog:off --monitor --detach \ + --no-chdir --pidfile --log-file \ + --remote=punix:db.sock db1]) # Add the second database. constraint_schema > schema2 @@ -322,7 +340,9 @@ AT_CHECK([ovsdb-tool create db1 schema], [0], [ignore], [ignore]) constraint_schema > schema2 AT_CHECK([ovsdb-tool create db2 schema2], [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' -AT_CHECK([ovsdb-server -vfile -vvlog:off --monitor --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db1 db2]) +AT_CHECK([ovsdb-server -vfile -vvlog:off -vsyslog:off --monitor --detach \ + --no-chdir --pidfile --log-file \ + --remote=punix:db.sock db1 db2]) # Remove the second database. AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/remove-db constraints]) @@ -383,7 +403,11 @@ AT_CHECK( "uuid-name": "x", "row": {"target": "punix:socket2"}}]']], [0], [ignore], [ignore]) on_exit 'kill `cat ovsdb-server.pid`' -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=db:mydb,Root,managers --remote=db:mydb,Root,manager_options --log-file db], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --remote=db:mydb,Root,managers \ + --remote=db:mydb,Root,manager_options \ + --log-file db], + [0], [ignore], [ignore]) ovs-appctl -t ovsdb-server time/warp 6000 1000 AT_CHECK( [[ovsdb-client transact unix:socket1 \ @@ -411,7 +435,7 @@ AT_KEYWORDS([ovsdb server positive]) ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile db]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile db]) AT_CHECK([test ! -e socket1]) AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-remote punix:socket1]) @@ -466,7 +490,8 @@ AT_SKIP_IF([test "$IS_WIN32" = "yes"]) ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' -AT_CHECK([ovsdb-server -vfile -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db]) +AT_CHECK([ovsdb-server -vsyslog:off -vfile -vvlog:off --monitor --detach \ + --no-chdir --pidfile --log-file db]) # Add a remote. AT_CHECK([test ! -e socket1]) @@ -497,7 +522,8 @@ AT_SKIP_IF([test "$IS_WIN32" = "yes"]) ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' -AT_CHECK([ovsdb-server -vfile -vvlog:off --monitor --detach --no-chdir --pidfile --log-file db]) +AT_CHECK([ovsdb-server -vsyslog:off -vfile -vvlog:off --monitor \ + --detach --no-chdir --pidfile --log-file db]) # Add a remote. AT_CHECK([test ! -e socket1]) @@ -561,7 +587,7 @@ AT_CHECK( [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' AT_CHECK( - [ovsdb-server --log-file --detach --no-chdir --pidfile \ + [ovsdb-server -vsyslog:off --log-file --detach --no-chdir --pidfile \ --private-key=db:mydb,SSL,private_key \ --certificate=db:mydb,SSL,certificate \ --ca-cert=db:mydb,SSL,ca_cert \ @@ -667,7 +693,9 @@ ovsdb_check_online_compaction() { ovsdb-tool create-cluster db schema unix:s1.raft fi]) dnl Start ovsdb-server. - AT_CHECK([ovsdb-server -vvlog:off -vconsole:off --detach --no-chdir --pidfile --remote=punix:socket --log-file db], [0]) + AT_CHECK([ovsdb-server -vvlog:off -vsyslog:off -vconsole:off --detach \ + --no-chdir --pidfile --remote=punix:socket \ + --log-file db], [0]) AT_CHECK([ovsdb-client wait unix:socket ordinals connected]) AT_CAPTURE_FILE([ovsdb-server.log]) dnl Do a bunch of random transactions that put crap in the database log. @@ -802,7 +830,9 @@ _uuid name number dnl and restart the database server to ensure that the data is correct on dnl disk as well as in memory. OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - AT_CHECK([ovsdb-server -vvlog:off -vconsole:off --detach --no-chdir --pidfile --remote=punix:socket --log-file db]) + AT_CHECK([ovsdb-server -vvlog:off -vsyslog:off -vconsole:off --detach \ + --no-chdir --pidfile --remote=punix:socket \ + --log-file db]) AT_CHECK([ovsdb-client dump unix:socket ordinals], [0], [stdout]) AT_CHECK([uuidfilt stdout], [0], [dnl ordinals table @@ -857,7 +887,9 @@ ovsdb_check_online_conversion() { fi]) dnl Start the database server. - AT_CHECK([ovsdb-server -vfile -vvlog:off -vconsole:off --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db], [0]) + AT_CHECK([ovsdb-server -vfile -vvlog:off -vsyslog:off -vconsole:off \ + --detach --no-chdir --pidfile --log-file \ + --remote=punix:db.sock db], [0]) AT_CAPTURE_FILE([ovsdb-server.log]) dnl Put some data in the database. @@ -1074,8 +1106,10 @@ _uuid number dnl Now kill and restart the database server to ensure that the data is dnl correct on disk as well as in memory. OVS_APP_EXIT_AND_WAIT([ovsdb-server]) - AT_CHECK([[ovsdb-server -vfile -vvlog:off -vconsole:off --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db]], - [0]) + AT_CHECK([[ovsdb-server -vfile -vvlog:off -vsyslog:off -vconsole:off \ + --detach --no-chdir --pidfile --log-file \ + --remote=punix:db.sock db]], + [0]) AT_CHECK([ovsdb-client dump unix:db.sock ordinals | uuidfilt], [0], [dnl ordinals table _uuid number @@ -1143,7 +1177,8 @@ n_updates=`expr $n_iterations \* 3 + 1` # Start an ovsdb-server with the vswitchd schema. OVSDB_INIT([db]) -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db], +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --pidfile --log-file --remote=punix:db.sock db], [0], [ignore], [ignore]) # Executes a set of transactions that add a bridge with 100 ports, and @@ -1233,11 +1268,21 @@ m4_define([OVSDB_CHECK_EXECUTION], $2 > schema PKIDIR=$abs_top_builddir/tests AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:127.0.0.1 db], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --log-file --pidfile \ + --detach --no-chdir \ + --private-key=$PKIDIR/testpki-privkey2.pem \ + --certificate=$PKIDIR/testpki-cert2.pem \ + --ca-cert=$PKIDIR/testpki-cacert.pem \ + --remote=pssl:0:127.0.0.1 db], + [0], [ignore], [ignore]) PARSE_LISTENING_PORT([ovsdb-server.log], [SSL_PORT]) m4_foreach([txn], [$3], - [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem --certificate=$PKIDIR/testpki-cert.pem --ca-cert=$PKIDIR/testpki-cacert.pem transact ssl:127.0.0.1:$SSL_PORT 'txn'], [0], [stdout], [ignore], - [test ! -e pid || kill `cat pid`]) + [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem \ + --certificate=$PKIDIR/testpki-cert.pem \ + --ca-cert=$PKIDIR/testpki-cacert.pem \ + transact ssl:127.0.0.1:$SSL_PORT 'txn'], + [0], [stdout], [ignore], + [test ! -e pid || kill `cat pid`]) cat stdout >> output ]) AT_CHECK([uuidfilt output], [0], [$4], [ignore], @@ -1271,11 +1316,21 @@ m4_define([OVSDB_CHECK_EXECUTION], $2 > schema PKIDIR=$abs_top_builddir/tests AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:0:[[::1]] db], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --log-file --pidfile \ + --detach --no-chdir \ + --private-key=$PKIDIR/testpki-privkey2.pem \ + --certificate=$PKIDIR/testpki-cert2.pem \ + --ca-cert=$PKIDIR/testpki-cacert.pem \ + --remote=pssl:0:[[::1]] db], + [0], [ignore], [ignore]) PARSE_LISTENING_PORT([ovsdb-server.log], [SSL_PORT]) m4_foreach([txn], [$3], - [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem --certificate=$PKIDIR/testpki-cert.pem --ca-cert=$PKIDIR/testpki-cacert.pem transact ssl:[[::1]]:$SSL_PORT 'txn'], [0], [stdout], [ignore], - [test ! -e pid || kill `cat pid`]) + [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem \ + --certificate=$PKIDIR/testpki-cert.pem \ + --ca-cert=$PKIDIR/testpki-cacert.pem \ + transact ssl:[[::1]]:$SSL_PORT 'txn'], + [0], [stdout], [ignore], + [test ! -e pid || kill `cat pid`]) cat stdout >> output ]) AT_CHECK([uuidfilt output], [0], [$4], [ignore], @@ -1307,11 +1362,14 @@ m4_define([OVSDB_CHECK_EXECUTION], $2 > schema PKIDIR=$abs_top_builddir/tests AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile --remote=ptcp:0:127.0.0.1 db], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --log-file --detach --no-chdir \ + --pidfile --remote=ptcp:0:127.0.0.1 db], + [0], [ignore], [ignore]) PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT]) m4_foreach([txn], [$3], - [AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT 'txn'], [0], [stdout], [ignore], - [test ! -e pid || kill `cat pid`]) + [AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT 'txn'], + [0], [stdout], [ignore], + [test ! -e pid || kill `cat pid`]) cat stdout >> output ]) AT_CHECK([uuidfilt output], [0], [$4], [ignore], @@ -1344,11 +1402,14 @@ m4_define([OVSDB_CHECK_EXECUTION], $2 > schema PKIDIR=$abs_top_builddir/tests AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile --remote=ptcp:0:[[::1]] db], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --log-file --detach --no-chdir \ + --pidfile --remote=ptcp:0:[[::1]] db], + [0], [ignore], [ignore]) PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT]) m4_foreach([txn], [$3], - [AT_CHECK([ovsdb-client transact tcp:[[::1]]:$TCP_PORT 'txn'], [0], [stdout], [ignore], - [test ! -e pid || kill `cat pid`]) + [AT_CHECK([ovsdb-client transact tcp:[[::1]]:$TCP_PORT 'txn'], + [0], [stdout], [ignore], + [test ! -e pid || kill `cat pid`]) cat stdout >> output ]) AT_CHECK([uuidfilt output], [0], [$4], [ignore], @@ -1386,7 +1447,9 @@ m4_define([OVSDB_CHECK_EXECUTION], m4_foreach([txn], [$3], [AT_DATA([txnfile], [ovsdb-client transact unix:socket 'txn' ]) - AT_CHECK([ovsdb-server --remote=punix:socket db --run="sh txnfile"], [0], [stdout], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off \ + --remote=punix:socket db --run="sh txnfile"], + [0], [stdout], [ignore]) cat stdout >> output ]) AT_CHECK([uuidfilt output], [0], [$4], [ignore]) @@ -1414,11 +1477,18 @@ m4_define([OVSDB_CHECK_EXECUTION], AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore]) AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server1.log --pidfile \ + --remote=punix:db.sock db1], + [0], [ignore], [ignore]) i on_exit 'test ! -e pid || kill `cat pid`' - AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2 --sync-from=unix:db.sock db2], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server2.log --pidfile=pid2 \ + --remote=punix:db2.sock --unixctl=unixctl2 \ + --sync-from=unix:db.sock db2], + [0], [ignore], [ignore]) on_exit 'test ! -e pid2 || kill `cat pid2`' m4_foreach([txn], [$3], @@ -1460,10 +1530,18 @@ m4_define([OVSDB_CHECK_REPLICATION], AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore]) AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server1.log --pidfile \ + --remote=punix:db.sock db1], + [0], [ignore], [ignore]) on_exit 'test ! -e pid || kill `cat pid`' - AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2 --sync-from=unix:db.sock --sync-exclude-tables=mydb:b db2], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server2.log --pidfile=pid2 \ + --remote=punix:db2.sock --unixctl=unixctl2 \ + --sync-from=unix:db.sock \ + --sync-exclude-tables=mydb:b db2], + [0], [ignore], [ignore]) on_exit 'test ! -e pid2 || kill `cat pid2`' m4_foreach([txn], [$3], @@ -1496,7 +1574,8 @@ AT_KEYWORDS([ovsdb server replication get-active]) ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --sync-from=tcp:127.0.0.1:9999 db]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --sync-from=tcp:127.0.0.1:9999 db]) AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/get-active-ovsdb-server], [0], [tcp:127.0.0.1:9999 @@ -1509,7 +1588,7 @@ AT_KEYWORDS([ovsdb server replication set-active]) ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile db]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile db]) AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/set-active-ovsdb-server tcp:127.0.0.1:9999]) AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/get-active-ovsdb-server], @@ -1523,7 +1602,8 @@ AT_KEYWORDS([ovsdb server replication get-exclude-tables]) ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) on_exit 'kill `cat *.pid`' -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --sync-exclude-tables=mydb:db1,mydb:db2 db]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --sync-exclude-tables=mydb:db1,mydb:db2 db]) AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/get-sync-exclude-tables], [0], [mydb:db1,mydb:db2 @@ -1539,10 +1619,17 @@ replication_schema > schema AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore]) AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore]) -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server1.log --pidfile \ + --remote=punix:db.sock db1], + [0], [ignore], [ignore]) on_exit 'test ! -e pid || kill `cat pid`' -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2 --sync-from=unix:db.sock db2], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server2.log --pidfile=pid2 \ + --remote=punix:db2.sock --unixctl=unixctl2 \ + --sync-from=unix:db.sock db2], + [0], [ignore], [ignore]) on_exit 'test ! -e pid2 || kill `cat pid2`' AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/set-sync-exclude-tables mydb:b], [0], [ignore], [ignore], [test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`]) @@ -1587,10 +1674,16 @@ replication_schema > schema AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore]) AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore]) -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server1.log --pidfile \ + --remote=punix:db.sock db1], + [0], [ignore], [ignore]) on_exit 'test ! -e pid || kill `cat pid`' -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2 db2], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server2.log --pidfile=pid2 \ + --remote=punix:db2.sock --unixctl=unixctl2 db2], + [0], [ignore], [ignore]) on_exit 'test ! -e pid2 || kill `cat pid2`' dnl Try to connect without specifying the active server. @@ -1628,10 +1721,17 @@ replication_schema > schema AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore]) AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore]) -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile --remote=punix:db.sock db1], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server1.log --pidfile \ + --remote=punix:db.sock db1], + [0], [ignore], [ignore]) on_exit 'test ! -e pid || kill `cat pid`' -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile=pid2 --remote=punix:db2.sock --unixctl=unixctl2 --sync-from=unix:db.sock db2], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server2.log --pidfile=pid2 \ + --remote=punix:db2.sock --unixctl=unixctl2 \ + --sync-from=unix:db.sock db2], + [0], [ignore], [ignore]) on_exit 'test ! -e pid2 || kill `cat pid2`' AT_CHECK([ovsdb-client transact unix:db.sock \ @@ -1729,12 +1829,22 @@ dnl Start both 'db1' and 'db2' in backup mode. Let them backup from each dnl other. This is not an supported operation state, but to simulate a start dnl up condition where an HA manger can select which one to be an active dnl server soon after. -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1 --sync-from=unix:db2.sock --active ], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server1.log \ + --pidfile="`pwd`"/pid \ + --remote=punix:db.sock --unixctl="`pwd`"/unixctl \ + db1 --sync-from=unix:db2.sock --active ], + [0], [ignore], [ignore]) on_exit 'test ! -e pid || kill `cat pid`' AT_CHECK([ovs-appctl -t "`pwd`"/unixctl ovsdb-server/connect-active-ovsdb-server]) -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 --sync-from=unix:db.sock db2], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server2.log \ + --pidfile="`pwd`"/pid2 \ + --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 \ + --sync-from=unix:db.sock db2], + [0], [ignore], [ignore]) on_exit 'test ! -e pid2 || kill `cat pid2`' dnl @@ -1803,7 +1913,12 @@ AT_CHECK([ovsdb-tool transact db \ "row": {"number": 9, "name": "nine"}}]]'], [0], [ignore], [ignore]) dnl Start 'db', then try to be a back up server of itself. -AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server.log --pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db --sync-from=unix:db.sock --active ], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir \ + --log-file=ovsdb-server.log \ + --pidfile="`pwd`"/pid \ + --remote=punix:db.sock --unixctl="`pwd`"/unixctl \ + db --sync-from=unix:db.sock --active ], + [0], [ignore], [ignore]) on_exit 'test ! -e pid || kill `cat pid`' dnl Save the current content @@ -1871,7 +1986,9 @@ AT_CHECK( "row": {"target": "ptcp:0:127.0.0.1", "read_only": true}}]']], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --log-file --detach --no-chdir --pidfile --remote=db:mydb,Root,managers db], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server -vsyslog:off --log-file --detach --no-chdir --pidfile \ + --remote=db:mydb,Root,managers db], + [0], [ignore], [ignore]) PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT]) AT_CHECK([ovsdb-client get-schema-version tcp:127.0.0.1:$TCP_PORT mydb], [0], [5.1.3 ]) diff --git a/tests/vlog.at b/tests/vlog.at index aee6d46..bc03cf9 100644 --- a/tests/vlog.at +++ b/tests/vlog.at @@ -462,7 +462,7 @@ dnl Create database. touch .conf.db.~lock~ AT_CHECK([ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema]) -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile \ +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ --remote=punix:$OVS_RUNDIR/db.sock -vPATTERN:file:"<%B>1 %A %m" \ --log-file], [0], [], [stderr]) OVS_APP_EXIT_AND_WAIT([ovsdb-server]) @@ -472,7 +472,7 @@ AT_CHECK([head -1 ovsdb-server.log | awk '{print $1}'], [0], [<133>1 ]) rm ovsdb-server.log -AT_CHECK([ovsdb-server --detach --no-chdir --pidfile \ +AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ --remote=punix:$OVS_RUNDIR/db.sock -vPATTERN:file:"<%B>1 %A %m" \ -vFACILITY:daemon --log-file], [0], [], [stderr]) diff --git a/tests/vtep-ctl.at b/tests/vtep-ctl.at index e44eb33..4914956 100644 --- a/tests/vtep-ctl.at +++ b/tests/vtep-ctl.at @@ -19,7 +19,9 @@ dnl Creates an empty database in the current directory and then starts dnl an ovsdb-server on it for vtep-ctl to connect to. m4_define([VTEP_CTL_SETUP], [VTEP_OVSDB_INIT([db]) - AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket db >/dev/null 2>&1], [0], [ignore], [ignore])]) + AT_CHECK([ovsdb-server -vsyslog:off --detach --no-chdir --pidfile \ + --remote=punix:socket db >/dev/null 2>&1], + [0], [ignore], [ignore])]) dnl VTEP_CTL_CLEANUP dnl -- 2.7.4 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev