#include <stdio.h>
#include <stdlib.h>
+#include "byte-order.h"
#include "command-line.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "json.h"
#include "jsonrpc.h"
#include "ovsdb-data.h"
" parse each CONDITION on TABLE, and re-serialize\n"
" evaluate-conditions TABLE [CONDITION,...] [ROW,...]\n"
" test CONDITIONS on TABLE against each ROW, print results\n"
+ " evaluate-conditions-any TABLE [CONDITION,...] [ROW,...]\n"
+ " test CONDITIONS to match any of the CONDITONS on TABLE\n"
+ " against each ROW, print results\n"
+ " compare-conditions TABLE [CONDITION,...]\n"
+ " mutually compare all of the CONDITION, print results for\n"
+ " each pair\n"
" parse-mutations TABLE MUTATION...\n"
" parse each MUTATION on TABLE, and re-serialize\n"
" execute-mutations TABLE [MUTATION,...] [ROW,...]\n"
" connect to SERVER and dump the contents of the database\n"
" as seen initially by the IDL implementation and after\n"
" executing each TRANSACTION. (Each TRANSACTION must modify\n"
- " the database or this command will hang.)\n",
+ " the database or this command will hang.)\n"
+ " idl-partial-update-map-column SERVER \n"
+ " connect to SERVER and executes different operations to\n"
+ " test the capacity of updating elements inside a map column\n"
+ " displaying the table information after each operation.\n",
program_name, program_name);
vlog_usage();
printf("\nOther options:\n"
exit(exit_code);
}
+#define OVSDB_CONDITION_EVERY 0
+#define OVSDB_CONDITION_ANY 1
+
static void
-do_evaluate_conditions(struct ovs_cmdl_context *ctx)
+do_evaluate_condition__(struct ovs_cmdl_context *ctx, int mode)
{
struct ovsdb_table_schema *ts;
struct ovsdb_table *table;
for (i = 0; i < n_conditions; i++) {
printf("condition %2"PRIuSIZE":", i);
for (j = 0; j < n_rows; j++) {
- bool result = ovsdb_condition_evaluate(rows[j], &conditions[i]);
+ bool result;
+ if (mode == OVSDB_CONDITION_EVERY) {
+ result = ovsdb_condition_match_every_clause(rows[j],
+ &conditions[i]);
+ } else {
+ result = ovsdb_condition_match_any_clause(rows[j]->fields,
+ &conditions[i],
+ NULL);
+ }
if (j % 5 == 0) {
putchar(' ');
}
ovsdb_table_destroy(table); /* Also destroys 'ts'. */
}
+static void
+do_evaluate_conditions(struct ovs_cmdl_context *ctx)
+{
+ do_evaluate_condition__(ctx, OVSDB_CONDITION_EVERY);
+}
+
+static void
+do_evaluate_conditions_any(struct ovs_cmdl_context *ctx)
+{
+ do_evaluate_condition__(ctx, OVSDB_CONDITION_ANY);
+}
+
+static void
+do_compare_conditions(struct ovs_cmdl_context *ctx)
+{
+ struct ovsdb_table_schema *ts;
+ struct ovsdb_table *table;
+ struct ovsdb_condition *conditions;
+ size_t n_conditions;
+ struct json *json;
+ size_t i;
+
+ /* Parse table schema, create table. */
+ json = unbox_json(parse_json(ctx->argv[1]));
+ check_ovsdb_error(ovsdb_table_schema_from_json(json, "mytable", &ts));
+ json_destroy(json);
+
+ table = ovsdb_table_create(ts);
+
+ /* Parse conditions. */
+ json = parse_json(ctx->argv[2]);
+ if (json->type != JSON_ARRAY) {
+ ovs_fatal(0, "CONDITION argument is not JSON array");
+ }
+ n_conditions = json->u.array.n;
+ conditions = xmalloc(n_conditions * sizeof *conditions);
+
+ for (i = 0; i < n_conditions; i++) {
+ check_ovsdb_error(ovsdb_condition_from_json(ts, json->u.array.elems[i],
+ NULL, &conditions[i]));
+ }
+ json_destroy(json);
+
+ for (i = 0; i < n_conditions - 1; i++) {
+ int res = ovsdb_condition_cmp_3way(&conditions[i], &conditions[i + 1]);
+ printf("condition %"PRIuSIZE"-%"PRIuSIZE": %d\n", i, i + 1, res);
+ }
+
+ for (i = 0; i < n_conditions; i++) {
+ ovsdb_condition_destroy(&conditions[i]);
+ }
+ free(conditions);
+ ovsdb_table_destroy(table); /* Also destroys 'ts'. */
+}
+
static void
do_parse_mutations(struct ovs_cmdl_context *ctx)
{
}
json_destroy(json);
+ for (i = 0; i < n_classes; i++) {
+ ovsdb_row_destroy(classes[i].example);
+ }
+
ovsdb_table_destroy(table); /* Also destroys 'ts'. */
free(rows);
}
ovsdb_trigger_run(db, now);
- while (!list_is_empty(&session.completions)) {
- do_trigger_dump(CONTAINER_OF(list_pop_front(&session.completions),
+ while (!ovs_list_is_empty(&session.completions)) {
+ do_trigger_dump(CONTAINER_OF(ovs_list_pop_front(&session.completions),
struct test_trigger, trigger.node),
now, "delayed");
}
ovsdb_idl_txn_destroy(txn);
}
+static const struct ovsdb_idl_table_class *
+find_table_class(const char *name)
+{
+ if (!strcmp(name, "simple")) {
+ return &idltest_table_simple;
+ } else if (!strcmp(name, "link1")) {
+ return &idltest_table_link1;
+ } else if (!strcmp(name, "link2")) {
+ return &idltest_table_link2;
+ }
+ return NULL;
+}
+
+static void
+parse_simple_json_clause(struct ovsdb_idl *idl, bool add_cmd,
+ struct json *json)
+{
+ const char *c;
+ struct ovsdb_error *error;
+ enum ovsdb_function function;
+
+ if (json->type == JSON_TRUE) {
+ add_cmd ? idltest_simple_add_clause_true(idl) :
+ idltest_simple_remove_clause_true(idl);
+ return;
+ } else if (json->type == JSON_FALSE) {
+ add_cmd ? idltest_simple_add_clause_false(idl) :
+ idltest_simple_remove_clause_false(idl);
+ return;
+ }
+ if (json->type != JSON_ARRAY || json->u.array.n != 3) {
+ ovs_fatal(0, "Error parsing condition");
+ }
+
+ c = json_string(json->u.array.elems[0]);
+ error = ovsdb_function_from_string(json_string(json->u.array.elems[1]),
+ &function);
+ if (error) {
+ ovs_fatal(0, "Error parsing clause function %s",
+ json_string(json->u.array.elems[1]));
+ }
+
+ /* add clause according to column */
+ if (!strcmp(c, "b")) {
+ add_cmd ? idltest_simple_add_clause_b(idl, function,
+ json_boolean(json->u.array.elems[2])) :
+ idltest_simple_remove_clause_b(idl, function,
+ json_boolean(json->u.array.elems[2]));
+ } else if (!strcmp(c, "i")) {
+ add_cmd ? idltest_simple_add_clause_i(idl, function,
+ json_integer(json->u.array.elems[2])) :
+ idltest_simple_remove_clause_i(idl, function,
+ json_integer(json->u.array.elems[2]));
+ } else if (!strcmp(c, "s")) {
+ add_cmd ? idltest_simple_add_clause_s(idl, function,
+ json_string(json->u.array.elems[2])) :
+ idltest_simple_remove_clause_s(idl, function,
+ json_string(json->u.array.elems[2]));
+ } else if (!strcmp(c, "u")) {
+ struct uuid uuid;
+ if (!uuid_from_string(&uuid,
+ json_string(json->u.array.elems[2]))) {
+ ovs_fatal(0, "\"%s\" is not a valid UUID",
+ json_string(json->u.array.elems[2]));
+ }
+ add_cmd ? idltest_simple_add_clause_u(idl, function, uuid) :
+ idltest_simple_remove_clause_u(idl, function, uuid);
+ } else if (!strcmp(c, "r")) {
+ add_cmd ? idltest_simple_add_clause_r(idl, function,
+ json_real(json->u.array.elems[2])) :
+ idltest_simple_remove_clause_r(idl, function,
+ json_real(json->u.array.elems[2]));
+ } else {
+ ovs_fatal(0, "Unsupported columns name %s", c);
+ }
+}
+
+static void
+parse_link1_json_clause(struct ovsdb_idl *idl, bool add_cmd,
+ struct json *json)
+{
+ const char *c;
+ struct ovsdb_error *error;
+ enum ovsdb_function function;
+
+ if (json->type == JSON_TRUE) {
+ add_cmd ? idltest_link1_add_clause_true(idl) :
+ idltest_link1_remove_clause_true(idl);
+ return;
+ } else if (json->type == JSON_FALSE) {
+ add_cmd ? idltest_link1_add_clause_false(idl) :
+ idltest_link1_remove_clause_false(idl);
+ return;
+ }
+ if (json->type != JSON_ARRAY || json->u.array.n != 3) {
+ ovs_fatal(0, "Error parsing condition");
+ }
+
+ c = json_string(json->u.array.elems[0]);
+ error = ovsdb_function_from_string(json_string(json->u.array.elems[1]),
+ &function);
+ if (error) {
+ ovs_fatal(0, "Error parsing clause function %s",
+ json_string(json->u.array.elems[1]));
+ }
+
+ /* add clause according to column */
+ if (!strcmp(c, "i")) {
+ add_cmd ? idltest_link1_add_clause_i(idl, function,
+ json_integer(json->u.array.elems[2])) :
+ idltest_link1_remove_clause_i(idl, function,
+ json_integer(json->u.array.elems[2]));
+ } else {
+ ovs_fatal(0, "Unsupported columns name %s", c);
+ }
+}
+
+static void
+parse_link2_json_clause(struct ovsdb_idl *idl, bool add_cmd, struct json *json)
+{
+ const char *c;
+ struct ovsdb_error *error;
+ enum ovsdb_function function;
+
+ if (json->type == JSON_TRUE) {
+ add_cmd ? idltest_link2_add_clause_true(idl) :
+ idltest_link2_remove_clause_true(idl);
+ return;
+ } else if (json->type == JSON_FALSE) {
+ add_cmd ? idltest_link2_add_clause_false(idl) :
+ idltest_link2_remove_clause_false(idl);
+ return;
+ }
+ if (json->type != JSON_ARRAY || json->u.array.n != 3) {
+ ovs_fatal(0, "Error parsing condition");
+ }
+
+ c = json_string(json->u.array.elems[0]);
+ error = ovsdb_function_from_string(json_string(json->u.array.elems[1]),
+ &function);
+ if (error) {
+ ovs_fatal(0, "Error parsing clause function %s",
+ json_string(json->u.array.elems[1]));
+ }
+
+ /* add clause according to column */
+ if (!strcmp(c, "i")) {
+ add_cmd ? idltest_link2_add_clause_i(idl, function,
+ json_integer(json->u.array.elems[2])) :
+ idltest_link2_remove_clause_i(idl, function,
+ json_integer(json->u.array.elems[2]));
+ } else {
+ ovs_fatal(0, "Unsupported columns name %s", c);
+ }
+}
+
+static void
+update_conditions(struct ovsdb_idl *idl, char *commands)
+{
+ char *cmd, *save_ptr1 = NULL;
+ const struct ovsdb_idl_table_class *tc;
+ bool add_cmd = false;
+
+ for (cmd = strtok_r(commands, ";", &save_ptr1); cmd;
+ cmd = strtok_r(NULL, ";", &save_ptr1)) {
+ if (strstr(cmd, "condition add")) {
+ cmd += strlen("condition add ");
+ add_cmd = true;
+ } else if (strstr(cmd, "condition remove")) {
+ cmd += strlen("condition remove ");
+ } else {
+ ovs_fatal(0, "condition command should be add or remove");
+ }
+
+ char *save_ptr2 = NULL;
+ char *table_name = strtok_r(cmd, " ", &save_ptr2);
+ struct json *json = parse_json(save_ptr2);
+ int i;
+
+ if (json->type != JSON_ARRAY) {
+ ovs_fatal(0, "condition should be an array");
+ }
+
+ tc = find_table_class(table_name);
+ if (!tc) {
+ ovs_fatal(0, "Table %s does not exist", table_name);
+ }
+
+ //ovsdb_idl_condition_reset(idl, tc);
+
+ for (i = 0; i < json->u.array.n; i++) {
+ if (!strcmp(table_name, "simple")) {
+ parse_simple_json_clause(idl, add_cmd, json->u.array.elems[i]);
+ } else if (!strcmp(table_name, "link1")) {
+ parse_link1_json_clause(idl, add_cmd, json->u.array.elems[i]);
+ } else if (!strcmp(table_name, "link2")) {
+ parse_link2_json_clause(idl, add_cmd, json->u.array.elems[i]);
+ }
+ }
+ }
+}
+
static void
do_idl(struct ovs_cmdl_context *ctx)
{
setvbuf(stdout, NULL, _IONBF, 0);
symtab = ovsdb_symbol_table_create();
- for (i = 2; i < ctx->argc; i++) {
+ if (ctx->argc > 2 && strstr(ctx->argv[2], "condition ")) {
+ update_conditions(idl, ctx->argv[2]);
+ printf("%03d: change conditions\n", step++);
+ i = 3;
+ } else {
+ i = 2;
+ }
+ for (; i < ctx->argc; i++) {
char *arg = ctx->argv[i];
struct jsonrpc_msg *request, *reply;
if (!strcmp(arg, "reconnect")) {
printf("%03d: reconnect\n", step++);
ovsdb_idl_force_reconnect(idl);
+ } else if (strstr(arg, "condition ")) {
+ update_conditions(idl, arg);
+ printf("%03d: change conditions\n", step++);
} else if (arg[0] != '[') {
idl_set(idl, arg, step++);
} else {
printf("%03d: done\n", step);
}
+static void
+print_idl_row_simple2(const struct idltest_simple2 *s, int step)
+{
+ size_t i;
+ const struct ovsdb_datum *smap, *imap;
+
+ smap = idltest_simple2_get_smap(s, OVSDB_TYPE_STRING, OVSDB_TYPE_STRING);
+ imap = idltest_simple2_get_imap(s, OVSDB_TYPE_INTEGER, OVSDB_TYPE_STRING);
+ printf("%03d: name=%s smap=[",
+ step, s->name);
+ for (i = 0; i < smap->n; i++) {
+ printf("[%s : %s]%s", smap->keys[i].string, smap->values[i].string,
+ i < smap->n-1? ",": "");
+ }
+ printf("] imap=[");
+ for (i = 0; i < imap->n; i++) {
+ printf("[%"PRId64" : %s]%s", imap->keys[i].integer, imap->values[i].string,
+ i < imap->n-1? ",":"");
+ }
+ printf("]\n");
+}
+
+static void
+dump_simple2(struct ovsdb_idl *idl,
+ const struct idltest_simple2 *myRow,
+ int step)
+{
+ IDLTEST_SIMPLE2_FOR_EACH(myRow, idl) {
+ print_idl_row_simple2(myRow, step);
+ }
+}
+
+
+static void
+do_idl_partial_update_map_column(struct ovs_cmdl_context *ctx)
+{
+ struct ovsdb_idl *idl;
+ struct ovsdb_idl_txn *myTxn;
+ const struct idltest_simple2 *myRow;
+ const struct ovsdb_datum *smap, *imap OVS_UNUSED;
+ int step = 0;
+ char key_to_delete[100];
+
+ idltest_init();
+ idl = ovsdb_idl_create(ctx->argv[1], &idltest_idl_class, false, true);
+ ovsdb_idl_add_table(idl, &idltest_table_simple2);
+ ovsdb_idl_add_column(idl, &idltest_simple2_col_name);
+ ovsdb_idl_add_column(idl, &idltest_simple2_col_smap);
+ ovsdb_idl_add_column(idl, &idltest_simple2_col_imap);
+ ovsdb_idl_get_initial_snapshot(idl);
+ setvbuf(stdout, NULL, _IONBF, 0);
+ ovsdb_idl_run(idl);
+
+ /* Display original data in table */
+ myRow = NULL;
+ printf("%03d: Getting records\n", step++);
+ dump_simple2(idl, myRow, step++);
+
+ /* Insert new elements in different map columns */
+ myRow = idltest_simple2_first(idl);
+ myTxn = ovsdb_idl_txn_create(idl);
+ idltest_simple2_get_smap(myRow, OVSDB_TYPE_STRING,
+ OVSDB_TYPE_STRING);
+ idltest_simple2_update_smap_setkey(myRow, "key1", "myList1");
+ imap = idltest_simple2_get_imap(myRow, OVSDB_TYPE_INTEGER,
+ OVSDB_TYPE_STRING);
+ idltest_simple2_update_imap_setkey(myRow, 3, "myids2");
+ idltest_simple2_set_name(myRow, "String2");
+ ovsdb_idl_txn_commit_block(myTxn);
+ ovsdb_idl_txn_destroy(myTxn);
+ ovsdb_idl_get_initial_snapshot(idl);
+ printf("%03d: After insert element\n", step++);
+ dump_simple2(idl, myRow, step++);
+
+ /* Insert duplicate element */
+ myTxn = ovsdb_idl_txn_create(idl);
+ idltest_simple2_update_smap_setkey(myRow, "key1", "myList1");
+ ovsdb_idl_txn_commit_block(myTxn);
+ ovsdb_idl_txn_destroy(myTxn);
+ ovsdb_idl_get_initial_snapshot(idl);
+ printf("%03d: After insert duplicated element\n", step++);
+ dump_simple2(idl, myRow, step++);
+
+ /* deletes an element of a map column */
+ myRow = idltest_simple2_first(idl);
+ myTxn = ovsdb_idl_txn_create(idl);
+ smap = idltest_simple2_get_smap(myRow, OVSDB_TYPE_STRING,
+ OVSDB_TYPE_STRING);
+ strcpy(key_to_delete, smap->keys[0].string);
+ idltest_simple2_update_smap_delkey(myRow, smap->keys[0].string);
+ ovsdb_idl_txn_commit_block(myTxn);
+ ovsdb_idl_txn_destroy(myTxn);
+ ovsdb_idl_get_initial_snapshot(idl);
+ printf("%03d: After delete element\n", step++);
+ dump_simple2(idl, myRow, step++);
+
+ /* try to delete a deleted element of a map column */
+ myTxn = ovsdb_idl_txn_create(idl);
+ idltest_simple2_update_smap_delkey(myRow, key_to_delete);
+ ovsdb_idl_txn_commit_block(myTxn);
+ ovsdb_idl_txn_destroy(myTxn);
+ ovsdb_idl_get_initial_snapshot(idl);
+ printf("%03d: After trying to delete a deleted element\n", step++);
+ dump_simple2(idl, myRow, step++);
+
+ printf("%03d: End test\n", step);
+ return;
+}
+
static struct ovs_cmdl_command all_commands[] = {
{ "log-io", NULL, 2, INT_MAX, do_log_io },
{ "default-atoms", NULL, 0, 0, do_default_atoms },
{ "compare-rows", NULL, 2, INT_MAX, do_compare_rows },
{ "parse-conditions", NULL, 2, INT_MAX, do_parse_conditions },
{ "evaluate-conditions", NULL, 3, 3, do_evaluate_conditions },
+ { "evaluate-conditions-any", NULL, 3, 3, do_evaluate_conditions_any },
+ { "compare-conditions", NULL, 2, 2, do_compare_conditions },
{ "parse-mutations", NULL, 2, INT_MAX, do_parse_mutations },
{ "execute-mutations", NULL, 3, 3, do_execute_mutations },
{ "query", NULL, 3, 3, do_query },
{ "execute", NULL, 2, INT_MAX, do_execute },
{ "trigger", NULL, 2, INT_MAX, do_trigger },
{ "idl", NULL, 1, INT_MAX, do_idl },
+ { "idl-partial-update-map-column", NULL, 1, INT_MAX,
+ do_idl_partial_update_map_column },
{ "help", NULL, 0, INT_MAX, do_help },
{ NULL, NULL, 0, 0, NULL },
};
projects / cascardo / ovs.git / blobdiff