From patchwork Wed Sep 2 23:44:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 513706 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 46CC01401F0 for ; Thu, 3 Sep 2015 09:45:40 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id BA39A10A9B; Wed, 2 Sep 2015 16:44:36 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 509BF10A4E for ; Wed, 2 Sep 2015 16:44:36 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id BD3C01E0442 for ; Wed, 2 Sep 2015 17:44:35 -0600 (MDT) X-ASG-Debug-ID: 1441237475-09eadd4ef358670001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id iWkJuzxvGUxUXcT9 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 02 Sep 2015 17:44:35 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f42.google.com) (209.85.220.42) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 2 Sep 2015 23:44:35 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.42 Received: by pacfv12 with SMTP id fv12so26690609pac.2 for ; Wed, 02 Sep 2015 16:44:34 -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=rSkHzB9c6HzZYawlGGlIGhFaIoYmiEge0m4llw6/USc=; b=iykwu54XjzbEZNyvfDqoRdF7ghAZYZT0fIHgQyLkVBYGsjNr4NvEuXA/xtC2oqn1GU m7Z3QrOaxUc+FJvbZhjYFF5Jr+NU+ICmNkSIICCNyMTn+TGG7I9PcSL8nsCQlc5L3N9X mgeVB1OHklJtrxrs2gwRMa79dgRFPrALo0/GeQauM6Vky4E81cxCK8xO2HGb5FN2LHyu TJn3FCwh8HOghVKE9cN7dlUKdAR6C582TKQT23GXIXjC34qrRAAcoahVVDOBwimVnyfv devow8ggboRICabU+RJCtxB/HQb+VWO7gQTrkkan/A+ByTTEnd/hmHlQtZEqn60kPQEl kL1A== X-Gm-Message-State: ALoCoQlC1/PrmRNOrRLXfxDA/kiMCh2kX89lhjl5/5ZfpEYiCTfVI0ZxrE5ga8Lxhr5vZcW4oEg2 X-Received: by 10.68.168.161 with SMTP id zx1mr61318903pbb.35.1441237474509; Wed, 02 Sep 2015 16:44:34 -0700 (PDT) Received: from sigabrt.benpfaff.org ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id f5sm23046151pas.23.2015.09.02.16.44.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Sep 2015 16:44:33 -0700 (PDT) X-CudaMail-Envelope-Sender: blp@nicira.com X-Barracuda-Apparent-Source-IP: 208.91.2.4 From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-901094977 X-CudaMail-DTE: 090215 X-CudaMail-Originating-IP: 209.85.220.42 Date: Wed, 2 Sep 2015 16:44:08 -0700 X-ASG-Orig-Subj: [##CM-E2-901094977##][PATCH v2 11/14] ovn-sbctl: Improve usage message. Message-Id: <1441237451-17940-11-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1441237451-17940-1-git-send-email-blp@nicira.com> References: <1441237451-17940-1-git-send-email-blp@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1441237475 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 v2 11/14] 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 --- 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 1627a8e..89bd0a2 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); }