From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D9976A09E4 for ; Fri, 5 Feb 2021 14:39:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C63841889A0; Fri, 5 Feb 2021 14:39:37 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 90E924067B; Fri, 5 Feb 2021 14:39:35 +0100 (CET) IronPort-SDR: CUeyvNV5b4hoAYv1mmKK2r0nwoLF2KeAq/w9QFDPSLOU/7zy0SPqed+o8LipJ4R8PerO7KP4A0 7teLic5uSe/g== X-IronPort-AV: E=McAfee;i="6000,8403,9885"; a="242935561" X-IronPort-AV: E=Sophos;i="5.81,154,1610438400"; d="scan'208";a="242935561" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2021 05:39:31 -0800 IronPort-SDR: QO0vmpVzh+WrE+u62KNs3EZ3NL6c7qmK1rkYsBJHoi/vkGZppIGqCoWNz4Zy+P/pGMUll5sFim jdjoz/InYGoQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,154,1610438400"; d="scan'208";a="434457631" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.27]) by orsmga001.jf.intel.com with ESMTP; 05 Feb 2021 05:39:28 -0800 From: Ferruh Yigit To: Wenzhuo Lu , Xiaoyun Li , Bernard Iremonger , Jasvinder Singh , Jingjing Wu , Cristian Dumitrescu , Adrien Mazarguil Cc: Ferruh Yigit , dev@dpdk.org, stable@dpdk.org Date: Fri, 5 Feb 2021 13:39:26 +0000 Message-Id: <20210205133926.779938-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH] app/testpmd: fix meter commands help strings X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Helps strings syntax is "command : description", the 'command' part was missing, updated command help strings. Fixes: 281eeb8afc55 ("app/testpmd: add commands for metering and policing") Fixes: 30ffb4e67ee3 ("app/testpmd: add commands traffic metering and policing") Fixes: e63b50162aa3 ("app/testpmd: clean metering and policing commands") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit --- Cc: jasvinder.singh@intel.com Cc: cristian.dumitrescu@intel.com - "set port meter dscp table" documented with 'port_id' & 'mtr_id', but command itself is not requiring it, can be better to double check the intention in the command. - In command "show port meter stats yes|no", it is not clear what 'yes|no' is, can be better to have a 'clear' keyword there: "show port meter stats clear yes|no" - 'meter' commands seems using many high level commands, that is harder to remember when you take all commands into account: "show port meter ..." "add port meter ..." "del port meter ..." "create port meter ..." "enable port meter ..." "disable port meter ..." "set port meter ..." And some high level commands created just for 'meter'. Instead I think it is better to group the commands, like: "port meter [add,del,create,enable,disable] ..." "show port meter ..." It is already too late but it worth to keep in mind for the possible future update. --- app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_mtr.c | 32 ++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 59722d268bc3..1b9da38fb745 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -719,7 +719,7 @@ static void cmd_help_long_parsed(void *parsed_result, "set port meter profile (port_id) (mtr_id) (profile_id)\n" " meter update meter profile\n\n" - "set port meter dscp table (port_id) (mtr_id) [(dscp_tbl_entry0)\n" + "set port meter dscp table [(dscp_tbl_entry0)\n" "(dscp_tbl_entry1)...(dscp_tbl_entry63)]\n" " update meter dscp table entries\n\n" diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c index 399ee56e07d9..a4f0cbe9db3f 100644 --- a/app/test-pmd/cmdline_mtr.c +++ b/app/test-pmd/cmdline_mtr.c @@ -312,7 +312,7 @@ static void cmd_show_port_meter_cap_parsed(void *parsed_result, cmdline_parse_inst_t cmd_show_port_meter_cap = { .f = cmd_show_port_meter_cap_parsed, .data = NULL, - .help_str = "Show port meter cap", + .help_str = "show port meter cap ", .tokens = { (void *)&cmd_show_port_meter_cap_show, (void *)&cmd_show_port_meter_cap_port, @@ -408,7 +408,7 @@ static void cmd_add_port_meter_profile_srtcm_parsed(void *parsed_result, cmdline_parse_inst_t cmd_add_port_meter_profile_srtcm = { .f = cmd_add_port_meter_profile_srtcm_parsed, .data = NULL, - .help_str = "Add port meter profile srtcm (rfc2697)", + .help_str = "add port meter profile srtcm_rfc2697 ", .tokens = { (void *)&cmd_add_port_meter_profile_srtcm_add, (void *)&cmd_add_port_meter_profile_srtcm_port, @@ -515,7 +515,7 @@ static void cmd_add_port_meter_profile_trtcm_parsed(void *parsed_result, cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm = { .f = cmd_add_port_meter_profile_trtcm_parsed, .data = NULL, - .help_str = "Add port meter profile trtcm (rfc2698)", + .help_str = "add port meter profile trtcm_rfc2698 ", .tokens = { (void *)&cmd_add_port_meter_profile_trtcm_add, (void *)&cmd_add_port_meter_profile_trtcm_port, @@ -627,7 +627,7 @@ static void cmd_add_port_meter_profile_trtcm_rfc4115_parsed( cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm_rfc4115 = { .f = cmd_add_port_meter_profile_trtcm_rfc4115_parsed, .data = NULL, - .help_str = "Add port meter profile trtcm (rfc4115)", + .help_str = "add port meter profile trtcm_rfc4115 ", .tokens = { (void *)&cmd_add_port_meter_profile_trtcm_rfc4115_add, (void *)&cmd_add_port_meter_profile_trtcm_rfc4115_port, @@ -702,7 +702,7 @@ static void cmd_del_port_meter_profile_parsed(void *parsed_result, cmdline_parse_inst_t cmd_del_port_meter_profile = { .f = cmd_del_port_meter_profile_parsed, .data = NULL, - .help_str = "Delete port meter profile", + .help_str = "del port meter profile ", .tokens = { (void *)&cmd_del_port_meter_profile_del, (void *)&cmd_del_port_meter_profile_port, @@ -827,7 +827,9 @@ static void cmd_create_port_meter_parsed(void *parsed_result, cmdline_parse_inst_t cmd_create_port_meter = { .f = cmd_create_port_meter_parsed, .data = NULL, - .help_str = "Create port meter", + .help_str = "create port meter " + "yes|no R|Y|G|D R|Y|G|D R|Y|G|D " + " [ ...]", .tokens = { (void *)&cmd_create_port_meter_create, (void *)&cmd_create_port_meter_port, @@ -896,7 +898,7 @@ static void cmd_enable_port_meter_parsed(void *parsed_result, cmdline_parse_inst_t cmd_enable_port_meter = { .f = cmd_enable_port_meter_parsed, .data = NULL, - .help_str = "Enable port meter", + .help_str = "enable port meter ", .tokens = { (void *)&cmd_enable_port_meter_enable, (void *)&cmd_enable_port_meter_port, @@ -957,7 +959,7 @@ static void cmd_disable_port_meter_parsed(void *parsed_result, cmdline_parse_inst_t cmd_disable_port_meter = { .f = cmd_disable_port_meter_parsed, .data = NULL, - .help_str = "Disable port meter", + .help_str = "disable port meter ", .tokens = { (void *)&cmd_disable_port_meter_disable, (void *)&cmd_disable_port_meter_port, @@ -1018,7 +1020,7 @@ static void cmd_del_port_meter_parsed(void *parsed_result, cmdline_parse_inst_t cmd_del_port_meter = { .f = cmd_del_port_meter_parsed, .data = NULL, - .help_str = "Delete port meter", + .help_str = "del port meter ", .tokens = { (void *)&cmd_del_port_meter_del, (void *)&cmd_del_port_meter_port, @@ -1092,7 +1094,7 @@ static void cmd_set_port_meter_profile_parsed(void *parsed_result, cmdline_parse_inst_t cmd_set_port_meter_profile = { .f = cmd_set_port_meter_profile_parsed, .data = NULL, - .help_str = "Set port meter profile", + .help_str = "set port meter profile ", .tokens = { (void *)&cmd_set_port_meter_profile_set, (void *)&cmd_set_port_meter_profile_port, @@ -1166,7 +1168,8 @@ static void cmd_set_port_meter_dscp_table_parsed(void *parsed_result, cmdline_parse_inst_t cmd_set_port_meter_dscp_table = { .f = cmd_set_port_meter_dscp_table_parsed, .data = NULL, - .help_str = "Update port meter dscp table", + .help_str = "set port meter dscp table " + "[ ... ]", .tokens = { (void *)&cmd_set_port_meter_dscp_table_set, (void *)&cmd_set_port_meter_dscp_table_port, @@ -1276,7 +1279,8 @@ static void cmd_set_port_meter_policer_action_parsed(void *parsed_result, cmdline_parse_inst_t cmd_set_port_meter_policer_action = { .f = cmd_set_port_meter_policer_action_parsed, .data = NULL, - .help_str = "Set port meter policer action", + .help_str = "set port meter policer action " + " [ ]", .tokens = { (void *)&cmd_set_port_meter_policer_action_set, (void *)&cmd_set_port_meter_policer_action_port, @@ -1355,7 +1359,7 @@ static void cmd_set_port_meter_stats_mask_parsed(void *parsed_result, cmdline_parse_inst_t cmd_set_port_meter_stats_mask = { .f = cmd_set_port_meter_stats_mask_parsed, .data = NULL, - .help_str = "Set port meter stats mask", + .help_str = "set port meter stats mask ", .tokens = { (void *)&cmd_set_port_meter_stats_mask_set, (void *)&cmd_set_port_meter_stats_mask_port, @@ -1459,7 +1463,7 @@ static void cmd_show_port_meter_stats_parsed(void *parsed_result, cmdline_parse_inst_t cmd_show_port_meter_stats = { .f = cmd_show_port_meter_stats_parsed, .data = NULL, - .help_str = "Show port meter stats", + .help_str = "show port meter stats yes|no", .tokens = { (void *)&cmd_show_port_meter_stats_show, (void *)&cmd_show_port_meter_stats_port, -- 2.29.2