ofp-util: Work on decoding OF1.1 flow_mods.

[openvswitch] / tests / test-ovsdb.c

diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c
index 5594b40f0666ab89a2f017d5f04e21ab440a722e..a1ad2cbc85655f49339ad540b78784380e6bc278 100644 (file)
--- a/tests/test-ovsdb.c
+++ b/tests/test-ovsdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
 #include "ovsdb/ovsdb.h"
 #include "ovsdb/query.h"
 #include "ovsdb/row.h"
+#include "ovsdb/server.h"
 #include "ovsdb/table.h"
 #include "ovsdb/transaction.h"
 #include "ovsdb/trigger.h"
@@ -1257,7 +1258,7 @@ do_execute(int argc OVS_UNUSED, char *argv[])
         char *s;
 
         params = parse_json(argv[i]);
-        result = ovsdb_execute(db, params, 0, NULL);
+        result = ovsdb_execute(db, NULL, params, 0, NULL);
         s = json_to_string(result, JSSF_SORT);
         printf("%s\n", s);
         free(s);
@@ -1292,7 +1293,7 @@ static void
 do_trigger(int argc OVS_UNUSED, char *argv[])
 {
     struct ovsdb_schema *schema;
-    struct list completions;
+    struct ovsdb_session session;
     struct json *json;
     struct ovsdb *db;
     long long int now;
@@ -1305,7 +1306,8 @@ do_trigger(int argc OVS_UNUSED, char *argv[])
     json_destroy(json);
     db = ovsdb_create(schema);
 
-    list_init(&completions);
+    ovsdb_session_init(&session, db);
+
     now = 0;
     number = 0;
     for (i = 2; i < argc; i++) {
@@ -1319,7 +1321,7 @@ do_trigger(int argc OVS_UNUSED, char *argv[])
             json_destroy(params);
         } else {
             struct test_trigger *t = xmalloc(sizeof *t);
-            ovsdb_trigger_init(db, &t->trigger, params, &completions, now);
+            ovsdb_trigger_init(&session, &t->trigger, params, now);
             t->number = number++;
             if (ovsdb_trigger_is_complete(&t->trigger)) {
                 do_trigger_dump(t, now, "immediate");
@@ -1329,8 +1331,8 @@ do_trigger(int argc OVS_UNUSED, char *argv[])
         }
 
         ovsdb_trigger_run(db, now);
-        while (!list_is_empty(&completions)) {
-            do_trigger_dump(CONTAINER_OF(list_pop_front(&completions),
+        while (!list_is_empty(&session.completions)) {
+            do_trigger_dump(CONTAINER_OF(list_pop_front(&session.completions),
                                          struct test_trigger, trigger.node),
                             now, "delayed");
         }
@@ -1777,7 +1779,7 @@ idl_set(struct ovsdb_idl *idl, char *commands, int step)
             struct idltest_simple *s;
 
             if (!arg1 || arg2) {
-                ovs_fatal(0, "\"set\" command requires 1 argument");
+                ovs_fatal(0, "\"insert\" command requires 1 argument");
             }
 
             s = idltest_simple_insert(txn);
@@ -1786,12 +1788,12 @@ idl_set(struct ovsdb_idl *idl, char *commands, int step)
             const struct idltest_simple *s;
 
             if (!arg1 || arg2) {
-                ovs_fatal(0, "\"set\" command requires 1 argument");
+                ovs_fatal(0, "\"delete\" command requires 1 argument");
             }
 
             s = idltest_find_simple(idl, atoi(arg1));
             if (!s) {
-                ovs_fatal(0, "\"set\" command asks for nonexistent "
+                ovs_fatal(0, "\"delete\" command asks for nonexistent "
                           "i=%d", atoi(arg1));
             }
             idltest_simple_delete(s);
@@ -1823,11 +1825,27 @@ idl_set(struct ovsdb_idl *idl, char *commands, int step)
                           arg2);
             }
         } else if (!strcmp(name, "increment")) {
-            if (!arg2 || arg3) {
-                ovs_fatal(0, "\"increment\" command requires 2 arguments");
+            const struct idltest_simple *s;
+
+            if (!arg1 || arg2) {
+                ovs_fatal(0, "\"increment\" command requires 1 argument");
             }
-            ovsdb_idl_txn_increment(txn, arg1, arg2, NULL);
+
+            s = idltest_find_simple(idl, atoi(arg1));
+            if (!s) {
+                ovs_fatal(0, "\"set\" command asks for nonexistent "
+                          "i=%d", atoi(arg1));
+            }
+
+            ovsdb_idl_txn_increment(txn, &s->header_, &idltest_simple_col_i);
             increment = true;
+        } else if (!strcmp(name, "abort")) {
+            ovsdb_idl_txn_abort(txn);
+            break;
+        } else if (!strcmp(name, "destroy")) {
+            printf("%03d: destroy\n", step);
+            ovsdb_idl_txn_destroy(txn);
+            return;
         } else {
             ovs_fatal(0, "unknown command %s", name);
         }
@@ -1862,8 +1880,8 @@ do_idl(int argc, char *argv[])
     if (argc > 2) {
         struct stream *stream;
 
-        error = stream_open_block(jsonrpc_stream_open(argv[1], &stream),
-                                  &stream);
+        error = stream_open_block(jsonrpc_stream_open(argv[1], &stream,
+                                  DSCP_DEFAULT), &stream);
         if (error) {
             ovs_fatal(error, "failed to connect to \"%s\"", argv[1]);
         }
@@ -1884,7 +1902,11 @@ do_idl(int argc, char *argv[])
             arg++;
         } else {
             /* Wait for update. */
-            while (ovsdb_idl_get_seqno(idl) == seqno && !ovsdb_idl_run(idl)) {
+            for (;;) {
+                ovsdb_idl_run(idl);
+                if (ovsdb_idl_get_seqno(idl) != seqno) {
+                    break;
+                }
                 jsonrpc_run(rpc);
 
                 ovsdb_idl_wait(idl);
@@ -1907,7 +1929,7 @@ do_idl(int argc, char *argv[])
             substitute_uuids(json, symtab);
             request = jsonrpc_create_request("transact", json, NULL);
             error = jsonrpc_transact_block(rpc, request, &reply);
-            if (error) {
+            if (error || reply->error) {
                 ovs_fatal(error, "jsonrpc transaction failed");
             }
             printf("%03d: ", step++);
@@ -1924,7 +1946,11 @@ do_idl(int argc, char *argv[])
     if (rpc) {
         jsonrpc_close(rpc);
     }
-    while (ovsdb_idl_get_seqno(idl) == seqno && !ovsdb_idl_run(idl)) {
+    for (;;) {
+        ovsdb_idl_run(idl);
+        if (ovsdb_idl_get_seqno(idl) != seqno) {
+            break;
+        }
         ovsdb_idl_wait(idl);
         poll_block();
     }