/*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2015 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "util.h"
#include "openvswitch/vlog.h"
+struct test_ovsdb_pvt_context {
+ bool track;
+};
+
OVS_NO_RETURN static void usage(void);
-static void parse_options(int argc, char *argv[]);
+static void parse_options(int argc, char *argv[],
+ struct test_ovsdb_pvt_context *pvt);
static struct ovs_cmdl_command *get_all_commands(void);
int
main(int argc, char *argv[])
{
- struct ovs_cmdl_context ctx = { .argc = 0, };
+ struct test_ovsdb_pvt_context pvt = {.track = false};
+ struct ovs_cmdl_context ctx = { .argc = 0, .pvt = &pvt};
set_program_name(argv[0]);
- parse_options(argc, argv);
+ parse_options(argc, argv, &pvt);
ctx.argc = argc - optind;
ctx.argv = argv + optind;
ovs_cmdl_run_command(&ctx, get_all_commands());
}
static void
-parse_options(int argc, char *argv[])
+parse_options(int argc, char *argv[], struct test_ovsdb_pvt_context *pvt)
{
static const struct option long_options[] = {
{"timeout", required_argument, NULL, 't'},
{"verbose", optional_argument, NULL, 'v'},
+ {"change-track", optional_argument, NULL, 'c'},
{"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, 0},
};
vlog_set_verbosity(optarg);
break;
+ case 'c':
+ pvt->track = true;
+ break;
+
case '?':
exit(EXIT_FAILURE);
vlog_usage();
printf("\nOther options:\n"
" -t, --timeout=SECS give up after SECS seconds\n"
- " -h, --help display this help message\n");
+ " -h, --help display this help message\n"
+ " -c, --change-track used with the 'idl' command to\n"
+ " enable tracking of IDL changes\n");
exit(EXIT_SUCCESS);
}
\f
}
}
+static void
+do_diff_data(struct ovs_cmdl_context *ctx)
+{
+ struct ovsdb_type type;
+ struct json *json;
+ struct ovsdb_datum new, old, diff, reincarnation;
+
+ json = unbox_json(parse_json(ctx->argv[1]));
+ check_ovsdb_error(ovsdb_type_from_json(&type, json));
+ json_destroy(json);
+
+ /* Arguments in pairs of 'old' and 'new'. */
+ for (int i = 2; i < ctx->argc - 1; i+=2) {
+ struct ovsdb_error *error;
+
+ json = unbox_json(parse_json(ctx->argv[i]));
+ check_ovsdb_error(ovsdb_datum_from_json(&old, &type, json, NULL));
+ json_destroy(json);
+
+ json = unbox_json(parse_json(ctx->argv[i+1]));
+ check_ovsdb_error(ovsdb_transient_datum_from_json(&new, &type, json));
+ json_destroy(json);
+
+ /* Generate the diff. */
+ ovsdb_datum_diff(&diff, &old, &new, &type);
+
+ /* Apply diff to 'old' to create'reincarnation'. */
+ error = ovsdb_datum_apply_diff(&reincarnation, &old, &diff, &type);
+ if (error) {
+ char *string = ovsdb_error_to_string(error);
+ ovsdb_error_destroy(error);
+ ovs_fatal(0, "%s", string);
+ }
+
+ /* Test to make sure 'new' equals 'reincarnation'. */
+ if (!ovsdb_datum_equals(&new, &reincarnation, &type)) {
+ ovs_fatal(0, "failed to apply diff");
+ }
+
+ /* Print diff */
+ json = ovsdb_datum_to_json(&diff, &type);
+ printf ("diff: ");
+ print_and_free_json(json);
+
+ /* Print reincarnation */
+ json = ovsdb_datum_to_json(&reincarnation, &type);
+ printf ("apply diff: ");
+ print_and_free_json(json);
+
+ ovsdb_datum_destroy(&new, &type);
+ ovsdb_datum_destroy(&old, &type);
+ ovsdb_datum_destroy(&diff, &type);
+ ovsdb_datum_destroy(&reincarnation, &type);
+
+ printf("OK\n");
+ }
+
+ ovsdb_type_destroy(&type);
+}
+
static void
do_parse_atomic_type(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);
+ free(classes);
exit(exit_code);
}
return a->i < b->i ? -1 : a->i > b->i;
}
+static void
+print_idl_row_updated_simple(const struct idltest_simple *s, int step)
+{
+ size_t i;
+ bool updated = false;
+
+ for (i = 0; i < IDLTEST_SIMPLE_N_COLUMNS; i++) {
+ if (idltest_simple_is_updated(s, i)) {
+ if (!updated) {
+ printf("%03d: updated columns:", step);
+ updated = true;
+ }
+ printf(" %s", idltest_simple_columns[i].name);
+ }
+ }
+ if (updated) {
+ printf("\n");
+ }
+}
+
+static void
+print_idl_row_updated_link1(const struct idltest_link1 *l1, int step)
+{
+ size_t i;
+ bool updated = false;
+
+ for (i = 0; i < IDLTEST_LINK1_N_COLUMNS; i++) {
+ if (idltest_link1_is_updated(l1, i)) {
+ if (!updated) {
+ printf("%03d: updated columns:", step);
+ updated = true;
+ }
+ printf(" %s", idltest_link1_columns[i].name);
+ }
+ }
+ if (updated) {
+ printf("\n");
+ }
+}
+
+static void
+print_idl_row_updated_link2(const struct idltest_link2 *l2, int step)
+{
+ size_t i;
+ bool updated = false;
+
+ for (i = 0; i < IDLTEST_LINK2_N_COLUMNS; i++) {
+ if (idltest_link2_is_updated(l2, i)) {
+ if (!updated) {
+ printf("%03d: updated columns:", step);
+ updated = true;
+ }
+ printf(" %s", idltest_link2_columns[i].name);
+ }
+ }
+ if (updated) {
+ printf("\n");
+ }
+}
+
+static void
+print_idl_row_simple(const struct idltest_simple *s, int step)
+{
+ size_t i;
+
+ printf("%03d: i=%"PRId64" r=%g b=%s s=%s u="UUID_FMT" ia=[",
+ step, s->i, s->r, s->b ? "true" : "false",
+ s->s, UUID_ARGS(&s->u));
+ for (i = 0; i < s->n_ia; i++) {
+ printf("%s%"PRId64, i ? " " : "", s->ia[i]);
+ }
+ printf("] ra=[");
+ for (i = 0; i < s->n_ra; i++) {
+ printf("%s%g", i ? " " : "", s->ra[i]);
+ }
+ printf("] ba=[");
+ for (i = 0; i < s->n_ba; i++) {
+ printf("%s%s", i ? " " : "", s->ba[i] ? "true" : "false");
+ }
+ printf("] sa=[");
+ for (i = 0; i < s->n_sa; i++) {
+ printf("%s%s", i ? " " : "", s->sa[i]);
+ }
+ printf("] ua=[");
+ for (i = 0; i < s->n_ua; i++) {
+ printf("%s"UUID_FMT, i ? " " : "", UUID_ARGS(&s->ua[i]));
+ }
+ printf("] uuid="UUID_FMT"\n", UUID_ARGS(&s->header_.uuid));
+ print_idl_row_updated_simple(s, step);
+}
+
+static void
+print_idl_row_link1(const struct idltest_link1 *l1, int step)
+{
+ struct idltest_link1 **links;
+ size_t i;
+
+ printf("%03d: i=%"PRId64" k=", step, l1->i);
+ if (l1->k) {
+ printf("%"PRId64, l1->k->i);
+ }
+ printf(" ka=[");
+ links = xmemdup(l1->ka, l1->n_ka * sizeof *l1->ka);
+ qsort(links, l1->n_ka, sizeof *links, compare_link1);
+ for (i = 0; i < l1->n_ka; i++) {
+ printf("%s%"PRId64, i ? " " : "", links[i]->i);
+ }
+ free(links);
+ printf("] l2=");
+ if (l1->l2) {
+ printf("%"PRId64, l1->l2->i);
+ }
+ printf(" uuid="UUID_FMT"\n", UUID_ARGS(&l1->header_.uuid));
+ print_idl_row_updated_link1(l1, step);
+}
+
+static void
+print_idl_row_link2(const struct idltest_link2 *l2, int step)
+{
+ printf("%03d: i=%"PRId64" l1=", step, l2->i);
+ if (l2->l1) {
+ printf("%"PRId64, l2->l1->i);
+ }
+ printf(" uuid="UUID_FMT"\n", UUID_ARGS(&l2->header_.uuid));
+ print_idl_row_updated_link2(l2, step);
+}
+
static void
print_idl(struct ovsdb_idl *idl, int step)
{
int n = 0;
IDLTEST_SIMPLE_FOR_EACH (s, idl) {
- size_t i;
-
- printf("%03d: i=%"PRId64" r=%g b=%s s=%s u="UUID_FMT" ia=[",
- step, s->i, s->r, s->b ? "true" : "false",
- s->s, UUID_ARGS(&s->u));
- for (i = 0; i < s->n_ia; i++) {
- printf("%s%"PRId64, i ? " " : "", s->ia[i]);
- }
- printf("] ra=[");
- for (i = 0; i < s->n_ra; i++) {
- printf("%s%g", i ? " " : "", s->ra[i]);
- }
- printf("] ba=[");
- for (i = 0; i < s->n_ba; i++) {
- printf("%s%s", i ? " " : "", s->ba[i] ? "true" : "false");
- }
- printf("] sa=[");
- for (i = 0; i < s->n_sa; i++) {
- printf("%s%s", i ? " " : "", s->sa[i]);
- }
- printf("] ua=[");
- for (i = 0; i < s->n_ua; i++) {
- printf("%s"UUID_FMT, i ? " " : "", UUID_ARGS(&s->ua[i]));
- }
- printf("] uuid="UUID_FMT"\n", UUID_ARGS(&s->header_.uuid));
+ print_idl_row_simple(s, step);
n++;
}
IDLTEST_LINK1_FOR_EACH (l1, idl) {
- struct idltest_link1 **links;
- size_t i;
+ print_idl_row_link1(l1, step);
+ n++;
+ }
+ IDLTEST_LINK2_FOR_EACH (l2, idl) {
+ print_idl_row_link2(l2, step);
+ n++;
+ }
+ if (!n) {
+ printf("%03d: empty\n", step);
+ }
+}
- printf("%03d: i=%"PRId64" k=", step, l1->i);
- if (l1->k) {
- printf("%"PRId64, l1->k->i);
- }
- printf(" ka=[");
- links = xmemdup(l1->ka, l1->n_ka * sizeof *l1->ka);
- qsort(links, l1->n_ka, sizeof *links, compare_link1);
- for (i = 0; i < l1->n_ka; i++) {
- printf("%s%"PRId64, i ? " " : "", links[i]->i);
+static void
+print_idl_track(struct ovsdb_idl *idl, int step, unsigned int seqno)
+{
+ const struct idltest_simple *s;
+ const struct idltest_link1 *l1;
+ const struct idltest_link2 *l2;
+ int n = 0;
+
+ IDLTEST_SIMPLE_FOR_EACH_TRACKED (s, idl) {
+ if (idltest_simple_row_get_seqno(s, OVSDB_IDL_CHANGE_DELETE) >= seqno) {
+ printf("%03d: ##deleted## uuid="UUID_FMT"\n", step, UUID_ARGS(&s->header_.uuid));
+ } else {
+ print_idl_row_simple(s, step);
}
- free(links);
- printf("] l2=");
- if (l1->l2) {
- printf("%"PRId64, l1->l2->i);
+ n++;
+ }
+ IDLTEST_LINK1_FOR_EACH_TRACKED (l1, idl) {
+ if (idltest_simple_row_get_seqno(s, OVSDB_IDL_CHANGE_DELETE) >= seqno) {
+ printf("%03d: ##deleted## uuid="UUID_FMT"\n", step, UUID_ARGS(&s->header_.uuid));
+ } else {
+ print_idl_row_link1(l1, step);
}
- printf(" uuid="UUID_FMT"\n", UUID_ARGS(&l1->header_.uuid));
n++;
}
- IDLTEST_LINK2_FOR_EACH (l2, idl) {
- printf("%03d: i=%"PRId64" l1=", step, l2->i);
- if (l2->l1) {
- printf("%"PRId64, l2->l1->i);
+ IDLTEST_LINK2_FOR_EACH_TRACKED (l2, idl) {
+ if (idltest_simple_row_get_seqno(s, OVSDB_IDL_CHANGE_DELETE) >= seqno) {
+ printf("%03d: ##deleted## uuid="UUID_FMT"\n", step, UUID_ARGS(&s->header_.uuid));
+ } else {
+ print_idl_row_link2(l2, step);
}
- printf(" uuid="UUID_FMT"\n", UUID_ARGS(&l2->header_.uuid));
n++;
}
if (!n) {
int step = 0;
int error;
int i;
+ bool track;
idltest_init();
+ track = ((struct test_ovsdb_pvt_context *)(ctx->pvt))->track;
+
idl = ovsdb_idl_create(ctx->argv[1], &idltest_idl_class, true, true);
if (ctx->argc > 2) {
struct stream *stream;
rpc = NULL;
}
+ if (track) {
+ ovsdb_idl_track_add_all(idl);
+ }
+
setvbuf(stdout, NULL, _IONBF, 0);
symtab = ovsdb_symbol_table_create();
}
/* Print update. */
- print_idl(idl, step++);
+ if (track) {
+ print_idl_track(idl, step++, ovsdb_idl_get_seqno(idl));
+ ovsdb_idl_track_clear(idl);
+ } else {
+ print_idl(idl, step++);
+ }
}
seqno = ovsdb_idl_get_seqno(idl);
poll_block();
}
print_idl(idl, step++);
+ ovsdb_idl_track_clear(idl);
ovsdb_idl_destroy(idl);
printf("%03d: done\n", step);
}
{ "log-io", NULL, 2, INT_MAX, do_log_io },
{ "default-atoms", NULL, 0, 0, do_default_atoms },
{ "default-data", NULL, 0, 0, do_default_data },
+ { "diff-data", NULL, 3, INT_MAX, do_diff_data},
{ "parse-atomic-type", NULL, 1, 1, do_parse_atomic_type },
{ "parse-base-type", NULL, 1, 1, do_parse_base_type },
{ "parse-type", NULL, 1, 1, do_parse_type },
projects / cascardo / ovs.git / blobdiff