{"id":815904,"url":"http://patchwork.ozlabs.org/api/patches/815904/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-52-blp@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919220125.32535-52-blp@ovn.org>","list_archive_url":null,"date":"2017-09-19T22:01:24","name":"[ovs-dev,RFC,51/52] ovsdb-tool: Add new \"db-name\" and \"schema-name\" commands.","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"5284bb3ae79ca5c3991bb9e544dfed6281cf0c55","submitter":{"id":67603,"url":"http://patchwork.ozlabs.org/api/people/67603/?format=json","name":"Ben Pfaff","email":"blp@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-52-blp@ovn.org/mbox/","series":[{"id":3975,"url":"http://patchwork.ozlabs.org/api/series/3975/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=3975","date":"2017-09-19T22:00:34","name":"clustering implementation","version":1,"mbox":"http://patchwork.ozlabs.org/series/3975/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815904/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815904/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=)","Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxcw14hvwz9sNr\n\tfor ;\n\tWed, 20 Sep 2017 08:28:17 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 7F670D6C;\n\tTue, 19 Sep 2017 22:03:03 +0000 (UTC)","from smtp2.linuxfoundation.org (smtp2.linux-foundation.org\n\t[172.17.192.36])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 93134D61\n\tfor ; Tue, 19 Sep 2017 22:03:01 +0000 (UTC)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby smtp2.linuxfoundation.org (Postfix) with ESMTPS id 162D41DCE2\n\tfor ; Tue, 19 Sep 2017 22:03:01 +0000 (UTC)","from sigabrt.benpfaff.org (unknown [208.91.2.3])\n\t(Authenticated sender: blp@ovn.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 3560A172094;\n\tWed, 20 Sep 2017 00:02:57 +0200 (CEST)"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","X-Originating-IP":"208.91.2.3","From":"Ben Pfaff ","To":"dev@openvswitch.org","Date":"Tue, 19 Sep 2017 15:01:24 -0700","Message-Id":"<20170919220125.32535-52-blp@ovn.org>","X-Mailer":"git-send-email 2.10.2","In-Reply-To":"<20170919220125.32535-1-blp@ovn.org>","References":"<20170919220125.32535-1-blp@ovn.org>","X-Spam-Status":"No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW\n\tautolearn=ham version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp2.linux-foundation.org","Cc":"Ben Pfaff ","Subject":"[ovs-dev] [PATCH RFC 51/52] ovsdb-tool: Add new \"db-name\" and\n\t\"schema-name\" commands.","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"Signed-off-by: Ben Pfaff \n---\n NEWS | 1 +\n ovsdb/ovsdb-tool.1.in | 4 ++++\n ovsdb/ovsdb-tool.c | 26 ++++++++++++++++++++++++++\n 3 files changed, 31 insertions(+)","diff":"diff --git a/NEWS b/NEWS\nindex fc8db4965737..d7d594546f01 100644\n--- a/NEWS\n+++ b/NEWS\n@@ -9,6 +9,7 @@ Post-v2.8.0\n ovsdb-server(5) for more details.\n * ovsdb-client: New \"get-schema-cksum\" and \"query\" commands.\n * ovsdb-client: New \"backup\" and \"restore\" commands.\n+ * ovsdb-tool: New \"db-name\" and \"schema-name\" commands.\n - ovs-vsctl and other commands that display data in tables now support a\n --max-column-width option to limit column width.\n - OVN:\ndiff --git a/ovsdb/ovsdb-tool.1.in b/ovsdb/ovsdb-tool.1.in\nindex ebfd33b27163..f6144e7021c0 100644\n--- a/ovsdb/ovsdb-tool.1.in\n+++ b/ovsdb/ovsdb-tool.1.in\n@@ -37,6 +37,10 @@ ovsdb\\-tool \\- Open vSwitch database management utility\n .br\n \\fBovsdb\\-tool \\fR[\\fIoptions\\fR] [\\fB\\-m\\fR | \\fB\\-\\-more\\fR]... \\fBshow\\-log \\fR[\\fIdb\\fR]\n .br\n+\\fBovsdb\\-tool \\fR[\\fIoptions\\fR] \\fBdb\\-name \\fR[\\fIdb\\fR]\n+.br\n+\\fBovsdb\\-tool \\fR[\\fIoptions\\fR] \\fBschema\\-name \\fR[\\fIschema\\fR]\n+.br\n \\fBovsdb\\-tool help\\fR\n .so lib/vlog-syn.man\n .so lib/common-syn.man\ndiff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c\nindex 45b3f7348c3d..228bcf1dac54 100644\n--- a/ovsdb/ovsdb-tool.c\n+++ b/ovsdb/ovsdb-tool.c\n@@ -135,8 +135,10 @@ usage(void)\n \" create [DB [SCHEMA]] create DB with the given SCHEMA\\n\"\n \" compact [DB [DST]] compact DB in-place (or to DST)\\n\"\n \" convert [DB [SCHEMA [DST]]] convert DB to SCHEMA (to DST)\\n\"\n+ \" db-name [DB] report name of schema used by DB\\n\"\n \" db-version [DB] report version of schema used by DB\\n\"\n \" db-cksum [DB] report checksum of schema used by DB\\n\"\n+ \" schema-name [SCHEMA] report SCHEMA's name\\n\"\n \" schema-version [SCHEMA] report SCHEMA's schema version\\n\"\n \" schema-cksum [SCHEMA] report SCHEMA's checksum\\n\"\n \" query [DB] TRNS execute read-only transaction on DB\\n\"\n@@ -325,6 +327,17 @@ do_needs_conversion(struct ovs_cmdl_context *ctx)\n }\n \n static void\n+do_db_name(struct ovs_cmdl_context *ctx)\n+{\n+ const char *db_file_name = ctx->argc >= 2 ? ctx->argv[1] : default_db();\n+ struct ovsdb_schema *schema;\n+\n+ check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema));\n+ puts(schema->name);\n+ ovsdb_schema_destroy(schema);\n+}\n+\n+static void\n do_db_version(struct ovs_cmdl_context *ctx)\n {\n const char *db_file_name = ctx->argc >= 2 ? ctx->argv[1] : default_db();\n@@ -369,6 +382,17 @@ do_schema_cksum(struct ovs_cmdl_context *ctx)\n }\n \n static void\n+do_schema_name(struct ovs_cmdl_context *ctx)\n+{\n+ const char *schema_file_name = ctx->argc >= 2 ? ctx->argv[1] : default_schema();\n+ struct ovsdb_schema *schema;\n+\n+ check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema));\n+ puts(schema->name);\n+ ovsdb_schema_destroy(schema);\n+}\n+\n+static void\n transact(bool read_only, int argc, char *argv[])\n {\n const char *db_file_name = argc >= 3 ? argv[1] : default_db();\n@@ -590,8 +614,10 @@ static const struct ovs_cmdl_command all_commands[] = {\n { \"compact\", \"[db [dst]]\", 0, 2, do_compact, OVS_RW },\n { \"convert\", \"[db [schema [dst]]]\", 0, 3, do_convert, OVS_RW },\n { \"needs-conversion\", NULL, 0, 2, do_needs_conversion, OVS_RO },\n+ { \"db-name\", \"[db]\", 0, 1, do_db_name, OVS_RO },\n { \"db-version\", \"[db]\", 0, 1, do_db_version, OVS_RO },\n { \"db-cksum\", \"[db]\", 0, 1, do_db_cksum, OVS_RO },\n+ { \"schema-name\", \"[schema]\", 0, 1, do_schema_name, OVS_RO },\n { \"schema-version\", \"[schema]\", 0, 1, do_schema_version, OVS_RO },\n { \"schema-cksum\", \"[schema]\", 0, 1, do_schema_cksum, OVS_RO },\n { \"query\", \"[db] trns\", 1, 2, do_query, OVS_RO },\n","prefixes":["ovs-dev","RFC","51/52"]}