diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 61e139d..ca2fd7e 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -315,6 +315,303 @@ index ff8adaefb5..6f9f912ac4 100644 cs->txns[i] = cs->txns[--cs->n_txns]; return true; } +diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c +index 2c8a0c9cfe..1d385ca2fe 100644 +--- a/lib/ovsdb-idl.c ++++ b/lib/ovsdb-idl.c +@@ -92,6 +92,9 @@ struct ovsdb_idl { + struct ovsdb_idl_txn *txn; + struct hmap outstanding_txns; + bool verify_write_only; ++ struct ovs_list deleted_untracked_rows; /* Stores rows deleted in the ++ * current run, that are not yet ++ * added to the track_list. */ + }; + + static struct ovsdb_cs_ops ovsdb_idl_cs_ops; +@@ -144,6 +147,7 @@ static bool ovsdb_idl_modify_row(struct ovsdb_idl_row *, + const struct shash *values, bool xor); + static void ovsdb_idl_parse_update(struct ovsdb_idl *, + const struct ovsdb_cs_update_event *); ++static void ovsdb_idl_reparse_deleted(struct ovsdb_idl *); + + static void ovsdb_idl_txn_process_reply(struct ovsdb_idl *, + const struct jsonrpc_msg *); +@@ -163,6 +167,10 @@ static void ovsdb_idl_row_unparse(struct ovsdb_idl_row *); + static void ovsdb_idl_row_clear_old(struct ovsdb_idl_row *); + static void ovsdb_idl_row_clear_new(struct ovsdb_idl_row *); + static void ovsdb_idl_row_clear_arcs(struct ovsdb_idl_row *, bool destroy_dsts); ++static void ovsdb_idl_row_reparse_backrefs(struct ovsdb_idl_row *); ++static void ovsdb_idl_row_track_change(struct ovsdb_idl_row *, ++ enum ovsdb_idl_change); ++static void ovsdb_idl_row_untrack_change(struct ovsdb_idl_row *); + + static void ovsdb_idl_txn_abort_all(struct ovsdb_idl *); + static bool ovsdb_idl_txn_extract_mutations(struct ovsdb_idl_row *, +@@ -182,7 +190,6 @@ ovsdb_idl_table_from_class(const struct ovsdb_idl *, + static struct ovsdb_idl_table * + ovsdb_idl_table_from_class(const struct ovsdb_idl *, + const struct ovsdb_idl_table_class *); +-static bool ovsdb_idl_track_is_set(struct ovsdb_idl_table *table); + static void ovsdb_idl_track_clear__(struct ovsdb_idl *, bool flush_all); + + static void ovsdb_idl_destroy_indexes(struct ovsdb_idl_table *); +@@ -191,6 +198,8 @@ static void ovsdb_idl_remove_from_indexes(const struct ovsdb_idl_row *); + static int ovsdb_idl_try_commit_loop_txn(struct ovsdb_idl_loop *loop, + bool *may_need_wakeup); + ++static void add_tracked_change_for_references(struct ovsdb_idl_row *); ++ + /* Creates and returns a connection to database 'remote', which should be in a + * form acceptable to jsonrpc_session_open(). The connection will maintain an + * in-memory replica of the remote database whose schema is described by +@@ -249,6 +258,8 @@ ovsdb_idl_create_unconnected(const struct ovsdb_idl_class *class, + .txn = NULL, + .outstanding_txns = HMAP_INITIALIZER(&idl->outstanding_txns), + .verify_write_only = false, ++ .deleted_untracked_rows ++ = OVS_LIST_INITIALIZER(&idl->deleted_untracked_rows), + }; + + uint8_t default_mode = (monitor_everything_by_default +@@ -352,6 +363,14 @@ ovsdb_idl_set_leader_only(struct ovsdb_idl *idl, bool leader_only) + static void + ovsdb_idl_clear(struct ovsdb_idl *db) + { ++ /* Process deleted rows, removing them from the 'deleted_untracked_rows' ++ * list and reparsing their backrefs. ++ */ ++ ovsdb_idl_reparse_deleted(db); ++ ++ /* Cleanup all rows; each row gets added to its own table's ++ * 'track_list'. ++ */ + for (size_t i = 0; i < db->class_->n_tables; i++) { + struct ovsdb_idl_table *table = &db->tables[i]; + struct ovsdb_idl_row *row, *next_row; +@@ -368,17 +387,26 @@ ovsdb_idl_clear(struct ovsdb_idl *db) + ovsdb_idl_row_unparse(row); + } + LIST_FOR_EACH_SAFE (arc, next_arc, src_node, &row->src_arcs) { ++ ovs_list_remove(&arc->src_node); ++ ovs_list_remove(&arc->dst_node); ++ free(arc); ++ } ++ LIST_FOR_EACH_SAFE (arc, next_arc, dst_node, &row->dst_arcs) { ++ ovs_list_remove(&arc->src_node); ++ ovs_list_remove(&arc->dst_node); + free(arc); + } +- /* No need to do anything with dst_arcs: some node has those arcs +- * as forward arcs and will destroy them itself. */ + + ovsdb_idl_row_destroy(row); + } + } ++ ++ /* Free rows deleted from tables with change tracking disabled. */ + ovsdb_idl_row_destroy_postprocess(db); + ++ /* Free rows deleted from tables with change tracking enabled. */ + ovsdb_idl_track_clear__(db, true); ++ ovs_assert(ovs_list_is_empty(&db->deleted_untracked_rows)); + db->change_seqno++; + } + +@@ -416,7 +444,7 @@ ovsdb_idl_run(struct ovsdb_idl *idl) + } + ovsdb_cs_event_destroy(event); + } +- ++ ovsdb_idl_reparse_deleted(idl); + ovsdb_idl_row_destroy_postprocess(idl); + } + +@@ -1140,7 +1168,7 @@ ovsdb_idl_track_add_all(struct ovsdb_idl *idl) + } + + /* Returns true if 'table' has any tracked column. */ +-static bool ++bool + ovsdb_idl_track_is_set(struct ovsdb_idl_table *table) + { + size_t i; +@@ -1227,13 +1255,8 @@ ovsdb_idl_track_clear__(struct ovsdb_idl *idl, bool flush_all) + free(row->updated); + row->updated = NULL; + } ++ ovsdb_idl_row_untrack_change(row); + +- row->change_seqno[OVSDB_IDL_CHANGE_INSERT] = +- row->change_seqno[OVSDB_IDL_CHANGE_MODIFY] = +- row->change_seqno[OVSDB_IDL_CHANGE_DELETE] = 0; +- +- ovs_list_remove(&row->track_node); +- ovs_list_init(&row->track_node); + if (ovsdb_idl_row_is_orphan(row)) { + ovsdb_idl_row_unparse(row); + if (row->tracked_old_datum) { +@@ -1351,6 +1374,33 @@ ovsdb_idl_parse_update(struct ovsdb_idl *idl, + } + } + ++/* Reparses references to rows that have been deleted in the current IDL run. ++ * ++ * To ensure that reference sources that are deleted are not reparsed, ++ * this function must be called after all updates have been processed in ++ * the current IDL run, i.e., after all calls to ovsdb_idl_parse_update(). ++ */ ++static void ++ovsdb_idl_reparse_deleted(struct ovsdb_idl *db) ++{ ++ struct ovsdb_idl_row *row, *next; ++ ++ LIST_FOR_EACH_SAFE (row, next, track_node, &db->deleted_untracked_rows) { ++ ovsdb_idl_row_untrack_change(row); ++ add_tracked_change_for_references(row); ++ ovsdb_idl_row_reparse_backrefs(row); ++ ++ /* Orphan rows that are still unreferenced or are part of tables that ++ * have change tracking enabled should be added to their table's ++ * 'track_list'. ++ */ ++ if (ovs_list_is_empty(&row->dst_arcs) ++ || ovsdb_idl_track_is_set(row->table)) { ++ ovsdb_idl_row_track_change(row, OVSDB_IDL_CHANGE_DELETE); ++ } ++ } ++} ++ + static struct ovsdb_idl_row * + ovsdb_idl_get_row(struct ovsdb_idl_table *table, const struct uuid *uuid) + { +@@ -1404,6 +1454,7 @@ ovsdb_idl_process_update(struct ovsdb_idl_table *table, + ovsdb_idl_insert_row(ovsdb_idl_row_create(table, uuid), + ru->columns); + } else if (ovsdb_idl_row_is_orphan(row)) { ++ ovsdb_idl_row_untrack_change(row); + ovsdb_idl_insert_row(row, ru->columns); + } else { + VLOG_ERR_RL(&semantic_rl, "cannot add existing row "UUID_FMT" to " +@@ -1451,13 +1502,8 @@ add_tracked_change_for_references(struct ovsdb_idl_row *row) + + if (ovs_list_is_empty(&ref->track_node) && + ovsdb_idl_track_is_set(ref->table)) { +- ovs_list_push_back(&ref->table->track_list, +- &ref->track_node); +- +- ref->change_seqno[OVSDB_IDL_CHANGE_MODIFY] +- = ref->table->change_seqno[OVSDB_IDL_CHANGE_MODIFY] +- = ref->table->idl->change_seqno + 1; + ++ ovsdb_idl_row_track_change(ref, OVSDB_IDL_CHANGE_MODIFY); + add_tracked_change_for_references(ref); + } + } +@@ -2023,6 +2069,32 @@ ovsdb_idl_row_reparse_backrefs(struct ovsdb_idl_row *row) + } + } + ++static void ++ovsdb_idl_row_track_change(struct ovsdb_idl_row *row, ++ enum ovsdb_idl_change change) ++{ ++ row->change_seqno[change] ++ = row->table->change_seqno[change] ++ = row->table->idl->change_seqno + 1; ++ if (ovs_list_is_empty(&row->track_node)) { ++ ovs_list_push_back(&row->table->track_list, &row->track_node); ++ } ++} ++ ++static void ++ovsdb_idl_row_untrack_change(struct ovsdb_idl_row *row) ++{ ++ if (ovs_list_is_empty(&row->track_node)) { ++ return; ++ } ++ ++ row->change_seqno[OVSDB_IDL_CHANGE_INSERT] = ++ row->change_seqno[OVSDB_IDL_CHANGE_MODIFY] = ++ row->change_seqno[OVSDB_IDL_CHANGE_DELETE] = 0; ++ ovs_list_remove(&row->track_node); ++ ovs_list_init(&row->track_node); ++} ++ + static struct ovsdb_idl_row * + ovsdb_idl_row_create__(const struct ovsdb_idl_table_class *class) + { +@@ -2049,22 +2121,26 @@ ovsdb_idl_row_create(struct ovsdb_idl_table *table, const struct uuid *uuid) + return row; + } + ++/* If 'row' is not referenced anymore, removes 'row' from the table hmap, ++ * clears the old datum and adds 'row' to the table's track_list. ++ * ++ * If 'row' is still referenced, i.e., became "orphan", queues 'row' for ++ * reparsing after all updates have been processed by adding it to the ++ * 'deleted_untracked_rows' list. ++ */ + static void + ovsdb_idl_row_destroy(struct ovsdb_idl_row *row) + { +- if (row) { +- ovsdb_idl_row_clear_old(row); ++ ovsdb_idl_row_clear_old(row); ++ if (ovs_list_is_empty(&row->dst_arcs)) { + hmap_remove(&row->table->rows, &row->hmap_node); + ovsdb_idl_destroy_all_map_op_lists(row); + ovsdb_idl_destroy_all_set_op_lists(row); +- if (ovsdb_idl_track_is_set(row->table)) { +- row->change_seqno[OVSDB_IDL_CHANGE_DELETE] +- = row->table->change_seqno[OVSDB_IDL_CHANGE_DELETE] +- = row->table->idl->change_seqno + 1; +- } +- if (ovs_list_is_empty(&row->track_node)) { +- ovs_list_push_back(&row->table->track_list, &row->track_node); +- } ++ ovsdb_idl_row_track_change(row, OVSDB_IDL_CHANGE_DELETE); ++ } else { ++ ovsdb_idl_row_untrack_change(row); ++ ovs_list_push_back(&row->table->idl->deleted_untracked_rows, ++ &row->track_node); + } + } + +@@ -2154,12 +2230,7 @@ ovsdb_idl_delete_row(struct ovsdb_idl_row *row) + { + ovsdb_idl_remove_from_indexes(row); + ovsdb_idl_row_clear_arcs(row, true); +- ovsdb_idl_row_clear_old(row); +- if (ovs_list_is_empty(&row->dst_arcs)) { +- ovsdb_idl_row_destroy(row); +- } else { +- ovsdb_idl_row_reparse_backrefs(row); +- } ++ ovsdb_idl_row_destroy(row); + } + + /* Returns true if a column with mode OVSDB_IDL_MODE_RW changed, false +diff --git a/lib/ovsdb-idl.h b/lib/ovsdb-idl.h +index 05bb48d66c..d93483245e 100644 +--- a/lib/ovsdb-idl.h ++++ b/lib/ovsdb-idl.h +@@ -53,6 +53,7 @@ struct ovsdb_datum; + struct ovsdb_idl_class; + struct ovsdb_idl_row; + struct ovsdb_idl_column; ++struct ovsdb_idl_table; + struct ovsdb_idl_table_class; + struct uuid; + +@@ -217,6 +218,7 @@ unsigned int ovsdb_idl_row_get_seqno( + void ovsdb_idl_track_add_column(struct ovsdb_idl *idl, + const struct ovsdb_idl_column *column); + void ovsdb_idl_track_add_all(struct ovsdb_idl *idl); ++bool ovsdb_idl_track_is_set(struct ovsdb_idl_table *table); + const struct ovsdb_idl_row *ovsdb_idl_track_get_first( + const struct ovsdb_idl *, const struct ovsdb_idl_table_class *); + const struct ovsdb_idl_row *ovsdb_idl_track_get_next(const struct ovsdb_idl_row *); diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 9c5c633b41..fa8f6cd0e8 100644 --- a/ofproto/connmgr.c @@ -798,11 +1095,1013 @@ index 8d777a0275..5e3b26aea8 100644 AT_SETUP([ovsdb-client backup and restore]) AT_KEYWORDS([ovsdb client positive]) +diff --git a/tests/ovsdb-cluster.at b/tests/ovsdb-cluster.at +index 92aa427093..cf43e9cf86 100644 +--- a/tests/ovsdb-cluster.at ++++ b/tests/ovsdb-cluster.at +@@ -128,7 +128,7 @@ ovsdb_test_cluster_disconnect () { + "rows": [{"i": 1}]}]]' > test-ovsdb.log 2>&1 & + echo $! > test-ovsdb.pid + +- OVS_WAIT_UNTIL([grep "000: i=1" test-ovsdb.log]) ++ OVS_WAIT_UNTIL([grep "000: table simple: i=1" test-ovsdb.log]) + + # Start collecting raft_is_connected logs for $target before shutting down + # any servers. diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at -index 4b4791a7da..e00e67e949 100644 +index 4b4791a7da..62181dd4de 100644 --- a/tests/ovsdb-idl.at +++ b/tests/ovsdb-idl.at -@@ -1486,6 +1486,28 @@ m4_define([OVSDB_CHECK_IDL_NOTIFY], +@@ -141,7 +141,7 @@ m4_define([OVSDB_CHECK_IDL_REGISTER_COLUMNS_PY], + AT_CHECK([ovsdb_start_idltest]) + m4_if([$2], [], [], + [AT_CHECK([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore])]) +- AT_CHECK([$PYTHON3 $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name $3], ++ AT_CHECK([$PYTHON3 $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?simple3:name,uset,uref?simple4:name?simple6:name,weak_ref?link1:i,k,ka,l2?link2:i,l1?singleton:name $3], + [0], [stdout], [ignore]) + AT_CHECK([sort stdout | uuidfilt]m4_if([$6],,, [[| $6]]), + [0], [$4]) +@@ -355,28 +355,28 @@ OVSDB_CHECK_IDL([simple idl, initially empty, various ops], + 'reconnect']], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]} +-002: i=0 r=0 b=false s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-002: i=1 r=2 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++002: table simple: i=0 r=0 b=false s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++002: table simple: i=1 r=2 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 003: {"error":null,"result":[{"count":2}]} +-004: i=0 r=0 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-004: i=1 r=2 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++004: table simple: i=0 r=0 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++004: table simple: i=1 r=2 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 005: {"error":null,"result":[{"count":2}]} +-006: i=0 r=123.5 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-006: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++006: table simple: i=0 r=123.5 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++006: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 007: {"error":null,"result":[{"uuid":["uuid","<6>"]}]} +-008: i=-1 r=125 b=false s= u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-008: i=0 r=123.5 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-008: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++008: table simple: i=-1 r=125 b=false s= u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++008: table simple: i=0 r=123.5 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++008: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 009: {"error":null,"result":[{"count":2}]} +-010: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-010: i=0 r=123.5 b=true s=newstring u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-010: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++010: table simple: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++010: table simple: i=0 r=123.5 b=true s=newstring u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++010: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 011: {"error":null,"result":[{"count":1}]} +-012: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-012: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++012: table simple: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++012: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 013: reconnect +-014: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-014: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++014: table simple: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++014: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 015: done + ]]) + +@@ -403,11 +403,11 @@ OVSDB_CHECK_IDL([simple idl, initially populated], + "table": "simple", + "where": [], + "row": {"b": true}}]']], +- [[000: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-000: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<5> ++ [[000: table simple: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++000: table simple: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<5> + 001: {"error":null,"result":[{"count":2}]} +-002: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-002: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<5> ++002: table simple: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++002: table simple: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<5> + 003: done + ]]) + +@@ -431,14 +431,14 @@ OVSDB_CHECK_IDL([simple idl, writing via IDL], + "row": {}}]']], + [['verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \ + 'insert 2, verify 2 i, verify 1 b, delete 1']], +- [[000: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-000: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<5> ++ [[000: table simple: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++000: table simple: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<5> + 001: commit, status=success +-002: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-002: i=1 r=3.5 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<5> ++002: table simple: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++002: table simple: i=1 r=3.5 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<5> + 003: commit, status=success +-004: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-004: i=2 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<6> ++004: table simple: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++004: table simple: i=2 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<6> + 005: done + ]]) + +@@ -448,10 +448,10 @@ OVSDB_CHECK_IDL([simple idl, writing via IDL with unicode], + "table": "simple", + "row": {"s": "(╯°□°）╯︵ ┻━┻"}}]']], + [['set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"']], +- [[000: i=0 r=0 b=false s=(╯°□°）╯︵ ┻━┻ u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++ [[000: table simple: i=0 r=0 b=false s=(╯°□°）╯︵ ┻━┻ u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 001: commit, status=success +-002: i=0 r=0 b=true s=(╯°□°）╯︵ ┻━┻ u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-002: i=1 r=0 b=false s="¯\_(ツ)_/¯" u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++002: table simple: i=0 r=0 b=true s=(╯°□°）╯︵ ┻━┻ u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++002: table simple: i=1 r=0 b=false s="¯\_(ツ)_/¯" u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 003: done + ]]) + +@@ -475,10 +475,10 @@ OVSDB_CHECK_IDL_PY_WITH_EXPOUT([simple idl, writing large data via IDL with unic + "table": "simple", + "row": {"s": "'$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..50})'"}}]']], + [['set 0 b 1, insert 1, set 1 s '$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..100})'']], +- [[000: i=0 r=0 b=false s=$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..50}) u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++ [[000: table simple: i=0 r=0 b=false s=$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..50}) u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 001: commit, status=success +-002: i=0 r=0 b=true s=$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..50}) u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-002: i=1 r=0 b=false s=$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..100}) u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++002: table simple: i=0 r=0 b=true s=$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..50}) u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++002: table simple: i=1 r=0 b=false s=$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..100}) u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 003: done]]) + + OVSDB_CHECK_IDL([simple idl, handling verification failure], +@@ -499,16 +499,16 @@ OVSDB_CHECK_IDL([simple idl, handling verification failure], + '+verify 1 r, set 1 r 3' \ + 'verify 1 r, set 1 r 3' \ + ]], +- [[000: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-000: i=1 r=2 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++ [[000: table simple: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++000: table simple: i=1 r=2 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 001: commit, status=success + 002: {"error":null,"result":[{"count":1}]} + 003: commit, status=try again +-004: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-004: i=1 r=5 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++004: table simple: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++004: table simple: i=1 r=5 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 005: commit, status=success +-006: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-006: i=1 r=3 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++006: table simple: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++006: table simple: i=1 r=3 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 007: done + ]]) + +@@ -518,9 +518,9 @@ OVSDB_CHECK_IDL([simple idl, increment operation], + "table": "simple", + "row": {}}]']], + [['set 0 r 2.0, increment 0']], +- [[000: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++ [[000: table simple: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 001: commit, status=success, increment=1 +-002: i=1 r=2 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++002: table simple: i=1 r=2 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 003: done + ]]) + +@@ -531,10 +531,10 @@ OVSDB_CHECK_IDL([simple idl, aborting], + "row": {}}]']], + [['set 0 r 2.0, abort' \ + '+set 0 b 1']], +- [[000: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++ [[000: table simple: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 001: commit, status=aborted + 002: commit, status=success +-003: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 004: done + ]]) + +@@ -545,10 +545,10 @@ OVSDB_CHECK_IDL([simple idl, destroy without commit or abort], + "row": {}}]']], + [['set 0 r 2.0, destroy' \ + '+set 0 b 1']], +- [[000: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++ [[000: table simple: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 001: destroy + 002: commit, status=success +-003: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=0 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 004: done + ]]) + +@@ -564,7 +564,7 @@ OVSDB_CHECK_IDL([simple idl, conditional, false condition], + [[000: change conditions + 001: empty + 002: change conditions +-003: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 004: done + ]]) + +@@ -580,7 +580,7 @@ OVSDB_CHECK_IDL([simple idl, conditional, true condition], + [[000: change conditions + 001: empty + 002: change conditions +-003: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 004: done + ]]) + +@@ -601,8 +601,8 @@ OVSDB_CHECK_IDL([simple idl, conditional, multiple clauses in condition], + [[000: change conditions + 001: empty + 002: change conditions +-003: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-003: i=2 r=3 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++003: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=2 r=3 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 004: done + ]]) + +@@ -618,7 +618,7 @@ OVSDB_CHECK_IDL([simple idl, conditional, modify as insert due to condition], + [[000: change conditions + 001: empty + 002: change conditions +-003: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 004: done + ]]) + +@@ -641,11 +641,11 @@ OVSDB_CHECK_IDL([simple idl, conditional, modify as delete due to condition], + [[000: change conditions + 001: empty + 002: change conditions +-003: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 004: change conditions + 005: empty + 006: {"error":null,"result":[{"uuid":["uuid","<2>"]}]} +-007: i=2 r=3 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++007: table simple: i=2 r=3 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 008: done + ]]) + +@@ -676,15 +676,15 @@ OVSDB_CHECK_IDL([simple idl, conditional, multiple tables], + [[000: change conditions + 001: empty + 002: change conditions +-003: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 004: change conditions +-005: i=0 k=0 ka=[] l2= uuid=<2> +-005: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++005: table link1: i=0 k=0 ka=[] l2= uuid=<2> ++005: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 006: change conditions + 007: {"error":null,"result":[{"uuid":["uuid","<3>"]}]} +-008: i=0 k=0 ka=[] l2= uuid=<2> +-008: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-008: i=3 l1= uuid=<3> ++008: table link1: i=0 k=0 ka=[] l2= uuid=<2> ++008: table link2: i=3 l1= uuid=<3> ++008: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 009: done + ]]) + +@@ -716,19 +716,19 @@ OVSDB_CHECK_IDL([self-linking idl, consistent ops], + "row": {"k": ["uuid", "#0#"]}}]']], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]}]} +-002: i=0 k=0 ka=[] l2= uuid=<0> ++002: table link1: i=0 k=0 ka=[] l2= uuid=<0> + 003: {"error":null,"result":[{"uuid":["uuid","<1>"]},{"uuid":["uuid","<2>"]}]} +-004: i=0 k=0 ka=[] l2= uuid=<0> +-004: i=1 k=2 ka=[] l2= uuid=<1> +-004: i=2 k=1 ka=[] l2= uuid=<2> ++004: table link1: i=0 k=0 ka=[] l2= uuid=<0> ++004: table link1: i=1 k=2 ka=[] l2= uuid=<1> ++004: table link1: i=2 k=1 ka=[] l2= uuid=<2> + 005: {"error":null,"result":[{"count":1}]} +-006: i=0 k=0 ka=[] l2= uuid=<0> +-006: i=1 k=1 ka=[] l2= uuid=<1> +-006: i=2 k=1 ka=[] l2= uuid=<2> ++006: table link1: i=0 k=0 ka=[] l2= uuid=<0> ++006: table link1: i=1 k=1 ka=[] l2= uuid=<1> ++006: table link1: i=2 k=1 ka=[] l2= uuid=<2> + 007: {"error":null,"result":[{"count":3}]} +-008: i=0 k=0 ka=[] l2= uuid=<0> +-008: i=1 k=0 ka=[] l2= uuid=<1> +-008: i=2 k=0 ka=[] l2= uuid=<2> ++008: table link1: i=0 k=0 ka=[] l2= uuid=<0> ++008: table link1: i=1 k=0 ka=[] l2= uuid=<1> ++008: table link1: i=2 k=0 ka=[] l2= uuid=<2> + 009: done + ]]) + +@@ -767,12 +767,12 @@ OVSDB_CHECK_IDL([self-linking idl, inconsistent ops], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"details":"Table link1 column k row <0> references nonexistent row <1> in table link1.","error":"referential integrity violation"}]} + 002: {"error":null,"result":[{"uuid":["uuid","<2>"]},{"uuid":["uuid","<3>"]}]} +-003: i=1 k=1 ka=[] l2= uuid=<2> +-003: i=2 k=1 ka=[] l2= uuid=<3> ++003: table link1: i=1 k=1 ka=[] l2= uuid=<2> ++003: table link1: i=2 k=1 ka=[] l2= uuid=<3> + 004: {"error":null,"result":[{"count":2},{"details":"Table link1 column k row references nonexistent row <4> in table link1.","error":"referential integrity violation"}]} + 005: {"error":null,"result":[{"count":1},{"details":"cannot delete link1 row <2> because of 1 remaining reference(s)","error":"referential integrity violation"}]} + 006: {"error":null,"result":[{"count":1}]} +-007: i=1 k=1 ka=[] l2= uuid=<2> ++007: table link1: i=1 k=1 ka=[] l2= uuid=<2> + 008: {"error":null,"result":[{"count":1}]} + 009: empty + 010: done +@@ -815,15 +815,15 @@ OVSDB_CHECK_IDL([self-linking idl, sets], + "where": []}]']], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]},{"uuid":["uuid","<2>"]},{"uuid":["uuid","<3>"]}]} +-002: i=0 k=0 ka=[0] l2= uuid=<0> +-002: i=1 k=0 ka=[1] l2= uuid=<1> +-002: i=2 k=0 ka=[2] l2= uuid=<2> +-002: i=3 k=0 ka=[3] l2= uuid=<3> ++002: table link1: i=0 k=0 ka=[0] l2= uuid=<0> ++002: table link1: i=1 k=0 ka=[1] l2= uuid=<1> ++002: table link1: i=2 k=0 ka=[2] l2= uuid=<2> ++002: table link1: i=3 k=0 ka=[3] l2= uuid=<3> + 003: {"error":null,"result":[{"count":4}]} +-004: i=0 k=0 ka=[0 1 2 3] l2= uuid=<0> +-004: i=1 k=0 ka=[0 1 2 3] l2= uuid=<1> +-004: i=2 k=0 ka=[0 1 2 3] l2= uuid=<2> +-004: i=3 k=0 ka=[0 1 2 3] l2= uuid=<3> ++004: table link1: i=0 k=0 ka=[0 1 2 3] l2= uuid=<0> ++004: table link1: i=1 k=0 ka=[0 1 2 3] l2= uuid=<1> ++004: table link1: i=2 k=0 ka=[0 1 2 3] l2= uuid=<2> ++004: table link1: i=3 k=0 ka=[0 1 2 3] l2= uuid=<3> + 005: {"error":null,"result":[{"count":1},{"details":"Table link1 column ka row <2> references nonexistent row <4> in table link1.","error":"referential integrity violation"}]} + 006: {"error":null,"result":[{"count":4}]} + 007: empty +@@ -843,8 +843,8 @@ OVSDB_CHECK_IDL([external-linking idl, consistent ops], + "uuid-name": "row1"}]']], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]} +-002: i=0 l1= uuid=<0> +-002: i=1 k=1 ka=[] l2=0 uuid=<1> ++002: table link1: i=1 k=1 ka=[] l2=0 uuid=<1> ++002: table link2: i=0 l1= uuid=<0> + 003: done + ]]) + +@@ -867,20 +867,49 @@ OVSDB_CHECK_IDL([singleton idl, constraints], + "row": {"name": "bar"}}]']], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]}]} +-002: name=foo uuid=<0> ++002: table singleton: name=foo uuid=<0> + 003: {"error":null,"result":[{"uuid":["uuid","<1>"]},{"details":"transaction causes \"singleton\" table to contain 2 rows, greater than the schema-defined limit of 1 row(s)","error":"constraint violation"}]} + 004: {"error":null,"result":[{"count":1},{"uuid":["uuid","<2>"]}]} +-005: name=bar uuid=<2> ++005: table singleton: name=bar uuid=<2> + 006: done + ]]) + ++dnl This test creates a database with references and checks that deleting both ++dnl source and destination rows of a reference in a single update doesn't leak ++dnl rows that got orphaned when processing the update. ++OVSDB_CHECK_IDL([simple idl, references, multiple deletes], ++ [['["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s"}, ++ "uuid-name": "weak_row0"}, ++ {"op": "insert", ++ "table": "simple6", ++ "row": {"name": "first_row", ++ "weak_ref": ["set", ++ [["named-uuid", "weak_row0"]] ++ ]}}]']], ++ [['["idltest", ++ {"op": "delete", ++ "table": "simple", ++ "where": [["s", "==", "row0_s"]]}, ++ {"op": "delete", ++ "table": "simple6", ++ "where": [["name", "==", "first_row"]]}]']], ++ [[000: table simple6: name=first_row weak_ref=[<0>] uuid=<1> ++000: table simple: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<0> ++001: {"error":null,"result":[{"count":1},{"count":1}]} ++002: empty ++003: done ++]]) ++ + OVSDB_CHECK_IDL_PY([external-linking idl, insert ops], + [], + [['linktest']], + [[000: empty + 001: commit, status=success +-002: i=1 k=1 ka=[1] l2= uuid=<0> +-002: i=2 k=1 ka=[1 2] l2= uuid=<1> ++002: table link1: i=1 k=1 ka=[1] l2= uuid=<0> ++002: table link1: i=2 k=1 ka=[1 2] l2= uuid=<1> + 003: done + ]]) + +@@ -889,7 +918,7 @@ OVSDB_CHECK_IDL_PY([getattr idl, insert ops], + [['getattrtest']], + [[000: empty + 001: commit, status=success +-002: i=2 k=2 ka=[] l2= uuid=<0> ++002: table link1: i=2 k=2 ka=[] l2= uuid=<0> + 003: done + ]]) + +@@ -902,11 +931,11 @@ OVSDB_CHECK_IDL_PY([row-from-json idl, whats this], + "table": "simple", + "row": {}}]']], + [['notifytest insert 2, notifytest set 1 b 1, notifytest delete 0']], +- [[000: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-000: i=1 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++ [[000: table simple: i=0 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++000: table simple: i=1 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 001: commit, status=success, events=create|2|None, delete|0|None, update|1|b +-002: i=1 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> +-002: i=2 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++002: table simple: i=1 r=0 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++002: table simple: i=2 r=0 b=false s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> + 003: done + ]]) + +@@ -946,19 +975,19 @@ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl uni + AT_CHECK([sort stdout | uuidfilt], [0], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]}]} +-002: i=0 k=0 ka=[] l2= uuid=<0> ++002: table link1: i=0 k=0 ka=[] l2= uuid=<0> + 003: {"error":null,"result":[{"uuid":["uuid","<1>"]},{"uuid":["uuid","<2>"]}]} +-004: i=0 k=0 ka=[] l2= uuid=<0> +-004: i=1 k=2 ka=[] l2= uuid=<1> +-004: i=2 k=1 ka=[] l2= uuid=<2> ++004: table link1: i=0 k=0 ka=[] l2= uuid=<0> ++004: table link1: i=1 k=2 ka=[] l2= uuid=<1> ++004: table link1: i=2 k=1 ka=[] l2= uuid=<2> + 005: {"error":null,"result":[{"count":1}]} +-006: i=0 k=0 ka=[] l2= uuid=<0> +-006: i=1 k=1 ka=[] l2= uuid=<1> +-006: i=2 k=1 ka=[] l2= uuid=<2> ++006: table link1: i=0 k=0 ka=[] l2= uuid=<0> ++006: table link1: i=1 k=1 ka=[] l2= uuid=<1> ++006: table link1: i=2 k=1 ka=[] l2= uuid=<2> + 007: {"error":null,"result":[{"count":3}]} +-008: i=0 k=0 ka=[] l2= uuid=<0> +-008: i=1 k=0 ka=[] l2= uuid=<1> +-008: i=2 k=0 ka=[] l2= uuid=<2> ++008: table link1: i=0 k=0 ka=[] l2= uuid=<0> ++008: table link1: i=1 k=0 ka=[] l2= uuid=<1> ++008: table link1: i=2 k=0 ka=[] l2= uuid=<2> + 009: done + ]]) + +@@ -1022,11 +1051,11 @@ OVSDB_CHECK_IDL_FETCH_COLUMNS([simple idl, initially populated], + "row": {}}]']], + [?simple:i,r!], + ['fetch 0 r'], +- [[000: i=0 uuid=<0> +-000: i=1 uuid=<1> ++ [[000: table simple: i=0 uuid=<0> ++000: table simple: i=1 uuid=<1> + 001: commit, status=success +-002: i=0 r=0 uuid=<0> +-002: i=1 uuid=<1> ++002: table simple: i=0 r=0 uuid=<0> ++002: table simple: i=1 uuid=<1> + 003: done + ]]) + +@@ -1098,28 +1127,28 @@ OVSDB_CHECK_IDL_WO_MONITOR_COND([simple idl disable monitor-cond], + 'reconnect']], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]} +-002: i=0 r=0 b=false s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-002: i=1 r=2 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++002: table simple: i=0 r=0 b=false s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++002: table simple: i=1 r=2 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 003: {"error":null,"result":[{"count":2}]} +-004: i=0 r=0 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-004: i=1 r=2 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++004: table simple: i=0 r=0 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++004: table simple: i=1 r=2 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 005: {"error":null,"result":[{"count":2}]} +-006: i=0 r=123.5 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-006: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++006: table simple: i=0 r=123.5 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++006: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 007: {"error":null,"result":[{"uuid":["uuid","<6>"]}]} +-008: i=-1 r=125 b=false s= u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-008: i=0 r=123.5 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-008: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++008: table simple: i=-1 r=125 b=false s= u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++008: table simple: i=0 r=123.5 b=true s= u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++008: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 009: {"error":null,"result":[{"count":2}]} +-010: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-010: i=0 r=123.5 b=true s=newstring u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-010: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++010: table simple: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++010: table simple: i=0 r=123.5 b=true s=newstring u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++010: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 011: {"error":null,"result":[{"count":1}]} +-012: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-012: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++012: table simple: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++012: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 013: reconnect +-014: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-014: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> ++014: table simple: i=-1 r=125 b=false s=newstring u=<2> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++014: table simple: i=1 r=123.5 b=true s=mystring u=<3> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<4> <5>] uuid=<0> + 015: done + ]]) + +@@ -1162,13 +1191,12 @@ OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated], + "table": "simple", + "where": [], + "row": {"b": true}}]']], +- [[000: i=1 r=2 b=true s=mystring u=<0> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<1> <2>] uuid=<3> +-000: inserted row: uuid=<3> +-000: updated columns: b ba i ia r ra s sa u ua ++ [[000: table simple: inserted row: i=1 r=2 b=true s=mystring u=<0> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<1> <2>] uuid=<3> ++000: table simple: updated columns: b ba i ia r ra s sa u ua + 001: {"error":null,"result":[{"count":2}]} +-002: i=0 r=0 b=true s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<5> +-002: i=1 r=2 b=true s=mystring u=<0> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<1> <2>] uuid=<3> +-002: updated columns: b ++002: table simple: i=0 r=0 b=true s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<5> ++002: table simple: i=1 r=2 b=true s=mystring u=<0> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<1> <2>] uuid=<3> ++002: table simple: updated columns: b + 003: done + ]]) + +@@ -1209,19 +1237,17 @@ OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, orphan weak refer + "table": "simple6", + "where": []}]']], + [[000: change conditions +-001: inserted row: uuid=<0> +-001: name=first_row weak_ref=[] uuid=<0> +-001: updated columns: name weak_ref ++001: table simple6: inserted row: name=first_row weak_ref=[] uuid=<0> ++001: table simple6: updated columns: name weak_ref + 002: change conditions +-003: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> +-003: inserted row: uuid=<2> +-003: name=first_row weak_ref=[<2>] uuid=<0> +-003: updated columns: s ++003: table simple6: name=first_row weak_ref=[<1>] uuid=<0> ++003: table simple: inserted row: i=0 r=0 b=false s=row1_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: updated columns: s + 004: {"error":null,"result":[{"count":1}]} +-005: name=new_name weak_ref=[<2>] uuid=<0> +-005: updated columns: name ++005: table simple6: name=new_name weak_ref=[<1>] uuid=<0> ++005: table simple6: updated columns: name + 006: {"error":null,"result":[{"count":1}]} +-007: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++007: table simple: i=0 r=0 b=false s=row1_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 008: done + ]]) + +@@ -1253,30 +1279,266 @@ OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, orphan rows, cond + "table": "simple6", + "where": []}]']], + [[000: change conditions +-001: inserted row: uuid=<0> +-001: name=first_row weak_ref=[] uuid=<0> +-001: updated columns: name weak_ref ++001: table simple6: inserted row: name=first_row weak_ref=[] uuid=<0> ++001: table simple6: updated columns: name weak_ref + 002: change conditions +-003: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> +-003: inserted row: uuid=<2> +-003: name=first_row weak_ref=[<2>] uuid=<0> +-003: updated columns: s ++003: table simple6: name=first_row weak_ref=[<1>] uuid=<0> ++003: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: updated columns: s + 004: change conditions +-005: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> +-005: inserted row: uuid=<3> +-005: updated columns: s ++005: table simple6: name=first_row weak_ref=[] uuid=<0> ++005: table simple: deleted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++005: table simple: inserted row: i=0 r=0 b=false s=row1_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++005: table simple: updated columns: s + 006: change conditions +-007: deleted row: uuid=<3> +-007: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> +-007: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> +-007: inserted row: uuid=<2> +-007: name=first_row weak_ref=[<2>] uuid=<0> +-007: updated columns: s ++007: table simple6: name=first_row weak_ref=[<1>] uuid=<0> ++007: table simple: deleted row: i=0 r=0 b=false s=row1_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++007: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++007: table simple: updated columns: s ++008: {"error":null,"result":[{"count":1}]} ++009: table simple: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++010: done ++]]) ++ ++dnl This test checks that deleting the destination of a weak reference ++dnl without deleting the source, through monitor condition change, updates ++dnl the source tracked record. ++OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, references, conditional delete], ++ [['["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s", "i": 0}, ++ "uuid-name": "weak_row0"}, ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row1_s", "i": 1}, ++ "uuid-name": "weak_row1"}, ++ {"op": "insert", ++ "table": "simple6", ++ "row": {"name": "first_row", ++ "weak_ref": ["set", ++ [["named-uuid", "weak_row0"], ++ ["named-uuid", "weak_row1"]] ++ ]}}]']], ++ [['condition simple []' \ ++ 'condition simple [["s","==","row0_s"]]' \ ++ 'condition simple [["s","==","row1_s"]]' \ ++ '["idltest", ++ {"op": "update", ++ "table": "simple6", ++ "where": [], ++ "row": {"name": "new_name"}}]' \ ++ '["idltest", ++ {"op": "delete", ++ "table": "simple6", ++ "where": []}]']], ++ [[000: change conditions ++001: table simple6: inserted row: name=first_row weak_ref=[] uuid=<0> ++001: table simple6: updated columns: name weak_ref ++002: change conditions ++003: table simple6: name=first_row weak_ref=[<1>] uuid=<0> ++003: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: updated columns: s ++004: change conditions ++005: table simple6: name=first_row weak_ref=[<3>] uuid=<0> ++005: table simple: deleted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++005: table simple: inserted row: i=1 r=0 b=false s=row1_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++005: table simple: updated columns: i s ++006: {"error":null,"result":[{"count":1}]} ++007: table simple6: name=new_name weak_ref=[<3>] uuid=<0> ++007: table simple6: updated columns: name + 008: {"error":null,"result":[{"count":1}]} +-009: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++009: table simple: i=1 r=0 b=false s=row1_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> + 010: done + ]]) + ++dnl This test checks that deleting the destination of a reference updates the ++dnl source tracked record. ++OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, references, single delete], ++ [['["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s"}, ++ "uuid-name": "uuid_row0_s"}, ++ {"op": "insert", ++ "table": "simple6", ++ "row": {"name": "row0_s6", ++ "weak_ref": ["set", ++ [["named-uuid", "uuid_row0_s"]] ++ ]}}]']], ++ [['condition simple [true];simple6 [true]' \ ++ '["idltest", ++ {"op": "delete", ++ "table": "simple", ++ "where": []}]' \ ++ '["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s"}}]']], ++ [[000: change conditions ++001: table simple6: inserted row: name=row0_s6 weak_ref=[<0>] uuid=<1> ++001: table simple6: updated columns: name weak_ref ++001: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<0> ++001: table simple: updated columns: s ++002: {"error":null,"result":[{"count":1}]} ++003: table simple6: name=row0_s6 weak_ref=[] uuid=<1> ++003: table simple6: updated columns: weak_ref ++003: table simple: deleted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<0> ++004: {"error":null,"result":[{"uuid":["uuid","<3>"]}]} ++005: table simple6: name=row0_s6 weak_ref=[] uuid=<1> ++005: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++005: table simple: updated columns: s ++006: done ++]]) ++ ++dnl This test checks that deleting both the destination and source of the ++dnl reference doesn't remove the reference in the source tracked record. ++OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, weak references, multiple deletes], ++ [['["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s"}, ++ "uuid-name": "uuid_row0_s"}, ++ {"op": "insert", ++ "table": "simple6", ++ "row": {"name": "row0_s6", ++ "weak_ref": ["set", ++ [["named-uuid", "uuid_row0_s"]] ++ ]}}]']], ++ [['condition simple [true];simple6 [true]' \ ++ '["idltest", ++ {"op": "delete", ++ "table": "simple", ++ "where": []}, ++ {"op": "delete", ++ "table": "simple6", ++ "where": []}]' \ ++ '["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s"}}]']], ++ [[000: change conditions ++001: table simple6: inserted row: name=row0_s6 weak_ref=[<0>] uuid=<1> ++001: table simple6: updated columns: name weak_ref ++001: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<0> ++001: table simple: updated columns: s ++002: {"error":null,"result":[{"count":1},{"count":1}]} ++003: table simple6: deleted row: name=row0_s6 weak_ref=[<0>] uuid=<1> ++003: table simple: deleted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<0> ++004: {"error":null,"result":[{"uuid":["uuid","<3>"]}]} ++005: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<2> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++005: table simple: updated columns: s ++006: done ++]]) ++ ++dnl This test checks that deleting both the destination and source of the ++dnl reference doesn't remove the reference in the source tracked record. ++OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, strong references, multiple deletes], ++ [['["idltest", ++ {"op": "insert", ++ "table": "simple4", ++ "row": {"name": "row0_s4"}, ++ "uuid-name": "uuid_row0_s4"}, ++ {"op": "insert", ++ "table": "simple3", ++ "row": {"name": "row0_s3", ++ "uref": ["set", ++ [["named-uuid", "uuid_row0_s4"]] ++ ]}}]']], ++ [['condition simple [true];simple3 [true];simple4 [true]' \ ++ '["idltest", ++ {"op": "delete", ++ "table": "simple3", ++ "where": []}, ++ {"op": "delete", ++ "table": "simple4", ++ "where": []}]' \ ++ '["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s"}}]']], ++ [[000: change conditions ++001: table simple3: inserted row: name=row0_s3 uset=[] uref=[<0>] uuid=<1> ++001: table simple3: updated columns: name uref ++001: table simple4: inserted row: name=row0_s4 uuid=<0> ++001: table simple4: updated columns: name ++002: {"error":null,"result":[{"count":1},{"count":1}]} ++003: table simple3: deleted row: name=row0_s3 uset=[] uref=[<0>] uuid=<1> ++003: table simple4: deleted row: name=row0_s4 uuid=<0> ++004: {"error":null,"result":[{"uuid":["uuid","<2>"]}]} ++005: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<3> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++005: table simple: updated columns: s ++006: done ++]]) ++ ++dnl This test checks that changing conditions to not include the target of ++dnl a strong reference also updates the source row when change tracking is ++dnl enabled. ++OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, strong references, conditional], ++ [['["idltest", ++ {"op": "insert", ++ "table": "simple4", ++ "row": {"name": "row0_s4"}, ++ "uuid-name": "uuid_row0_s4"}, ++ {"op": "insert", ++ "table": "simple3", ++ "row": {"name": "row0_s3", ++ "uref": ["set", ++ [["named-uuid", "uuid_row0_s4"]] ++ ]}}]']], ++ [['condition simple [true];simple3 [true];simple4 [true]' \ ++ 'condition simple4 []' \ ++ '["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s"}}]']], ++ [[000: change conditions ++001: table simple3: inserted row: name=row0_s3 uset=[] uref=[<0>] uuid=<1> ++001: table simple3: updated columns: name uref ++001: table simple4: inserted row: name=row0_s4 uuid=<0> ++001: table simple4: updated columns: name ++002: change conditions ++003: table simple3: name=row0_s3 uset=[] uref=[] uuid=<1> ++003: table simple4: deleted row: name=row0_s4 uuid=<0> ++004: {"error":null,"result":[{"uuid":["uuid","<2>"]}]} ++005: table simple3: name=row0_s3 uset=[] uref=[] uuid=<1> ++005: table simple: inserted row: i=0 r=0 b=false s=row0_s u=<3> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++005: table simple: updated columns: s ++006: done ++]]) ++ ++dnl This test checks that changing conditions to not include the target of ++dnl a strong reference also updates the source row when change tracking is ++dnl disabled. ++OVSDB_CHECK_IDL([simple idl, initially populated, strong references, conditional], ++ [['["idltest", ++ {"op": "insert", ++ "table": "simple4", ++ "row": {"name": "row0_s4"}, ++ "uuid-name": "uuid_row0_s4"}, ++ {"op": "insert", ++ "table": "simple3", ++ "row": {"name": "row0_s3", ++ "uref": ["set", ++ [["named-uuid", "uuid_row0_s4"]] ++ ]}}]']], ++ [['condition simple [true];simple3 [true];simple4 [true]' \ ++ 'condition simple4 []' \ ++ '["idltest", ++ {"op": "insert", ++ "table": "simple", ++ "row": {"s": "row0_s"}}]']], ++ [[000: change conditions ++001: table simple3: name=row0_s3 uset=[] uref=[<0>] uuid=<1> ++001: table simple4: name=row0_s4 uuid=<0> ++002: change conditions ++003: table simple3: name=row0_s3 uset=[] uref=[] uuid=<1> ++004: {"error":null,"result":[{"uuid":["uuid","<2>"]}]} ++005: table simple3: name=row0_s3 uset=[] uref=[] uuid=<1> ++005: table simple: i=0 r=0 b=false s=row0_s u=<3> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++006: done ++]]) ++ + OVSDB_CHECK_IDL_TRACK([track, simple idl, initially empty, various ops], + [], + [['["idltest", +@@ -1330,34 +1592,31 @@ OVSDB_CHECK_IDL_TRACK([track, simple idl, initially empty, various ops], + 'reconnect']], + [[000: empty + 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]} +-002: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0> +-002: inserted row: uuid=<0> +-002: updated columns: b ba i ia r ra s sa u ua ++002: table simple: inserted row: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0> ++002: table simple: updated columns: b ba i ia r ra s sa u ua + 003: {"error":null,"result":[{"count":2}]} +-004: i=0 r=0 b=true s= u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-004: updated columns: b ++004: table simple: i=0 r=0 b=true s= u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++004: table simple: updated columns: b + 005: {"error":null,"result":[{"count":2}]} +-006: i=0 r=123.5 b=true s= u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-006: i=1 r=123.5 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0> +-006: updated columns: r +-006: updated columns: r ++006: table simple: i=0 r=123.5 b=true s= u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++006: table simple: i=1 r=123.5 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0> ++006: table simple: updated columns: r ++006: table simple: updated columns: r + 007: {"error":null,"result":[{"uuid":["uuid","<6>"]}]} +-008: i=-1 r=125 b=false s= u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-008: inserted row: uuid=<6> +-008: updated columns: ba i ia r ra ++008: table simple: inserted row: i=-1 r=125 b=false s= u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++008: table simple: updated columns: ba i ia r ra + 009: {"error":null,"result":[{"count":2}]} +-010: i=-1 r=125 b=false s=newstring u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-010: i=0 r=123.5 b=true s=newstring u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> +-010: updated columns: s +-010: updated columns: s ++010: table simple: i=-1 r=125 b=false s=newstring u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++010: table simple: i=0 r=123.5 b=true s=newstring u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++010: table simple: updated columns: s ++010: table simple: updated columns: s + 011: {"error":null,"result":[{"count":1}]} +-012: deleted row: uuid=<1> +-012: i=0 r=123.5 b=true s=newstring u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++012: table simple: deleted row: i=0 r=123.5 b=true s=newstring u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 013: reconnect +-014: i=-1 r=125 b=false s=newstring u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> +-014: i=1 r=123.5 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0> +-014: updated columns: b ba i ia r ra s sa u ua +-014: updated columns: ba i ia r ra s ++014: table simple: inserted row: i=-1 r=125 b=false s=newstring u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6> ++014: table simple: inserted row: i=1 r=123.5 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0> ++014: table simple: updated columns: b ba i ia r ra s sa u ua ++014: table simple: updated columns: ba i ia r ra s + 015: done + ]]) + +@@ -1397,16 +1656,16 @@ OVSDB_CHECK_IDL_PY([partial-map idl], + "row":{"name":"myString1","smap":["map",[["key1","value1"],["key2","value2"]]]} }]'] + ], + [?simple2:name,smap,imap 'partialmapinsertelement' 'partialmapinsertmultipleelements' 'partialmapdelelements' 'partialmapmutatenew'], +-[[000: name=myString1 smap=[(key1 value1) (key2 value2)] imap=[] ++[[000: table simple2: name=myString1 smap=[(key1 value1) (key2 value2)] imap=[] uuid=<0> + 001: commit, status=success +-002: name=String2 smap=[(key1 myList1) (key2 value2)] imap=[(3 myids2)] ++002: table simple2: name=String2 smap=[(key1 myList1) (key2 value2)] imap=[(3 myids2)] uuid=<0> + 003: commit, status=success +-004: name=String2 smap=[(key1 myList1) (key2 myList2) (key3 myList3) (key4 myList4)] imap=[(3 myids2)] ++004: table simple2: name=String2 smap=[(key1 myList1) (key2 myList2) (key3 myList3) (key4 myList4)] imap=[(3 myids2)] uuid=<0> + 005: commit, status=success +-006: name=String2 smap=[(key2 myList2)] imap=[(3 myids2)] ++006: table simple2: name=String2 smap=[(key2 myList2)] imap=[(3 myids2)] uuid=<0> + 007: commit, status=success +-008: name=String2 smap=[(key2 myList2)] imap=[(3 myids2)] +-008: name=String2New smap=[(key1 newList1) (key2 newList2)] imap=[] ++008: table simple2: name=String2 smap=[(key2 myList2)] imap=[(3 myids2)] uuid=<0> ++008: table simple2: name=String2New smap=[(key1 newList1) (key2 newList2)] imap=[] uuid=<1> + 009: done + ]]) + +@@ -1414,11 +1673,11 @@ OVSDB_CHECK_IDL_PY([partial-map update set refmap idl], + [['["idltest", {"op":"insert", "table":"simple3", "row":{"name":"myString1"}}, + {"op":"insert", "table":"simple5", "row":{"name":"myString2"}}]']], + ['partialmapmutateirefmap'], +-[[000: name=myString1 uset=[] +-000: name=myString2 irefmap=[] ++[[000: table simple3: name=myString1 uset=[] uref=[] uuid=<0> ++000: table simple5: name=myString2 irefmap=[] uuid=<1> + 001: commit, status=success +-002: name=myString1 uset=[] +-002: name=myString2 irefmap=[(1 <0>)] ++002: table simple3: name=myString1 uset=[] uref=[] uuid=<0> ++002: table simple5: name=myString2 irefmap=[(1 <0>)] uuid=<1> + 003: done + ]]) + +@@ -1441,17 +1700,17 @@ OVSDB_CHECK_IDL_PARTIAL_UPDATE_SET_COLUMN([set, simple3 idl-partial-update-set-c + ], + [], + [[000: Getting records +-001: name=mySet1 uset=[[<0>],[<1>]] uref=[] ++001: table simple3: name=mySet1 uset=[<0>,<1>] uref=[] uuid=<2> + 002: After rename+add new value +-003: name=String2 uset=[[<0>],[<1>],[<2>]] uref=[] ++003: table simple3: name=String2 uset=[<0>,<1>,<3>] uref=[] uuid=<2> + 004: After add new value +-005: name=String2 uset=[[<0>],[<1>],[<2>],[<3>]] uref=[] ++005: table simple3: name=String2 uset=[<0>,<1>,<3>,<4>] uref=[] uuid=<2> + 006: After delete value +-007: name=String2 uset=[[<0>],[<1>],[<3>]] uref=[] ++007: table simple3: name=String2 uset=[<0>,<1>,<4>] uref=[] uuid=<2> + 008: After trying to delete a deleted value +-009: name=String2 uset=[[<0>],[<1>],[<3>]] uref=[] ++009: table simple3: name=String2 uset=[<0>,<1>,<4>] uref=[] uuid=<2> + 010: After add to other table + set of strong ref +-011: name=String2 uset=[[<0>],[<1>],[<3>]] uref=[[<4>]] ++011: table simple3: name=String2 uset=[<0>,<1>,<4>] uref=[<5>] uuid=<2> + 012: End test + ]]) + +@@ -1463,22 +1722,26 @@ OVSDB_CHECK_IDL_PY([partial-set idl], + "mutations": [["uset", "insert", ["set", [["uuid", "000d2f6a-76af-412f-b59d-e7bcd3e84eff"]]]]]}]'] + ], + ['partialrenamesetadd' 'partialduplicateadd' 'partialsetdel' 'partialsetref' 'partialsetoverrideops' 'partialsetadddelete' 'partialsetmutatenew'], +-[[000: name=mySet1 uset=[<0> <1>] ++[[000: table simple3: name=mySet1 uset=[<0> <1>] uref=[] uuid=<2> + 001: commit, status=success +-002: name=String2 uset=[<0> <1> <2>] ++002: table simple3: name=String2 uset=[<0> <1> <3>] uref=[] uuid=<2> + 003: commit, status=success +-004: name=String2 uset=[<0> <1> <2> <3>] ++004: table simple3: name=String2 uset=[<0> <1> <3> <4>] uref=[] uuid=<2> + 005: commit, status=success +-006: name=String2 uset=[<0> <1> <3>] ++006: table simple3: name=String2 uset=[<0> <1> <4>] uref=[] uuid=<2> + 007: commit, status=success +-008: name=String2 uset=[<0> <1> <3>] ++008: table simple3: name=String2 uset=[<0> <1> <4>] uref=[<5>] uuid=<2> ++008: table simple4: name=test uuid=<5> + 009: commit, status=success +-010: name=String2 uset=[<3>] ++010: table simple3: name=String2 uset=[<4>] uref=[<5>] uuid=<2> ++010: table simple4: name=test uuid=<5> + 011: commit, status=success +-012: name=String2 uset=[<4> <5>] ++012: table simple3: name=String2 uset=[<6> <7>] uref=[<5>] uuid=<2> ++012: table simple4: name=test uuid=<5> + 013: commit, status=success +-014: name=String2 uset=[<4> <5>] +-014: name=String3 uset=[<6>] ++014: table simple3: name=String2 uset=[<6> <7>] uref=[<5>] uuid=<2> ++014: table simple3: name=String3 uset=[<8>] uref=[] uuid=<9> ++014: table simple4: name=test uuid=<5> + 015: done + ]]) + +@@ -1486,6 +1749,28 @@ m4_define([OVSDB_CHECK_IDL_NOTIFY], [OVSDB_CHECK_IDL_PY([$1], [], [$2], [$3], [notify $4], [$5]) OVSDB_CHECK_IDL_SSL_PY([$1], [], [$2], [$3], [notify $4], [$5])]) @@ -818,51 +2117,719 @@ index 4b4791a7da..e00e67e949 100644 + "uuid-name": "l2row", + "row": {"i": 2, "l1": ["set", [["named-uuid", "l1row"]]]}}]']], +[[000: empty -+000: event:create, row={uuid=<0>}, updates=None -+000: event:create, row={uuid=<1>}, updates=None ++000: event:create, row={}, uuid=<0>, updates=None ++000: event:create, row={}, uuid=<1>, updates=None +001: {"error":null,"result":[{"uuid":["uuid","<2>"]},{"uuid":["uuid","<3>"]}]} -+002: event:create, row={i=1 uuid=<2> l2=[<3>]}, updates=None -+002: event:create, row={i=2 uuid=<3> l1=[<2>]}, updates=None -+002: i=1 k=1 ka=[] l2=2 uuid=<2> -+002: i=2 l1=1 uuid=<3> ++002: event:create, row={i=1 l2=[<3>]}, uuid=<2>, updates=None ++002: event:create, row={i=2 l1=[<2>]}, uuid=<3>, updates=None ++002: table link1: i=1 k=1 ka=[] l2=2 uuid=<2> ++002: table link2: i=2 l1=1 uuid=<3> +003: done +]]) + OVSDB_CHECK_IDL_NOTIFY([simple idl verify notify], [['track-notify' \ '["idltest", +@@ -1538,44 +1823,44 @@ OVSDB_CHECK_IDL_NOTIFY([simple idl verify notify], + "where": [["i", "==", 0]]}]' \ + 'reconnect']], + [[000: empty +-000: event:create, row={uuid=<0>}, updates=None +-000: event:create, row={uuid=<1>}, updates=None ++000: event:create, row={}, uuid=<0>, updates=None ++000: event:create, row={}, uuid=<1>, updates=None + 001: {"error":null,"result":[{"uuid":["uuid","<2>"]},{"uuid":["uuid","<3>"]}]} +-002: event:create, row={i=0 r=0 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3>}, updates=None +-002: event:create, row={i=1 r=2 b=true s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2>}, updates=None +-002: i=0 r=0 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> +-002: i=1 r=2 b=true s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> ++002: event:create, row={i=0 r=0 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[]}, uuid=<3>, updates=None ++002: event:create, row={i=1 r=2 b=true s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>]}, uuid=<2>, updates=None ++002: table simple: i=0 r=0 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++002: table simple: i=1 r=2 b=true s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> + 003: {"error":null,"result":[{"count":2}]} +-004: event:update, row={i=1 r=2 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2>}, updates={b=true uuid=<2>} +-004: i=0 r=0 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> +-004: i=1 r=2 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> ++004: event:update, row={i=1 r=2 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>]}, uuid=<2>, updates={b=true} ++004: table simple: i=0 r=0 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++004: table simple: i=1 r=2 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> + 005: {"error":null,"result":[{"count":2}]} +-006: event:update, row={i=0 r=123.5 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3>}, updates={r=0 uuid=<3>} +-006: event:update, row={i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2>}, updates={r=2 uuid=<2>} +-006: i=0 r=123.5 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> +-006: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> ++006: event:update, row={i=0 r=123.5 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[]}, uuid=<3>, updates={r=0} ++006: event:update, row={i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>]}, uuid=<2>, updates={r=2} ++006: table simple: i=0 r=123.5 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++006: table simple: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> + 007: {"error":null,"result":[{"uuid":["uuid","<8>"]}]} +-008: event:create, row={i=-1 r=125 b=false s= u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8>}, updates=None +-008: i=-1 r=125 b=false s= u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8> +-008: i=0 r=123.5 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> +-008: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> ++008: event:create, row={i=-1 r=125 b=false s= u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[]}, uuid=<8>, updates=None ++008: table simple: i=-1 r=125 b=false s= u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8> ++008: table simple: i=0 r=123.5 b=false s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++008: table simple: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> + 009: {"error":null,"result":[{"count":2}]} +-010: event:update, row={i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8>}, updates={s= uuid=<8>} +-010: event:update, row={i=0 r=123.5 b=false s=newstring u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3>}, updates={s= uuid=<3>} +-010: i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8> +-010: i=0 r=123.5 b=false s=newstring u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> +-010: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> ++010: event:update, row={i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[]}, uuid=<8>, updates={s=} ++010: event:update, row={i=0 r=123.5 b=false s=newstring u=<4> ia=[] ra=[] ba=[] sa=[] ua=[]}, uuid=<3>, updates={s=} ++010: table simple: i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8> ++010: table simple: i=0 r=123.5 b=false s=newstring u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3> ++010: table simple: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> + 011: {"error":null,"result":[{"count":1}]} +-012: event:delete, row={i=0 r=123.5 b=false s=newstring u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3>}, updates=None +-012: i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8> +-012: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> ++012: event:delete, row={i=0 r=123.5 b=false s=newstring u=<4> ia=[] ra=[] ba=[] sa=[] ua=[]}, uuid=<3>, updates=None ++012: table simple: i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8> ++012: table simple: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> + 013: reconnect +-014: event:create, row={i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8>}, updates=None +-014: event:create, row={i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2>}, updates=None +-014: event:create, row={uuid=<0>}, updates=None +-014: event:create, row={uuid=<1>}, updates=None +-014: i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8> +-014: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> ++014: event:create, row={i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[]}, uuid=<8>, updates=None ++014: event:create, row={i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>]}, uuid=<2>, updates=None ++014: event:create, row={}, uuid=<0>, updates=None ++014: event:create, row={}, uuid=<1>, updates=None ++014: table simple: i=-1 r=125 b=false s=newstring u=<4> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<8> ++014: table simple: i=1 r=123.5 b=false s=mystring u=<5> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<6> <7>] uuid=<2> + 015: done + ]]) + +@@ -1888,10 +2173,10 @@ OVSDB_CHECK_IDL_COMPOUND_INDEX_WITH_REF([set, simple3 idl-compound-index-with-re + [], + [], + [[000: After add to other table + set of strong ref +-001: name= uset=[] uref=[[<0>]] ++001: table simple3: name= uset=[] uref=[<0>] uuid=<1> + 002: check simple4: not empty + 003: Query using index with reference +-004: name= uset=[] uref=[[<0>]] ++004: table simple3: name= uset=[] uref=[<0>] uuid=<1> + 005: After delete + 007: check simple4: empty + 008: End test +@@ -1989,11 +2274,11 @@ OVSDB_CHECK_CLUSTER_IDL_C([simple idl, monitor_cond_since, cluster disconnect], + [[000: change conditions + 001: empty + 002: change conditions +-003: i=2 r=1 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++003: table simple: i=2 r=1 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 004: change conditions + 005: reconnect +-006: i=2 r=1 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> ++006: table simple: i=2 r=1 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> + 007: {"error":null,"result":[{"count":1}]} +-008: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> ++008: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> + 009: done + ]]) +diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c +index 15433e3472..a886f971e7 100644 +--- a/tests/test-ovsdb.c ++++ b/tests/test-ovsdb.c +@@ -1861,6 +1861,23 @@ print_and_log(const char *format, ...) + free(message); + } + ++static char * ++format_idl_row(const struct ovsdb_idl_row *row, int step, const char *contents) ++{ ++ const char *change_str = ++ !ovsdb_idl_track_is_set(row->table) ++ ? "" ++ : ovsdb_idl_row_get_seqno(row, OVSDB_IDL_CHANGE_INSERT) > 0 ++ ? "inserted row: " ++ : ovsdb_idl_row_get_seqno(row, OVSDB_IDL_CHANGE_DELETE) > 0 ++ ? "deleted row: " ++ : ""; ++ ++ return xasprintf("%03d: table %s: %s%s uuid=" UUID_FMT, ++ step, row->table->class_->name, change_str, contents, ++ UUID_ARGS(&row->uuid)); ++} ++ + static void + print_idl_row_updated_simple(const struct idltest_simple *s, int step) + { +@@ -1871,7 +1888,9 @@ print_idl_row_updated_simple(const struct idltest_simple *s, int step) + } + } + if (updates.length) { +- print_and_log("%03d: updated columns:%s", step, ds_cstr(&updates)); ++ print_and_log("%03d: table %s: updated columns:%s", ++ step, s->header_.table->class_->name, ++ ds_cstr(&updates)); + ds_destroy(&updates); + } + } +@@ -1886,7 +1905,9 @@ print_idl_row_updated_link1(const struct idltest_link1 *l1, int step) + } + } + if (updates.length) { +- print_and_log("%03d: updated columns:%s", step, ds_cstr(&updates)); ++ print_and_log("%03d: table %s: updated columns:%s", ++ step, l1->header_.table->class_->name, ++ ds_cstr(&updates)); + ds_destroy(&updates); + } + } +@@ -1901,7 +1922,43 @@ print_idl_row_updated_link2(const struct idltest_link2 *l2, int step) + } + } + if (updates.length) { +- print_and_log("%03d: updated columns:%s", step, ds_cstr(&updates)); ++ print_and_log("%03d: table %s: updated columns:%s", ++ step, l2->header_.table->class_->name, ++ ds_cstr(&updates)); ++ ds_destroy(&updates); ++ } ++} ++ ++static void ++print_idl_row_updated_simple3(const struct idltest_simple3 *s3, int step) ++{ ++ struct ds updates = DS_EMPTY_INITIALIZER; ++ for (size_t i = 0; i < IDLTEST_SIMPLE3_N_COLUMNS; i++) { ++ if (idltest_simple3_is_updated(s3, i)) { ++ ds_put_format(&updates, " %s", idltest_simple3_columns[i].name); ++ } ++ } ++ if (updates.length) { ++ print_and_log("%03d: table %s: updated columns:%s", ++ step, s3->header_.table->class_->name, ++ ds_cstr(&updates)); ++ ds_destroy(&updates); ++ } ++} ++ ++static void ++print_idl_row_updated_simple4(const struct idltest_simple4 *s4, int step) ++{ ++ struct ds updates = DS_EMPTY_INITIALIZER; ++ for (size_t i = 0; i < IDLTEST_SIMPLE4_N_COLUMNS; i++) { ++ if (idltest_simple4_is_updated(s4, i)) { ++ ds_put_format(&updates, " %s", idltest_simple4_columns[i].name); ++ } ++ } ++ if (updates.length) { ++ print_and_log("%03d: table %s: updated columns:%s", ++ step, s4->header_.table->class_->name, ++ ds_cstr(&updates)); + ds_destroy(&updates); + } + } +@@ -1916,7 +1973,9 @@ print_idl_row_updated_simple6(const struct idltest_simple6 *s6, int step) + } + } + if (updates.length) { +- print_and_log("%03d: updated columns:%s", step, ds_cstr(&updates)); ++ print_and_log("%03d: table %s: updated columns:%s", ++ step, s6->header_.table->class_->name, ++ ds_cstr(&updates)); + ds_destroy(&updates); + } + } +@@ -1931,7 +1990,9 @@ print_idl_row_updated_singleton(const struct idltest_singleton *sng, int step) + } + } + if (updates.length) { +- print_and_log("%03d: updated columns:%s", step, ds_cstr(&updates)); ++ print_and_log("%03d: table %s: updated columns:%s", ++ step, sng->header_.table->class_->name, ++ ds_cstr(&updates)); + ds_destroy(&updates); + } + } +@@ -1940,8 +2001,8 @@ static void + print_idl_row_simple(const struct idltest_simple *s, int step) + { + struct ds msg = DS_EMPTY_INITIALIZER; +- ds_put_format(&msg, "%03d: i=%"PRId64" r=%g b=%s s=%s u="UUID_FMT" ia=[", +- step, s->i, s->r, s->b ? "true" : "false", ++ ds_put_format(&msg, "i=%"PRId64" r=%g b=%s s=%s u="UUID_FMT" ia=[", ++ s->i, s->r, s->b ? "true" : "false", + s->s, UUID_ARGS(&s->u)); + for (size_t i = 0; i < s->n_ia; i++) { + ds_put_format(&msg, "%s%"PRId64, i ? " " : "", s->ia[i]); +@@ -1962,9 +2023,12 @@ print_idl_row_simple(const struct idltest_simple *s, int step) + for (size_t i = 0; i < s->n_ua; i++) { + ds_put_format(&msg, "%s"UUID_FMT, i ? " " : "", UUID_ARGS(&s->ua[i])); + } +- ds_put_format(&msg, "] uuid="UUID_FMT, UUID_ARGS(&s->header_.uuid)); +- print_and_log("%s", ds_cstr(&msg)); ++ ds_put_cstr(&msg, "]"); ++ ++ char *row_msg = format_idl_row(&s->header_, step, ds_cstr(&msg)); ++ print_and_log("%s", row_msg); + ds_destroy(&msg); ++ free(row_msg); + + print_idl_row_updated_simple(s, step); + } +@@ -1973,7 +2037,7 @@ static void + print_idl_row_link1(const struct idltest_link1 *l1, int step) + { + struct ds msg = DS_EMPTY_INITIALIZER; +- ds_put_format(&msg, "%03d: i=%"PRId64" k=", step, l1->i); ++ ds_put_format(&msg, "i=%"PRId64" k=", l1->i); + if (l1->k) { + ds_put_format(&msg, "%"PRId64, l1->k->i); + } +@@ -1988,9 +2052,11 @@ print_idl_row_link1(const struct idltest_link1 *l1, int step) + if (l1->l2) { + ds_put_format(&msg, "%"PRId64, l1->l2->i); + } +- ds_put_format(&msg, " uuid="UUID_FMT, UUID_ARGS(&l1->header_.uuid)); +- print_and_log("%s", ds_cstr(&msg)); ++ ++ char *row_msg = format_idl_row(&l1->header_, step, ds_cstr(&msg)); ++ print_and_log("%s", row_msg); + ds_destroy(&msg); ++ free(row_msg); + + print_idl_row_updated_link1(l1, step); + } +@@ -1999,30 +2065,77 @@ static void + print_idl_row_link2(const struct idltest_link2 *l2, int step) + { + struct ds msg = DS_EMPTY_INITIALIZER; +- ds_put_format(&msg, "%03d: i=%"PRId64" l1=", step, l2->i); ++ ds_put_format(&msg, "i=%"PRId64" l1=", l2->i); + if (l2->l1) { + ds_put_format(&msg, "%"PRId64, l2->l1->i); + } +- ds_put_format(&msg, " uuid="UUID_FMT, UUID_ARGS(&l2->header_.uuid)); +- print_and_log("%s", ds_cstr(&msg)); ++ ++ char *row_msg = format_idl_row(&l2->header_, step, ds_cstr(&msg)); ++ print_and_log("%s", row_msg); + ds_destroy(&msg); ++ free(row_msg); + + print_idl_row_updated_link2(l2, step); + } + ++static void ++print_idl_row_simple3(const struct idltest_simple3 *s3, int step) ++{ ++ struct ds msg = DS_EMPTY_INITIALIZER; ++ size_t i; ++ ++ ds_put_format(&msg, "name=%s uset=[", s3->name); ++ for (i = 0; i < s3->n_uset; i++) { ++ ds_put_format(&msg, UUID_FMT"%s", ++ UUID_ARGS(&s3->uset[i]), ++ i < s3->n_uset - 1 ? "," : ""); ++ } ++ ds_put_cstr(&msg, "] uref=["); ++ for (i = 0; i < s3->n_uref; i++) { ++ ds_put_format(&msg, UUID_FMT"%s", ++ UUID_ARGS(&s3->uref[i]->header_.uuid), ++ i < s3->n_uref -1 ? "," : ""); ++ } ++ ds_put_cstr(&msg, "]"); ++ ++ char *row_msg = format_idl_row(&s3->header_, step, ds_cstr(&msg)); ++ print_and_log("%s", row_msg); ++ ds_destroy(&msg); ++ free(row_msg); ++ ++ print_idl_row_updated_simple3(s3, step); ++} ++ ++static void ++print_idl_row_simple4(const struct idltest_simple4 *s4, int step) ++{ ++ struct ds msg = DS_EMPTY_INITIALIZER; ++ ds_put_format(&msg, "name=%s", s4->name); ++ ++ char *row_msg = format_idl_row(&s4->header_, step, ds_cstr(&msg)); ++ print_and_log("%s", row_msg); ++ ds_destroy(&msg); ++ free(row_msg); ++ ++ print_idl_row_updated_simple4(s4, step); ++} ++ + static void + print_idl_row_simple6(const struct idltest_simple6 *s6, int step) + { + struct ds msg = DS_EMPTY_INITIALIZER; +- ds_put_format(&msg, "%03d: name=%s ", step, s6->name); ++ ds_put_format(&msg, "name=%s ", s6->name); + ds_put_cstr(&msg, "weak_ref=["); + for (size_t i = 0; i < s6->n_weak_ref; i++) { + ds_put_format(&msg, "%s"UUID_FMT, i ? " " : "", + UUID_ARGS(&s6->weak_ref[i]->header_.uuid)); + } +- ds_put_format(&msg, "] uuid="UUID_FMT, UUID_ARGS(&s6->header_.uuid)); +- print_and_log("%s", ds_cstr(&msg)); ++ ds_put_cstr(&msg, "]"); ++ ++ char *row_msg = format_idl_row(&s6->header_, step, ds_cstr(&msg)); ++ print_and_log("%s", row_msg); + ds_destroy(&msg); ++ free(row_msg); + + print_idl_row_updated_simple6(s6, step); + } +@@ -2030,14 +2143,23 @@ print_idl_row_simple6(const struct idltest_simple6 *s6, int step) + static void + print_idl_row_singleton(const struct idltest_singleton *sng, int step) + { +- print_and_log("%03d: name=%s uuid="UUID_FMT, step, sng->name, +- UUID_ARGS(&sng->header_.uuid)); ++ struct ds msg = DS_EMPTY_INITIALIZER; ++ ds_put_format(&msg, "name=%s", sng->name); ++ ++ char *row_msg = format_idl_row(&sng->header_, step, ds_cstr(&msg)); ++ print_and_log("%s", row_msg); ++ ds_destroy(&msg); ++ free(row_msg); ++ + print_idl_row_updated_singleton(sng, step); + } + + static void + print_idl(struct ovsdb_idl *idl, int step) + { ++ const struct idltest_simple3 *s3; ++ const struct idltest_simple4 *s4; ++ const struct idltest_simple6 *s6; + const struct idltest_simple *s; + const struct idltest_link1 *l1; + const struct idltest_link2 *l2; +@@ -2056,6 +2178,18 @@ print_idl(struct ovsdb_idl *idl, int step) + print_idl_row_link2(l2, step); + n++; + } ++ IDLTEST_SIMPLE3_FOR_EACH (s3, idl) { ++ print_idl_row_simple3(s3, step); ++ n++; ++ } ++ IDLTEST_SIMPLE4_FOR_EACH (s4, idl) { ++ print_idl_row_simple4(s4, step); ++ n++; ++ } ++ IDLTEST_SIMPLE6_FOR_EACH (s6, idl) { ++ print_idl_row_simple6(s6, step); ++ n++; ++ } + IDLTEST_SINGLETON_FOR_EACH (sng, idl) { + print_idl_row_singleton(sng, step); + n++; +@@ -2068,6 +2202,8 @@ print_idl(struct ovsdb_idl *idl, int step) + static void + print_idl_track(struct ovsdb_idl *idl, int step) + { ++ const struct idltest_simple3 *s3; ++ const struct idltest_simple4 *s4; + const struct idltest_simple6 *s6; + const struct idltest_simple *s; + const struct idltest_link1 *l1; +@@ -2076,51 +2212,26 @@ print_idl_track(struct ovsdb_idl *idl, int step) + + IDLTEST_SIMPLE_FOR_EACH_TRACKED (s, idl) { + print_idl_row_simple(s, step); +- if (idltest_simple_is_deleted(s)) { +- print_and_log("%03d: deleted row: uuid="UUID_FMT, step, +- UUID_ARGS(&s->header_.uuid)); +- } else if (idltest_simple_is_new(s)) { +- print_and_log("%03d: inserted row: uuid="UUID_FMT, step, +- UUID_ARGS(&s->header_.uuid)); +- } + n++; + } + IDLTEST_LINK1_FOR_EACH_TRACKED (l1, idl) { +- if (idltest_link1_is_deleted(l1)) { +- print_and_log("%03d: deleted row: uuid="UUID_FMT, step, +- UUID_ARGS(&l1->header_.uuid)); +- } else { +- print_idl_row_link1(l1, step); +- if (idltest_link1_is_new(l1)) { +- print_and_log("%03d: inserted row: uuid="UUID_FMT, step, +- UUID_ARGS(&l1->header_.uuid)); +- } +- } ++ print_idl_row_link1(l1, step); + n++; + } + IDLTEST_LINK2_FOR_EACH_TRACKED (l2, idl) { +- if (idltest_link2_is_deleted(l2)) { +- print_and_log("%03d: deleted row: uuid="UUID_FMT, step, +- UUID_ARGS(&l2->header_.uuid)); +- } else { +- print_idl_row_link2(l2, step); +- if (idltest_link2_is_new(l2)) { +- print_and_log("%03d: inserted row: uuid="UUID_FMT, step, +- UUID_ARGS(&l2->header_.uuid)); +- } +- +- } ++ print_idl_row_link2(l2, step); ++ n++; ++ } ++ IDLTEST_SIMPLE3_FOR_EACH_TRACKED (s3, idl) { ++ print_idl_row_simple3(s3, step); ++ n++; ++ } ++ IDLTEST_SIMPLE4_FOR_EACH_TRACKED (s4, idl) { ++ print_idl_row_simple4(s4, step); + n++; + } + IDLTEST_SIMPLE6_FOR_EACH_TRACKED (s6, idl) { + print_idl_row_simple6(s6, step); +- if (idltest_simple6_is_deleted(s6)) { +- print_and_log("%03d: deleted row: uuid="UUID_FMT, step, +- UUID_ARGS(&s6->header_.uuid)); +- } else if (idltest_simple6_is_new(s6)) { +- print_and_log("%03d: inserted row: uuid="UUID_FMT, step, +- UUID_ARGS(&s6->header_.uuid)); +- } + n++; + } + +@@ -2349,6 +2460,10 @@ find_table_class(const char *name) + return &idltest_table_link1; + } else if (!strcmp(name, "link2")) { + return &idltest_table_link2; ++ } else if (!strcmp(name, "simple3")) { ++ return &idltest_table_simple3; ++ } else if (!strcmp(name, "simple4")) { ++ return &idltest_table_simple4; + } else if (!strcmp(name, "simple6")) { + return &idltest_table_simple6; + } +@@ -2702,27 +2817,6 @@ do_idl_partial_update_map_column(struct ovs_cmdl_context *ctx) + printf("%03d: End test\n", step); + } + +-static void +-print_idl_row_simple3(const struct idltest_simple3 *s, int step) +-{ +- size_t i; +- const struct ovsdb_datum *uset; +- const struct ovsdb_datum *uref; +- +- uset = idltest_simple3_get_uset(s, OVSDB_TYPE_UUID); +- printf("%03d: name=%s uset=[", +- step, s->name); +- for (i = 0; i < uset->n; i++) { +- printf("["UUID_FMT"]%s", UUID_ARGS(&(uset->keys[i].uuid)), i < uset->n-1? ",": ""); +- } +- uref = idltest_simple3_get_uref(s, OVSDB_TYPE_UUID); +- printf("] uref=["); +- for (i = 0; i < uref->n; i++) { +- printf("["UUID_FMT"]%s", UUID_ARGS(&(uref->keys[i].uuid)), i < uref->n-1? ",": ""); +- } +- printf("]\n"); +-} +- + static void + dump_simple3(struct ovsdb_idl *idl, + const struct idltest_simple3 *myRow, diff --git a/tests/test-ovsdb.py b/tests/test-ovsdb.py -index a196802743..9d3228f234 100644 +index a196802743..72a319123e 100644 --- a/tests/test-ovsdb.py +++ b/tests/test-ovsdb.py -@@ -162,6 +162,8 @@ def get_simple_printable_row_string(row, columns): +@@ -162,6 +162,10 @@ def get_simple_printable_row_string(row, columns): if isinstance(value, dict): value = sorted((row_to_uuid(k), row_to_uuid(v)) for k, v in value.items()) + if isinstance(value, (list, tuple)): + value = sorted((row_to_uuid(v) for v in value)) ++ elif isinstance(value, list): ++ value = sorted(row_to_uuid(v) for v in value) s += "%s=%s " % (column, value) s = s.strip() s = re.sub('""|,|u?\'', "", s) -@@ -172,9 +174,10 @@ def get_simple_printable_row_string(row, columns): +@@ -172,9 +176,10 @@ def get_simple_printable_row_string(row, columns): return s -def get_simple_table_printable_row(row): +def get_simple_table_printable_row(row, *additional_columns): simple_columns = ["i", "r", "b", "s", "u", "ia", - "ra", "ba", "sa", "ua", "uuid"] +- "ra", "ba", "sa", "ua", "uuid"] ++ "ra", "ba", "sa", "ua"] + simple_columns.extend(additional_columns) return get_simple_printable_row_string(row, simple_columns) -@@ -637,7 +640,8 @@ def do_idl(schema_file, remote, *commands): +@@ -184,81 +189,118 @@ def get_simple2_table_printable_row(row): + + + def get_simple3_table_printable_row(row): +- simple3_columns = ["name", "uset"] ++ simple3_columns = ["name", "uset", "uref"] + return get_simple_printable_row_string(row, simple3_columns) + + ++def get_simple4_table_printable_row(row): ++ simple4_columns = ["name"] ++ return get_simple_printable_row_string(row, simple4_columns) ++ ++ ++def get_simple5_table_printable_row(row): ++ simple5_columns = ["name", "irefmap"] ++ return get_simple_printable_row_string(row, simple5_columns) ++ ++ ++def get_simple6_table_printable_row(row): ++ simple6_columns = ["name", "weak_ref"] ++ return get_simple_printable_row_string(row, simple6_columns) ++ ++ ++def get_link1_table_printable_row(row): ++ s = ["i=%s k=" % row.i] ++ if hasattr(row, "k") and row.k: ++ s.append(str(row.k.i)) ++ if hasattr(row, "ka"): ++ s.append(" ka=[") ++ s.append(' '.join(sorted(str(ka.i) for ka in row.ka))) ++ s.append("] l2=") ++ if hasattr(row, "l2") and row.l2: ++ s.append(str(row.l2[0].i)) ++ return ''.join(s) ++ ++ ++def get_link2_table_printable_row(row): ++ s = "i=%s l1=" % row.i ++ if hasattr(row, "l1") and row.l1: ++ s += str(row.l1[0].i) ++ return s ++ ++ ++def get_singleton_table_printable_row(row): ++ return "name=%s" % row.name ++ ++ ++def print_row(table, row, step, contents): ++ s = "%03d: table %s: %s " % (step, table, contents) ++ s += get_simple_printable_row_string(row, ["uuid"]) ++ print(s) ++ ++ + def print_idl(idl, step): + n = 0 + if "simple" in idl.tables: + simple = idl.tables["simple"].rows + for row in simple.values(): +- s = "%03d: " % step +- s += get_simple_table_printable_row(row) +- print(s) ++ print_row("simple", row, step, ++ get_simple_table_printable_row(row)) + n += 1 + + if "simple2" in idl.tables: + simple2 = idl.tables["simple2"].rows + for row in simple2.values(): +- s = "%03d: " % step +- s += get_simple2_table_printable_row(row) +- print(s) ++ print_row("simple2", row, step, ++ get_simple2_table_printable_row(row)) + n += 1 + + if "simple3" in idl.tables: + simple3 = idl.tables["simple3"].rows + for row in simple3.values(): +- s = "%03d: " % step +- s += get_simple3_table_printable_row(row) +- print(s) ++ print_row("simple3", row, step, ++ get_simple3_table_printable_row(row)) ++ n += 1 ++ ++ if "simple4" in idl.tables: ++ simple4 = idl.tables["simple4"].rows ++ for row in simple4.values(): ++ print_row("simple4", row, step, ++ get_simple4_table_printable_row(row)) + n += 1 + + if "simple5" in idl.tables: + simple5 = idl.tables["simple5"].rows + for row in simple5.values(): +- s = "%03d: " % step +- s += get_simple_printable_row_string(row, ["name", "irefmap"]) +- print(s) ++ print_row("simple5", row, step, ++ get_simple5_table_printable_row(row)) ++ n += 1 ++ ++ if "simple6" in idl.tables: ++ simple6 = idl.tables["simple6"].rows ++ for row in simple6.values(): ++ print_row("simple6", row, step, ++ get_simple6_table_printable_row(row)) + n += 1 + + if "link1" in idl.tables: + l1 = idl.tables["link1"].rows + for row in l1.values(): +- s = ["%03d: i=%s k=" % (step, row.i)] +- if hasattr(row, "k") and row.k: +- s.append(str(row.k.i)) +- if hasattr(row, "ka"): +- s.append(" ka=[") +- s.append(' '.join(sorted(str(ka.i) for ka in row.ka))) +- s.append("] l2=") +- if hasattr(row, "l2") and row.l2: +- s.append(str(row.l2[0].i)) +- if hasattr(row, "uuid"): +- s.append(" uuid=%s" % row.uuid) +- print(''.join(s)) ++ print_row("link1", row, step, ++ get_link1_table_printable_row(row)) + n += 1 + + if "link2" in idl.tables: + l2 = idl.tables["link2"].rows + for row in l2.values(): +- s = ["%03d:" % step] +- s.append(" i=%s l1=" % row.i) +- if hasattr(row, "l1") and row.l1: +- s.append(str(row.l1[0].i)) +- if hasattr(row, "uuid"): +- s.append(" uuid=%s" % row.uuid) +- print(''.join(s)) ++ print_row("link2", row, step, ++ get_link2_table_printable_row(row)) + n += 1 + + if "singleton" in idl.tables: + sng = idl.tables["singleton"].rows + for row in sng.values(): +- s = ["%03d:" % step] +- s.append(" name=%s" % row.name) +- if hasattr(row, "uuid"): +- s.append(" uuid=%s" % row.uuid) +- print(''.join(s)) ++ print_row("singleton", row, step, ++ get_singleton_table_printable_row(row)) + n += 1 + + if not n: +@@ -637,7 +679,8 @@ def do_idl(schema_file, remote, *commands): def mock_notify(event, row, updates=None): output = "%03d: " % step output += "event:" + str(event) + ", row={" - output += get_simple_table_printable_row(row) + "}, updates=" -+ output += get_simple_table_printable_row(row, -+ 'l2', 'l1') + "}, updates=" ++ output += get_simple_table_printable_row(row, 'l2', 'l1') + "}, " ++ output += get_simple_printable_row_string(row, ["uuid"]) + ", updates=" if updates is None: output += "None" else: diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 513490c..f021b9f 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 7%{?dist} +Release: 8%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -697,6 +697,10 @@ exit 0 %endif %changelog +* Thu Apr 01 2021 Open vSwitch CI - 2.15.0-8 +- Merging upstream branch-2.15 + [147a0970bec73a4133ac1fbeebb0cd16887f2e21] + * Wed Mar 31 2021 Open vSwitch CI - 2.15.0-7 - Merging upstream branch-2.15 [cbb083630e893c069842cbad76381b677dd15298]