From patchwork Sat Sep 12 03:46:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 517071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id B7D6114012C for ; Sat, 12 Sep 2015 13:47:08 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 32E1822C433; Fri, 11 Sep 2015 20:46:51 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 7FA0522C432 for ; Fri, 11 Sep 2015 20:46:49 -0700 (PDT) Received: from bar3.cudamail.com (bar1 [192.168.15.1]) by mx3v1.cudamail.com (Postfix) with ESMTP id 03049618658 for ; Fri, 11 Sep 2015 21:46:49 -0600 (MDT) X-ASG-Debug-ID: 1442029608-03dd7b3c9c00d50001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar3.cudamail.com with ESMTP id IfJ67AwaGPjtebHw (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 11 Sep 2015 21:46:48 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mail-pa0-f48.google.com) (209.85.220.48) by mx3-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 12 Sep 2015 03:46:48 -0000 Received-SPF: unknown (mx3-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.48 Received: by padhk3 with SMTP id hk3so91334977pad.3 for ; Fri, 11 Sep 2015 20:46:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bxOYyVXJN1EjbDybgDE/LduZEUXI8zwDFXtACXXwy2k=; b=FyM/8wMslduduve7XZtcBdWq8ip+Gl7xFCyJVZ0CGs9Syira2jMxxrxHmGZ8T6gdsW XwHTajOJmY3tSOsao67wTxz+hFnTc5fKQP9Y1D5dfBoFuOXPGxlNS0yi0N26jQrzRgX7 2RYttc2mfNZw3oPwXgIyVflyFQMl6O0fCKITv889PgFva3gB9Uu3SCOf1g44aC8Wzm65 ugikvAO37MHrfpCEZNRPtshoA41FmlmeQSahvcNXscqLlcx56BVBph7x5HeEAlp4SB7z Vn3U/4zwLD+/HPBihf4SGp6vTinXeWjBBWa/qRVWdqCUyWx2RzxGAsFVtf06aKSy0Txg 4oJg== X-Gm-Message-State: ALoCoQm2V02XoC1pz8Dla5FtgE+vqBXAWfrBEgGtpzMtidMdjvCdQY5bdSJR/RcW5qVM6IV361oF X-Received: by 10.66.146.4 with SMTP id sy4mr5020767pab.79.1442029607805; Fri, 11 Sep 2015 20:46:47 -0700 (PDT) Received: from sigabrt.benpfaff.org (173-228-112-165.dsl.dynamic.fusionbroadband.com. [173.228.112.165]) by smtp.gmail.com with ESMTPSA id cn4sm2994105pbc.94.2015.09.11.20.46.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Sep 2015 20:46:46 -0700 (PDT) X-CudaMail-Envelope-Sender: blp@nicira.com X-Barracuda-Apparent-Source-IP: 173.228.112.165 From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-910063444 X-CudaMail-DTE: 091115 X-CudaMail-Originating-IP: 209.85.220.48 Date: Fri, 11 Sep 2015 20:46:38 -0700 X-ASG-Orig-Subj: [##CM-V2-910063444##][PATCH 4/4] ovn-sbctl: Improve usage message. Message-Id: <1442029598-6778-5-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1442029598-6778-1-git-send-email-blp@nicira.com> References: <1442029598-6778-1-git-send-email-blp@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1442029608 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 4/4] ovn-sbctl: Improve usage message. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Ben Pfaff Acked-by: Andy Zhou --- ovn/utilities/ovn-sbctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c index 1104167..f7cb156 100644 --- a/ovn/utilities/ovn-sbctl.c +++ b/ovn/utilities/ovn-sbctl.c @@ -41,6 +41,7 @@ #include "sset.h" #include "shash.h" #include "stream-ssl.h" +#include "stream.h" #include "table.h" #include "timeval.h" #include "util.h" @@ -282,13 +283,13 @@ static void usage(void) { printf("\ -%s: ovs-vswitchd management utility\n\ +%s: OVN southbound DB management utility\n\ \n\ -for debugging and testing only, never use it in production\n\ +For debugging and testing only, not for use in production.\n\ \n\ usage: %s [OPTIONS] COMMAND [ARG...]\n\ \n\ -SouthBound DB commands:\n\ +General commands:\n\ show print overview of database contents\n\ \n\ Chassis commands:\n\ @@ -311,7 +312,7 @@ Logical flow commands:\n\ Options:\n\ --db=DATABASE connect to DATABASE\n\ (default: %s)\n\ - -t, --timeout=SECS wait at most SECS seconds for ovs-vswitchd\n\ + -t, --timeout=SECS wait at most SECS seconds\n\ --dry-run do not commit changes to database\n\ --oneline print exactly one line of output per command\n", program_name, program_name, ctl_get_db_cmd_usage(), ctl_default_db()); @@ -322,6 +323,7 @@ Options:\n\ Other options:\n\ -h, --help display this help message\n\ -V, --version display version information\n"); + stream_usage("database", true, true, false); exit(EXIT_SUCCESS); }