X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-tool.at;h=87949bbb5e53ace0e9cca9409d87136c80d1fe50;hb=e0c7697cbcb56fde7aa725772eae75d15aa80403;hp=5e25fe5ae69a9d237886b450d424948154b35f5e;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=sliver-openvswitch.git diff --git a/tests/ovsdb-tool.at b/tests/ovsdb-tool.at index 5e25fe5ae..87949bbb5 100644 --- a/tests/ovsdb-tool.at +++ b/tests/ovsdb-tool.at @@ -16,8 +16,7 @@ AT_BANNER([OVSDB -- ovsdb-tool]) m4_define([OVSDB_CHECK_EXECUTION], [AT_SETUP([$1]) AT_KEYWORDS([ovsdb file positive $5]) - AT_DATA([schema], [$2 -]) + $2 > schema touch .db.~lock~ AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) m4_foreach([txn], [$3], @@ -31,8 +30,7 @@ EXECUTION_EXAMPLES AT_SETUP([transaction comments]) AT_KEYWORDS([ovsdb file positive]) -AT_DATA([schema], [ORDINAL_SCHEMA -]) +ordinal_schema > schema touch .db.~lock~ AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore]) AT_CHECK([[ovsdb-tool transact db ' @@ -45,13 +43,12 @@ AT_CHECK([[ovsdb-tool transact db ' AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [[[{"uuid":["uuid","<0>"]},{}] ]]) -AT_CHECK([grep -q "add row for 5" db]) +AT_CHECK([grep "add row for 5" db], [0], [ignore]) AT_CLEANUP AT_SETUP([ovsdb-tool compact]) AT_KEYWORDS([ovsdb file positive]) -AT_DATA([schema], [ORDINAL_SCHEMA -]) +ordinal_schema > schema touch .db.~lock~ AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore]) dnl Do a bunch of random transactions that put crap in the database log. @@ -82,32 +79,33 @@ AT_CHECK( done]], [0], [stdout], [ignore]) 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}}} ]]) dnl Dump out and check the actual database contents. -AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], +AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [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@ @@ -123,13 +121,13 @@ 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 -]) +AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same too: -AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], +AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [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@ @@ -142,8 +140,7 @@ AT_CLEANUP AT_SETUP([ovsdb-tool convert -- removing a column]) AT_KEYWORDS([ovsdb file positive]) -AT_DATA([schema], [ORDINAL_SCHEMA -]) +ordinal_schema > schema AT_DATA([new-schema], [[{"name": "ordinals", "tables": { @@ -167,10 +164,11 @@ AT_CHECK( done]], [0], [stdout], [ignore]) dnl Dump out and check the actual database contents. -AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], +AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [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@ @@ -186,13 +184,13 @@ 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 -]) +AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same except for the removed column: -AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], +AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid number ------------------------------------ ------ <0> 0 @&t@ <1> 1 @&t@ @@ -212,8 +210,7 @@ AT_DATA([schema], "columns": { "number": {"type": "integer"}}}}} ]]) -AT_DATA([new-schema], [ORDINAL_SCHEMA -]) +ordinal_schema > new-schema touch .db.~lock~ AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore]) dnl Put some data in the database. @@ -229,10 +226,11 @@ AT_CHECK( done]], [0], [stdout], [ignore]) dnl Dump out and check the actual database contents. -AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], +AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], - [_uuid number +AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +ordinals table +_uuid number ------------------------------------ ------ <0> 0 @&t@ <1> 1 @&t@ @@ -248,13 +246,13 @@ 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 -]) +AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same except for the added column: -AT_CHECK([[ovsdb-server --unixctl=$PWD/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], +AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [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> "" 0 @&t@ <1> "" 1 @&t@ @@ -264,3 +262,55 @@ AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], <5> "" 5 @&t@ ]) AT_CLEANUP + +AT_SETUP([ovsdb-tool schema-version]) +AT_KEYWORDS([ovsdb file positive]) +ordinal_schema > schema +AT_CHECK([ovsdb-tool schema-version schema], [0], [5.1.3 +]) +AT_CLEANUP + +AT_SETUP([ovsdb-tool db-version]) +AT_KEYWORDS([ovsdb file positive]) +ordinal_schema > schema +touch .db.~lock~ +AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore]) +AT_CHECK([ovsdb-tool db-version db], [0], [5.1.3 +]) +AT_CLEANUP + +AT_SETUP([ovsdb-tool schema-cksum]) +AT_KEYWORDS([ovsdb file positive]) +ordinal_schema > schema +AT_CHECK([ovsdb-tool schema-cksum schema], [0], [12345678 9 +]) +AT_CLEANUP + +AT_SETUP([ovsdb-tool db-cksum]) +AT_KEYWORDS([ovsdb file positive]) +ordinal_schema > schema +touch .db.~lock~ +AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore]) +AT_CHECK([ovsdb-tool db-cksum db], [0], [12345678 9 +]) +AT_CLEANUP + +AT_SETUP([ovsdb-tool needs-conversion (no conversion needed)]) +AT_KEYWORDS([ovsdb file positive]) +ordinal_schema > schema +touch .db.~lock~ +AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore]) +AT_CHECK([ovsdb-tool needs-conversion db schema], [0], [no +]) +AT_CLEANUP + +AT_SETUP([ovsdb-tool needs-conversion (conversion needed)]) +AT_KEYWORDS([ovsdb file positive]) +ordinal_schema > schema +touch .db.~lock~ +AT_CHECK([ovsdb-tool create db schema], [0], [], [ignore]) +sed 's/5\.1\.3/5.1.4/' < schema > schema2 +AT_CHECK([diff schema schema2], [1], [ignore]) +AT_CHECK([ovsdb-tool needs-conversion db schema2], [0], [yes +]) +AT_CLEANUP