tests: Add OVSDB tests for monitors that select only certain operations.
authorBen Pfaff <blp@nicira.com>
Wed, 30 Jun 2010 19:44:17 +0000 (12:44 -0700)
committerBen Pfaff <blp@nicira.com>
Wed, 30 Jun 2010 23:49:01 +0000 (16:49 -0700)
This has been supported as long as table monitoring has been supported, but
until now there were no tests, so this commit adds some.

tests/ovsdb-monitor.at

index 7ccbb03c75cca56fa6e3fb49a2439532e57a46e2..110a3138dfd73cfc3744db10f37501b421853c40 100644 (file)
@@ -1,12 +1,14 @@
 AT_BANNER([OVSDB -- ovsdb-server monitors])
 
 # OVSDB_CHECK_MONITOR(TITLE, SCHEMA, [PRE-MONITOR-TXN], DB, TABLE,
-#                     TRANSACTIONS, OUTPUT, [KEYWORDS])
+#                     TRANSACTIONS, OUTPUT, [SELECT], [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.
+# 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.
 #
 # Checks that the overall output is OUTPUT, but UUIDs in the output
 # are replaced by markers of the form <N> where N is a number.  The
@@ -17,14 +19,16 @@ AT_BANNER([OVSDB -- ovsdb-server monitors])
 # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS.
 m4_define([OVSDB_CHECK_MONITOR], 
   [AT_SETUP([$1])
-   AT_KEYWORDS([ovsdb server monitor positive $8])
+   AT_KEYWORDS([ovsdb server monitor positive $9])
    AT_DATA([schema], [$2
 ])
    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_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --remote=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore])
-   AT_CHECK([ovsdb-client --detach --pidfile=$PWD/client-pid -d json monitor --format=csv unix:socket $4 $5 > output], 
+   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],
+            [0], [], [])
+   AT_CHECK([ovsdb-client -vjsonrpc --detach --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],
@@ -214,3 +218,103 @@ row,action,a,a2a,a2a1,a2b,_version
 ,new,1,"[""set"",[]]","[""uuid"",""<3>""]","[""uuid"",""<1>""]","[""uuid"",""<5>""]"
 ]])
 
+OVSDB_CHECK_MONITOR([monitor insert-update-and-delete transaction],
+  [ORDINAL_SCHEMA],
+  [[[["ordinals",
+      {"op": "insert",
+       "table": "ordinals",
+       "row": {"number": 10, "name": "ten"}}]]]],
+  [ordinals], [ordinals],
+  [[[["ordinals",
+      {"op": "insert",
+       "table": "ordinals",
+       "row": {"number": 9, "name": "nine"},
+       "uuid-name": "nine"},
+      {"op": "update",
+       "table": "ordinals",
+       "where": [["_uuid", "==", ["named-uuid", "nine"]]],
+       "row": {"name": "three squared"}},
+      {"op": "delete",
+       "table": "ordinals",
+       "where": [["_uuid", "==", ["named-uuid", "nine"]]]},
+      {"op": "insert",
+       "table": "ordinals",
+       "row": {"number": 7, "name": "seven"}}]]]],
+  [[row,action,name,number,_version
+<0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+
+row,action,name,number,_version
+<2>,insert,"""seven""",7,"[""uuid"",""<3>""]"
+]])
+\f
+AT_BANNER([ovsdb -- ovsdb-monitor monitor only some operations])
+
+m4_define([OVSDB_MONITOR_INITIAL],
+  [[[["ordinals",
+      {"op": "insert",
+       "table": "ordinals",
+       "row": {"number": 10, "name": "ten"}}]]]])
+m4_define([OVSDB_MONITOR_TXNS],
+  [[[["ordinals",
+      {"op": "insert",
+       "table": "ordinals",
+       "row": {"number": 5, "name": "five"}}]]],
+   [[["ordinals",
+      {"op": "update",
+       "table": "ordinals",
+       "where": [["name", "==", "five"]],
+       "row": {"name": "FIVE"}}]]],
+   [[["ordinals",
+      {"op": "delete",
+       "table": "ordinals",
+       "where": []}]]]])
+
+OVSDB_CHECK_MONITOR([monitor all operations],
+  [ORDINAL_SCHEMA], [OVSDB_MONITOR_INITIAL],
+  [ordinals], [ordinals], [OVSDB_MONITOR_TXNS],
+  [[row,action,name,number,_version
+<0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+
+row,action,name,number,_version
+<2>,insert,"""five""",5,"[""uuid"",""<3>""]"
+
+row,action,name,number,_version
+<2>,old,"""five""",,"[""uuid"",""<3>""]"
+,new,"""FIVE""",5,"[""uuid"",""<4>""]"
+
+row,action,name,number,_version
+<2>,delete,"""FIVE""",5,"[""uuid"",""<4>""]"
+<0>,delete,"""ten""",10,"[""uuid"",""<1>""]"
+]])
+
+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],
+  [ordinals], [ordinals], [OVSDB_MONITOR_TXNS],
+  [[row,action,name,number,_version
+<0>,initial,"""ten""",10,"[""uuid"",""<1>""]"
+]], [initial])
+
+OVSDB_CHECK_MONITOR([monitor insert only],
+  [ORDINAL_SCHEMA], [OVSDB_MONITOR_INITIAL],
+  [ordinals], [ordinals], [OVSDB_MONITOR_TXNS],
+  [[row,action,name,number,_version
+<0>,insert,"""five""",5,"[""uuid"",""<1>""]"
+]], [insert])
+
+OVSDB_CHECK_MONITOR([monitor delete only],
+  [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])
+
+OVSDB_CHECK_MONITOR([monitor modify only],
+  [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])