From: Ben Pfaff <blp@nicira.com>
Date: Thu, 6 Oct 2011 18:23:54 +0000 (-0700)
Subject: ovsdb-tool: Add abbreviated UUIDs to "show-log" even when we have a name.
X-Git-Tag: v1.3.0~42
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=a0a15a0071bbe31dc4e13fa1ef29edecd60cfa93

ovsdb-tool: Add abbreviated UUIDs to "show-log" even when we have a name.

The "show-log" command tries to give names to the rows to make it easier to
understand what's going on, but it's still important to see at least
partial UUIDs so that one can search the output for references to the rows
by UUID.
---

diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
index 0e4a52079..501a6738b 100644
--- a/ovsdb/ovsdb-tool.c
+++ b/ovsdb/ovsdb-tool.c
@@ -366,12 +366,12 @@ print_db_changes(struct shash *tables, struct shash *names)
 
             if (!old_name) {
                 if (new_name) {
-                    printf(" insert row %s:\n", new_name);
+                    printf(" insert row %s (%.8s):\n", new_name, row_uuid);
                 } else {
                     printf(" insert row %.8s:\n", row_uuid);
                 }
             } else {
-                printf(" row %s:\n", old_name);
+                printf(" row %s (%.8s):\n", old_name, row_uuid);
             }
 
             if (columns->type == JSON_OBJECT) {