X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-monitor.at;h=d24ae9179b53a59317ed28e8b88caf264fc468ed;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=110a3138dfd73cfc3744db10f37501b421853c40;hpb=fd193af4334d05e119ad7bd10e8786c5034948fb;p=sliver-openvswitch.git diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at index 110a3138d..d24ae9179 100644 --- a/tests/ovsdb-monitor.at +++ b/tests/ovsdb-monitor.at @@ -1,14 +1,13 @@ AT_BANNER([OVSDB -- ovsdb-server monitors]) # OVSDB_CHECK_MONITOR(TITLE, SCHEMA, [PRE-MONITOR-TXN], DB, TABLE, -# TRANSACTIONS, OUTPUT, [SELECT], [KEYWORDS]) +# TRANSACTIONS, OUTPUT, [COLUMNS], [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. SELECT, if specified, is passed to ovsdb-client as the -# operations to select. It should be a comma-separated list of -# "initial", "insert", "delete", or "modify" keywords. +# time. COLUMNS, if specified, is passed to ovsdb-client as the set +# of columns and operations to select. # # 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 @@ -20,28 +19,28 @@ AT_BANNER([OVSDB -- ovsdb-server monitors]) m4_define([OVSDB_CHECK_MONITOR], [AT_SETUP([$1]) AT_KEYWORDS([ovsdb server monitor positive $9]) - 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_CHECK([ovsdb-tool transact db 'txn'], [0], [ignore], [ignore])]) AT_CAPTURE_FILE([ovsdb-server-log]) - AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --remote=punix:socket --unixctl=$PWD/unixctl --log-file=$PWD/ovsdb-server-log db >/dev/null 2>&1], + AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/server-pid --remote=punix:socket --unixctl="`pwd`"/unixctl --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1], [0], [], []) - AT_CHECK([ovsdb-client -vjsonrpc --detach --pidfile=$PWD/client-pid -d json monitor --format=csv unix:socket $4 $5 '' $8 > output], + AT_CHECK([ovsdb-client -vjsonrpc --detach --no-chdir --pidfile="`pwd`"/client-pid -d json monitor --format=csv unix:socket $4 $5 $8 > output], [0], [ignore], [ignore], [kill `cat server-pid`]) m4_foreach([txn], [$6], [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], [ignore], [ignore], [kill `cat server-pid client-pid`])]) AT_CHECK([ovsdb-client transact unix:socket '[["$4"]]'], [0], [ignore], [ignore], [kill `cat server-pid client-pid`]) - 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_UNTIL([test ! -e server-pid && test ! -e client-pid]) - AT_CHECK([perl $srcdir/ovsdb-monitor-sort.pl < output | perl $srcdir/uuidfilt.pl], [0], [$7], [ignore]) + AT_CHECK([${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl], [0], [$7], [ignore]) AT_CLEANUP]) OVSDB_CHECK_MONITOR([monitor insert into empty table], - [ORDINAL_SCHEMA], + [ordinal_schema], [], [ordinals], [ordinals], [[[["ordinals", @@ -53,7 +52,7 @@ OVSDB_CHECK_MONITOR([monitor insert into empty table], ]]) OVSDB_CHECK_MONITOR([monitor insert into populated table], - [ORDINAL_SCHEMA], + [ordinal_schema], [[[["ordinals", {"op": "insert", "table": "ordinals", @@ -71,7 +70,7 @@ row,action,name,number,_version ]]) OVSDB_CHECK_MONITOR([monitor delete], - [ORDINAL_SCHEMA], + [ordinal_schema], [[[["ordinals", {"op": "insert", "table": "ordinals", @@ -89,7 +88,7 @@ row,action,name,number,_version ]]) OVSDB_CHECK_MONITOR([monitor row update], - [ORDINAL_SCHEMA], + [ordinal_schema], [[[["ordinals", {"op": "insert", "table": "ordinals", @@ -109,7 +108,7 @@ row,action,name,number,_version ]]) OVSDB_CHECK_MONITOR([monitor no-op row updates], - [ORDINAL_SCHEMA], + [ordinal_schema], [[[["ordinals", {"op": "insert", "table": "ordinals", @@ -132,7 +131,7 @@ row,action,name,number,_version ]]) OVSDB_CHECK_MONITOR([monitor insert-and-update transaction], - [ORDINAL_SCHEMA], + [ordinal_schema], [[[["ordinals", {"op": "insert", "table": "ordinals", @@ -155,7 +154,7 @@ row,action,name,number,_version ]]) OVSDB_CHECK_MONITOR([monitor insert-update-and-delete transaction], - [ORDINAL_SCHEMA], + [ordinal_schema], [[[["ordinals", {"op": "insert", "table": "ordinals", @@ -184,7 +183,7 @@ row,action,name,number,_version ]]) OVSDB_CHECK_MONITOR([monitor weak reference change], - [WEAK_SCHEMA], + [weak_schema], [[[["weak", {"op": "insert", "table": "a", @@ -214,12 +213,12 @@ OVSDB_CHECK_MONITOR([monitor weak reference change], row,action,a,a2a,a2a1,a2b,_version <0>,delete,0,"[""set"",[]]","[""uuid"",""<0>""]","[""uuid"",""<1>""]","[""uuid"",""<2>""]" -<3>,old,,"[""uuid"",""<0>""]",,, +<3>,old,,"[""uuid"",""<0>""]",,,"[""uuid"",""<4>""]" ,new,1,"[""set"",[]]","[""uuid"",""<3>""]","[""uuid"",""<1>""]","[""uuid"",""<5>""]" ]]) OVSDB_CHECK_MONITOR([monitor insert-update-and-delete transaction], - [ORDINAL_SCHEMA], + [ordinal_schema], [[[["ordinals", {"op": "insert", "table": "ordinals", @@ -270,7 +269,7 @@ m4_define([OVSDB_MONITOR_TXNS], "where": []}]]]]) OVSDB_CHECK_MONITOR([monitor all operations], - [ORDINAL_SCHEMA], [OVSDB_MONITOR_INITIAL], + [ordinal_schema], [OVSDB_MONITOR_INITIAL], [ordinals], [ordinals], [OVSDB_MONITOR_TXNS], [[row,action,name,number,_version <0>,initial,"""ten""",10,"[""uuid"",""<1>""]" @@ -290,31 +289,31 @@ row,action,name,number,_version dnl A monitor with "initial" only doesn't really make sense, dnl but it's still allowed and should work. OVSDB_CHECK_MONITOR([monitor initial only], - [ORDINAL_SCHEMA], [OVSDB_MONITOR_INITIAL], + [ordinal_schema], [OVSDB_MONITOR_INITIAL], [ordinals], [ordinals], [OVSDB_MONITOR_TXNS], [[row,action,name,number,_version <0>,initial,"""ten""",10,"[""uuid"",""<1>""]" -]], [initial]) +]], [!insert,!delete,!modify]) OVSDB_CHECK_MONITOR([monitor insert only], - [ORDINAL_SCHEMA], [OVSDB_MONITOR_INITIAL], + [ordinal_schema], [OVSDB_MONITOR_INITIAL], [ordinals], [ordinals], [OVSDB_MONITOR_TXNS], [[row,action,name,number,_version <0>,insert,"""five""",5,"[""uuid"",""<1>""]" -]], [insert]) +]], [!initial,!delete,!modify]) OVSDB_CHECK_MONITOR([monitor delete only], - [ORDINAL_SCHEMA], [OVSDB_MONITOR_INITIAL], + [ordinal_schema], [OVSDB_MONITOR_INITIAL], [ordinals], [ordinals], [OVSDB_MONITOR_TXNS], [[row,action,name,number,_version <0>,delete,"""FIVE""",5,"[""uuid"",""<1>""]" <2>,delete,"""ten""",10,"[""uuid"",""<3>""]" -]], [delete]) +]], [!initial,!insert,!modify]) OVSDB_CHECK_MONITOR([monitor modify only], - [ORDINAL_SCHEMA], [OVSDB_MONITOR_INITIAL], + [ordinal_schema], [OVSDB_MONITOR_INITIAL], [ordinals], [ordinals], [OVSDB_MONITOR_TXNS], [[row,action,name,number,_version <0>,old,"""five""",,"[""uuid"",""<1>""]" ,new,"""FIVE""",5,"[""uuid"",""<2>""]" -]], [modify]) +]], [!initial,!insert,!delete])