app/testpmd: clean metering and policing commands

[dpdk.git] / app / test-pmd / cmdline.c

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index f71d963..fd735d8 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -698,7 +698,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "set port (port_id) queue-region flush (on|off)\n"
                        "    flush all queue region related configuration\n\n"
 
-                       "add port meter profile srtcm_rfc2697 (port_id) (profile_id) (cir) (cbs) (ebs) (color_aware)\n"
+                       "add port meter profile srtcm_rfc2697 (port_id) (profile_id) (cir) (cbs) (ebs)\n"
                        "    meter profile add - srtcm rfc 2697\n\n"
 
                        "add port meter profile trtcm_rfc2698 (port_id) (profile_id) (cir) (pir) (cbs) (pbs)\n"
@@ -710,7 +710,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "del port meter profile (port_id) (profile_id)\n"
                        "    meter profile delete\n\n"
 
-                       "set port meter (port_id) (mtr_id) (profile_id) (g_action) (y_action) (r_action) (stats_mask) (shared)\n"
+                       "create port meter (port_id) (mtr_id) (profile_id) (meter_enable)\n"
+                       "(g_action) (y_action) (r_action) (stats_mask) (shared)\n"
+                       "(use_pre_meter_color) [(dscp_tbl_entry0) (dscp_tbl_entry1)...\n"
+                       "(dscp_tbl_entry63)]\n"
                        "    meter create\n\n"
 
                        "del port meter (port_id) (mtr_id)\n"
@@ -719,7 +722,8 @@ 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 policer action (port_id) (mtr_id) (color) (action)\n"
+                       "set port meter policer action (port_id) (mtr_id) (action_mask)\n"
+                       "(action0) [(action1) (action2)]\n"
                        "    meter update policer action\n\n"
 
                        "set port meter stats mask (port_id) (mtr_id) (stats_mask)\n"
@@ -3352,7 +3356,7 @@ cmdline_parse_token_num_t cmd_vlan_tpid_tpid =
                              tp_id, UINT16);
 cmdline_parse_token_num_t cmd_vlan_tpid_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_vlan_tpid = {
        .f = cmd_vlan_tpid_parsed,
@@ -15688,7 +15692,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_add_port_meter_profile_srtcm,
        (cmdline_parse_inst_t *)&cmd_add_port_meter_profile_trtcm,
        (cmdline_parse_inst_t *)&cmd_del_port_meter_profile,
-       (cmdline_parse_inst_t *)&cmd_set_port_meter,
+       (cmdline_parse_inst_t *)&cmd_create_port_meter,
        (cmdline_parse_inst_t *)&cmd_del_port_meter,
        (cmdline_parse_inst_t *)&cmd_set_port_meter_profile,
        (cmdline_parse_inst_t *)&cmd_set_port_meter_policer_action,