X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovsdb-server.at;h=7d79d220d3e024a981fd91896c77b96dac65de38;hb=6b8558f867edc8a9e1e2e2bd4f052a57caf5e863;hp=800506bb319f5b578a3b301c2b58d1865c1da186;hpb=78876719e0eaf181a6775417ad41ec5852efa863;p=openvswitch diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 800506bb..7d79d220 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -38,6 +38,112 @@ cat stdout >> output EXECUTION_EXAMPLES +AT_SETUP([truncating corrupted database log]) +AT_KEYWORDS([ovsdb server positive unix]) +AT_DATA([schema], [ORDINAL_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 \ +'["ordinals", + {"op": "insert", + "table": "ordinals", + "row": {"number": 0, "name": "zero"}}]' +]]) +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. +echo 'xxx' >> db +AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ +'["ordinals", + {"op": "insert", + "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([grep 'syntax error: db: parse error.* in header line "xxx"' stderr], + [0], [ignore]) +cat stdout >> output +dnl Run a final transaction to verify that both transactions succeeeded. +dnl The crap that we added should have been truncated by the previous run, +dnl so ovsdb-server shouldn't log a warning this time. +AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ +'["ordinals", + {"op": "select", + "table": "ordinals", + "where": [], + "sort": ["number"]}]' +]]) +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>"]}] +[{"uuid":["uuid","<1>"]}] +[{"rows":[{"_uuid":["uuid","<0>"],"_version":["uuid","<2>"],"name":"zero","number":0},{"_uuid":["uuid","<1>"],"_version":["uuid","<3>"],"name":"one","number":1}]}] +]], [], + [test ! -e pid || kill `cat pid`]) +AT_CLEANUP + +AT_SETUP([truncating database log with bad transaction]) +AT_KEYWORDS([ovsdb server positive unix]) +AT_DATA([schema], [ORDINAL_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 \ +'["ordinals", + {"op": "insert", + "table": "ordinals", + "row": {"number": 0, "name": "zero"}}]' +]]) +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. +echo 'OVSDB JSON 15 ffbcdae4b0386265f9ea3280dd7c8f0b72a20e56 +{"invalid":{}}' >> db +AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ +'["ordinals", + {"op": "insert", + "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([grep 'syntax "{"invalid":{}}": unknown table: No table named invalid.' stderr], + [0], [ignore]) +cat stdout >> output +dnl Run a final transaction to verify that both transactions succeeeded. +dnl The crap that we added should have been truncated by the previous run, +dnl so ovsdb-server shouldn't log a warning this time. +AT_DATA([txnfile], [[ovsdb-client transact unix:socket \ +'["ordinals", + {"op": "select", + "table": "ordinals", + "where": [], + "sort": ["number"]}]' +]]) +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>"]}] +[{"uuid":["uuid","<1>"]}] +[{"rows":[{"_uuid":["uuid","<0>"],"_version":["uuid","<2>"],"name":"zero","number":0},{"_uuid":["uuid","<1>"],"_version":["uuid","<3>"],"name":"one","number":1}]}] +]], [], + [test ! -e pid || kill `cat pid`]) +AT_CLEANUP + +AT_SETUP([ovsdb-client get-schema-version]) +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]) +AT_CHECK([ovsdb-client get-schema-version unix:socket ordinals], [0], [5.1.3 +]) +OVSDB_SERVER_SHUTDOWN +AT_CLEANUP + AT_SETUP([database multiplexing implementation]) AT_KEYWORDS([ovsdb server positive]) AT_DATA([schema], [ORDINAL_SCHEMA @@ -49,9 +155,9 @@ AT_CHECK( [0], [ordinals ], [ignore], [test ! -e pid || kill `cat pid`]) AT_CHECK( - [[ovsdb-client get-schema unix:socket nonexistent]], - [1], [], [[ovsdb-client: syntax "{"syntax":"[\"nonexistent\"]","details":"get_schema request specifies unknown database nonexistent","error":"unknown database"}": syntax error: Parsing database schema failed: Required 'name' member is missing. -]], [test ! -e pid || kill `cat pid`]) + [[test-jsonrpc request unix:socket get_schema [\"nonexistent\"]]], [0], + [[{"error":null,"id":0,"result":{"details":"get_schema request specifies unknown database nonexistent","error":"unknown database","syntax":"[\"nonexistent\"]"}} +]], [], [test ! -e pid || kill `cat pid`]) OVSDB_SERVER_SHUTDOWN AT_CLEANUP @@ -95,7 +201,7 @@ AT_KEYWORDS([ovsdb server positive ssl $5]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) AT_SKIP_IF([test "x$RANDOM" = x]) SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)` -PKIDIR=$abs_top_srcdir/tests +PKIDIR=$abs_top_builddir/tests AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" \\]"]) AT_DATA([schema], @@ -180,32 +286,33 @@ AT_CHECK( done]], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) dnl Check that all the crap is in fact in the database log. -AT_CHECK([[perl $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/']], [0], - [[{"name":"ordinals","tables":{"ordinals":{"columns":{"name":{"type":"string"},"number":{"type":"integer"}}}}} -{"ordinals":{"<0>":{"name":"zero"}},"_comment":"add row for zero 0","_date":0} -{"ordinals":{"<0>":null},"_comment":"delete row for 0","_date":0} -{"ordinals":{"<1>":{"name":"zero"}},"_comment":"add back row for zero 0","_date":0} -{"ordinals":{"<2>":{"number":1,"name":"one"}},"_comment":"add row for one 1","_date":0} -{"ordinals":{"<2>":null},"_comment":"delete row for 1","_date":0} -{"ordinals":{"<3>":{"number":1,"name":"one"}},"_comment":"add back row for one 1","_date":0} -{"ordinals":{"<4>":{"number":2,"name":"two"}},"_comment":"add row for two 2","_date":0} -{"ordinals":{"<4>":null},"_comment":"delete row for 2","_date":0} -{"ordinals":{"<5>":{"number":2,"name":"two"}},"_comment":"add back row for two 2","_date":0} -{"ordinals":{"<6>":{"number":3,"name":"three"}},"_comment":"add row for three 3","_date":0} -{"ordinals":{"<6>":null},"_comment":"delete row for 3","_date":0} -{"ordinals":{"<7>":{"number":3,"name":"three"}},"_comment":"add back row for three 3","_date":0} -{"ordinals":{"<8>":{"number":4,"name":"four"}},"_comment":"add row for four 4","_date":0} -{"ordinals":{"<8>":null},"_comment":"delete row for 4","_date":0} -{"ordinals":{"<9>":{"number":4,"name":"four"}},"_comment":"add back row for four 4","_date":0} -{"ordinals":{"<10>":{"number":5,"name":"five"}},"_comment":"add row for five 5","_date":0} -{"ordinals":{"<10>":null},"_comment":"delete row for 5","_date":0} -{"ordinals":{"<11>":{"number":5,"name":"five"}},"_comment":"add back row for five 5","_date":0} +AT_CHECK([[perl $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | test-json --multiple -]], [0], + [[{"cksum":"12345678 9","name":"ordinals","tables":{"ordinals":{"columns":{"name":{"type":"string"},"number":{"type":"integer"}},"indexes":[["number"]]}},"version":"5.1.3"} +{"_comment":"add row for zero 0","_date":0,"ordinals":{"<0>":{"name":"zero"}}} +{"_comment":"delete row for 0","_date":0,"ordinals":{"<0>":null}} +{"_comment":"add back row for zero 0","_date":0,"ordinals":{"<1>":{"name":"zero"}}} +{"_comment":"add row for one 1","_date":0,"ordinals":{"<2>":{"name":"one","number":1}}} +{"_comment":"delete row for 1","_date":0,"ordinals":{"<2>":null}} +{"_comment":"add back row for one 1","_date":0,"ordinals":{"<3>":{"name":"one","number":1}}} +{"_comment":"add row for two 2","_date":0,"ordinals":{"<4>":{"name":"two","number":2}}} +{"_comment":"delete row for 2","_date":0,"ordinals":{"<4>":null}} +{"_comment":"add back row for two 2","_date":0,"ordinals":{"<5>":{"name":"two","number":2}}} +{"_comment":"add row for three 3","_date":0,"ordinals":{"<6>":{"name":"three","number":3}}} +{"_comment":"delete row for 3","_date":0,"ordinals":{"<6>":null}} +{"_comment":"add back row for three 3","_date":0,"ordinals":{"<7>":{"name":"three","number":3}}} +{"_comment":"add row for four 4","_date":0,"ordinals":{"<8>":{"name":"four","number":4}}} +{"_comment":"delete row for 4","_date":0,"ordinals":{"<8>":null}} +{"_comment":"add back row for four 4","_date":0,"ordinals":{"<9>":{"name":"four","number":4}}} +{"_comment":"add row for five 5","_date":0,"ordinals":{"<10>":{"name":"five","number":5}}} +{"_comment":"delete row for 5","_date":0,"ordinals":{"<10>":null}} +{"_comment":"add back row for five 5","_date":0,"ordinals":{"<11>":{"name":"five","number":5}}} ]], [], [test ! -e pid || kill `cat pid`]) dnl Dump out and check the actual database contents. AT_CHECK([[ovsdb-client dump unix:socket ordinals]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ @@ -226,8 +333,9 @@ AT_CHECK([wc -l < db], [0], [4 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`]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ @@ -251,8 +359,9 @@ AT_CHECK([wc -l < db], [0], [6 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`]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid name number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid name number ------------------------------------ ----- ------ <0> five 5 @&t@ <1> four 4 @&t@ @@ -285,7 +394,7 @@ m4_define([OVSDB_CHECK_EXECUTION], AT_DATA([schema], [$2 ]) SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)` - PKIDIR=$abs_top_srcdir/tests + 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]) m4_foreach([txn], [$3],