X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-server.at;h=62eae3824f103931032b194689acfc655a236335;hb=0cc70daec76f59571d56a96bd86a960e18d13e9f;hp=ce558866571c16cb95353e9ac9a6df63c2768c07;hpb=37b694e7a76ca6abc62c78eceae26f655cf6bccf;p=sliver-openvswitch.git diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index ce5588665..62eae3824 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -2,7 +2,7 @@ AT_BANNER([OVSDB -- ovsdb-server transactions (Unix sockets)]) m4_define([OVSDB_SERVER_SHUTDOWN], [cp pid savepid - AT_CHECK([ovs-appctl -t $PWD/unixctl -e exit], [0], [ignore], [ignore]) + AT_CHECK([ovs-appctl -t "`pwd`"/unixctl -e exit], [0], [ignore], [ignore]) OVS_WAIT_WHILE([kill -0 `cat savepid`], [kill `cat savepid`])]) # OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS]) @@ -21,11 +21,11 @@ m4_define([OVSDB_SERVER_SHUTDOWN], # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_EXECUTION], [AT_SETUP([$1]) + OVS_RUNDIR=`pwd`; export OVS_RUNDIR AT_KEYWORDS([ovsdb server positive unix $5]) - AT_DATA([schema], [$2 -]) + $2 > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl 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`]) @@ -40,8 +40,8 @@ EXECUTION_EXAMPLES AT_SETUP([truncating corrupted database log]) AT_KEYWORDS([ovsdb server positive unix]) -AT_DATA([schema], [ORDINAL_SCHEMA -]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR +ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) dnl Do one transaction and save the output. AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ @@ -50,7 +50,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "table": "ordinals", "row": {"number": 0, "name": "zero"}}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], []) +AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl 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. @@ -61,7 +61,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "table": "ordinals", "row": {"number": 1, "name": "one"}}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [stderr]) +AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl 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 @@ -75,7 +75,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "where": [], "sort": ["number"]}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], []) +AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"], [0], [stdout], []) cat stdout >> output AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [[[{"uuid":["uuid","<0>"]}] @@ -87,8 +87,8 @@ AT_CLEANUP AT_SETUP([truncating database log with bad transaction]) AT_KEYWORDS([ovsdb server positive unix]) -AT_DATA([schema], [ORDINAL_SCHEMA -]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR +ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) dnl Do one transaction and save the output. AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ @@ -97,7 +97,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "table": "ordinals", "row": {"number": 0, "name": "zero"}}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], []) +AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl 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. @@ -109,7 +109,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "table": "ordinals", "row": {"number": 1, "name": "one"}}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [stderr]) +AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"], [0], [stdout], [stderr]) AT_CHECK([grep 'syntax "{"invalid":{}}": unknown table: No table named invalid.' stderr], [0], [ignore]) cat stdout >> output @@ -123,7 +123,7 @@ AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ "where": [], "sort": ["number"]}]' ]]) -AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], []) +AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"], [0], [stdout], []) cat stdout >> output AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [[[{"uuid":["uuid","<0>"]}] @@ -135,10 +135,10 @@ AT_CLEANUP AT_SETUP([ovsdb-client get-schema-version]) AT_KEYWORDS([ovsdb server positive]) -AT_DATA([schema], [ORDINAL_SCHEMA -]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR +ordinal_schema > schema AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --unixctl=$PWD/unixctl --remote=punix:socket db], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl --remote=punix:socket db], [0], [ignore], [ignore]) AT_CHECK([ovsdb-client get-schema-version unix:socket ordinals], [0], [5.1.3 ]) OVSDB_SERVER_SHUTDOWN @@ -146,13 +146,16 @@ AT_CLEANUP AT_SETUP([database multiplexing implementation]) AT_KEYWORDS([ovsdb server positive]) -AT_DATA([schema], [ORDINAL_SCHEMA -]) -AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --unixctl=$PWD/unixctl --remote=punix:socket db], [0], [ignore], [ignore]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR +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="`pwd`"/pid --unixctl="`pwd`"/unixctl --remote=punix:socket db1 db2], [0], [ignore], [ignore]) AT_CHECK( [[ovsdb-client list-dbs unix:socket]], - [0], [ordinals + [0], [constraints +ordinals ], [ignore], [test ! -e pid || kill `cat pid`]) AT_CHECK( [[test-jsonrpc request unix:socket get_schema [\"nonexistent\"]]], [0], @@ -163,37 +166,67 @@ AT_CLEANUP AT_SETUP([--remote=db: implementation]) AT_KEYWORDS([ovsdb server positive]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR +OVS_LOGDIR=`pwd`; export OVS_LOGDIR AT_DATA([schema], [[{"name": "mydb", "tables": { + "Root": { + "columns": { + "managers": { + "type": { + "key": "string", + "min": 0, + "max": "unlimited"}}, + "manager_options": { + "type": { + "key": {"type": "uuid", "refTable": "Manager"}, + "min": 0, + "max": "unlimited"}}}}, "Manager": { "columns": { - "manager": {"type": "string"}}}}} + "target": { + "type": "string"}, + "is_connected": { + "type": { + "key": "boolean", + "min": 0, + "max": 1}}}}}} ]]) AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) AT_CHECK( [[ovsdb-tool transact db \ '["mydb", + {"op": "insert", + "table": "Root", + "row": { + "managers": "punix:socket1", + "manager_options": ["set", [["named-uuid", "x"]]]}}, {"op": "insert", "table": "Manager", - "row": {"manager": "punix:socket"}}]']], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=db:Manager,manager --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) + "uuid-name": "x", + "row": {"target": "punix:socket2"}}]']], [0], [ignore], [ignore]) +ON_EXIT([kill `cat ovsdb-server.pid`]) +AT_CHECK([ovsdb-server --enable-dummy --detach --no-chdir --pidfile --remote=db:Root,managers --remote=db:Root,manager_options --log-file db], [0], [ignore], [ignore]) +for i in 1 2 3 4 5 6; do ovs-appctl -t ovsdb-server time/warp 1000; done AT_CHECK( - [[ovsdb-client transact unix:socket \ + [[ovsdb-client transact unix:socket1 \ '["mydb", + {"op": "select", + "table": "Root", + "where": [], + "columns": ["managers"]}, {"op": "select", "table": "Manager", "where": [], - "columns": ["manager"]}]']], - [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) + "columns": ["target", "is_connected"]}]']], + [0], [stdout], [ignore]) AT_CHECK( [perl $srcdir/uuidfilt.pl stdout], [0], - [[[{"rows":[{"manager":"punix:socket"}]}] + [[[{"rows":[{"managers":"punix:socket1"}]},{"rows":[{"is_connected":false,"target":"punix:socket2"}]}] ]], - [ignore], - [test ! -e pid || kill `cat pid`]) -OVSDB_SERVER_SHUTDOWN + [ignore]) AT_CLEANUP AT_SETUP([SSL db: implementation]) @@ -224,11 +257,11 @@ AT_CHECK( AT_CHECK([perl $srcdir/choose-port.pl], [0], [stdout]) SSL_PORT=`cat stdout` AT_CHECK( - [ovsdb-server --detach --pidfile=$PWD/pid \ + [ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid \ --private-key=db:SSL,private_key \ --certificate=db:SSL,certificate \ --ca-cert=db:SSL,ca_cert \ - --remote=pssl:$SSL_PORT:127.0.0.1 --unixctl=$PWD/unixctl db], + --remote=pssl:$SSL_PORT:127.0.0.1 --unixctl="`pwd`"/unixctl db], [0], [ignore], [ignore]) AT_CHECK( [[ovsdb-client \ @@ -252,11 +285,18 @@ AT_CLEANUP AT_SETUP([compacting online]) AT_KEYWORDS([ovsdb server compact]) -AT_DATA([schema], [ORDINAL_SCHEMA -]) -touch .db.~lock~ +OVS_RUNDIR=`pwd`; export OVS_RUNDIR +ordinal_schema > schema +dnl Make sure that "ovsdb-tool create" works with a dangling symlink for +dnl the database and the lockfile, creating the target of each symlink rather +dnl than replacing the symlinks with regular files. +mkdir dir +ln -s dir/db db +ln -s dir/.db.~lock~ .db.~lock~ +AT_SKIP_IF([test ! -h db || test ! -h .db.~lock~]) AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) -AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --unixctl=$PWD/unixctl --remote=punix:socket --log-file=$PWD/ovsdb-server.log db], [0], [ignore], [ignore]) +dnl Start ovsdb-server. +AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl --remote=punix:socket --log-file="`pwd`"/ovsdb-server.log db], [0], [ignore], [ignore]) AT_CAPTURE_FILE([ovsdb-server.log]) dnl Do a bunch of random transactions that put crap in the database log. AT_CHECK( @@ -322,14 +362,20 @@ _uuid name number <5> zero 0 @&t@ ], [], [test ! -e pid || kill `cat pid`]) dnl Now compact the database in-place. -AT_CHECK([[ovs-appctl -t $PWD/unixctl ovsdb-server/compact]], +AT_CHECK([[ovs-appctl -t "`pwd`"/unixctl ovsdb-server/compact]], [0], [], [ignore], [test ! -e pid || kill `cat pid`]) +dnl Make sure that "db" is still a symlink to dir/db instead of getting +dnl replaced by a regular file, ditto for .db.~lock~. +AT_CHECK([test -h db]) +AT_CHECK([test -h .db.~lock~]) +AT_CHECK([test -f dir/db]) +AT_CHECK([test -f dir/.db.~lock~]) dnl We can't fully re-check the contents of the database log, because the dnl order of the records is not predictable, but there should only be 4 lines dnl in it now. AT_CAPTURE_FILE([db]) -AT_CHECK([wc -l < db], [0], [4 -], [], [test ! -e pid || kill `cat pid`]) +AT_CHECK([test `wc -l < db` -eq 4], [0], [], [], + [test ! -e pid || kill `cat pid`]) dnl And check that the dumped data is the same too: AT_CHECK([ovsdb-client dump unix:socket ordinals], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) @@ -354,8 +400,8 @@ AT_CHECK( [0], [[[{"count":3}] ]], [ignore], [test ! -e pid || kill `cat pid`]) dnl There should be 6 lines in the log now. -AT_CHECK([wc -l < db], [0], [6 -], [], [test ! -e pid || kill `cat pid`]) +AT_CHECK([test `wc -l < db` -eq 6], [0], [], [], + [test ! -e pid || kill `cat pid`]) dnl Then check that the dumped data is correct. AT_CHECK([ovsdb-client dump unix:socket ordinals], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) @@ -390,13 +436,13 @@ m4_define([OVSDB_CHECK_EXECUTION], [AT_SETUP([$1]) AT_KEYWORDS([ovsdb server positive ssl $5]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) - AT_DATA([schema], [$2 -]) + OVS_RUNDIR=`pwd`; export OVS_RUNDIR + $2 > schema AT_CHECK([perl $srcdir/choose-port.pl], [0], [stdout]) SSL_PORT=`cat stdout` PKIDIR=$abs_top_builddir/tests AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) - AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:$SSL_PORT:127.0.0.1 --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:$SSL_PORT:127.0.0.1 --unixctl="`pwd`"/unixctl db], [0], [ignore], [ignore]) 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`]) @@ -407,6 +453,56 @@ cat stdout >> output OVSDB_SERVER_SHUTDOWN AT_CLEANUP]) +EXECUTION_EXAMPLES + +AT_BANNER([OVSDB -- ovsdb-server transactions (TCP sockets)]) + +AT_SETUP([ovsdb-client get-schema-version - tcp socket]) +AT_KEYWORDS([ovsdb server positive tcp]) +ordinal_schema > schema +AT_CHECK([perl $srcdir/choose-port.pl], [0], [stdout]) +TCP_PORT=`cat stdout` +AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --unixctl="`pwd`"/unixctl --remote=ptcp:$TCP_PORT:127.0.0.1 db], [0], [ignore], [ignore]) +AT_CHECK([ovsdb-client get-schema-version tcp:127.0.0.1:$TCP_PORT ordinals], [0], [5.1.3 +]) +OVSDB_SERVER_SHUTDOWN +AT_CLEANUP]) + +# OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS]) +# +# Creates a database with the given SCHEMA, starts an ovsdb-server on +# that database, and runs each of the TRANSACTIONS (which should be a +# quoted list of quoted strings) against it with ovsdb-client one at a +# time. +# +# Checks that the overall output is OUTPUT, but UUIDs in the output +# are replaced by markers of the form where N is a number. The +# first unique UUID is replaced by <0>, the next by <1>, and so on. +# If a given UUID appears more than once it is always replaced by the +# same marker. +# +# TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. +m4_define([OVSDB_CHECK_EXECUTION], + [AT_SETUP([$1]) + AT_KEYWORDS([ovsdb server positive tcp $5]) + OVS_RUNDIR=`pwd`; export OVS_RUNDIR + $2 > schema + AT_CHECK([perl $srcdir/choose-port.pl], [0], [stdout]) + TCP_PORT=`cat stdout` + PKIDIR=$abs_top_builddir/tests + AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) + AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=ptcp:$TCP_PORT:127.0.0.1 --unixctl="`pwd`"/unixctl db], [0], [ignore], [ignore]) + 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`]) +cat stdout >> output +]) + AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4], [ignore], + [test ! -e pid || kill `cat pid`]) + OVSDB_SERVER_SHUTDOWN + AT_CLEANUP]) + EXECUTION_EXAMPLES AT_BANNER([OVSDB -- transactions on transient ovsdb-server]) @@ -431,13 +527,13 @@ AT_BANNER([OVSDB -- transactions on transient ovsdb-server]) m4_define([OVSDB_CHECK_EXECUTION], [AT_SETUP([$1]) AT_KEYWORDS([ovsdb server positive transient $5]) - AT_DATA([schema], [$2 -]) + OVS_RUNDIR=`pwd`; export OVS_RUNDIR + $2 > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) m4_foreach([txn], [$3], [AT_DATA([txnfile], [ovsdb-client transact unix:socket 'txn' ]) - AT_CHECK([ovsdb-server --remote=punix:socket --unixctl=$PWD/unixctl db --run="sh txnfile"], [0], [stdout], [ignore]) + AT_CHECK([ovsdb-server --remote=punix:socket --unixctl="`pwd`"/unixctl db --run="sh txnfile"], [0], [stdout], [ignore]) cat stdout >> output ]) AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4], [ignore])