When ovn-nbctl is running in daemon mode, nbctl_client attempts to parse table formatting options. The problem is that this then removes the table formatting options from the array of options passed to the server loop. The server loop resets the table formatting options to the defaults and then attempts again to parse table formatting options. Unfortunately, they aren't present any longer. The result is that tables are always formatted with the default style.
This patch solves the issue by not parsing the table formatting options in nbctl_client. Instead, the table formatting options are passed to the server loop and parsed there instead. Signed-off-by: Mark Michelson <[email protected]> --- ovn/utilities/ovn-nbctl.c | 1 - tests/ovn-nbctl.at | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index d65a9ba08..bff6d1380 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -5443,7 +5443,6 @@ nbctl_client(const char *socket_name, break; VLOG_OPTION_HANDLERS - TABLE_OPTION_HANDLERS(&table_style) case OPT_LOCAL: default: diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index 7d627cdc0..3f89874ba 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -1530,3 +1530,12 @@ name : "sw1" AT_CHECK([ovn-nbctl --columns=name list logical_switch sw1], [0], [dnl name : "sw1" ])]) + +OVN_NBCTL_TEST([ovn_nbctl_table_formatting], [table formatting], [ +dnl This test addresses a specific issue seen when running ovn-nbctl in +dnl daemon mode. We need to ensure that table formatting options are honored +dnl when listing database information. +AT_CHECK([ovn-nbctl ls-add sw1], [0], [ignore]) +AT_CHECK([ovn-nbctl --bare --columns=name list logical_switch sw1], [0], [dnl +sw1 +])]) -- 2.14.4 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
