docs: fixed to use unified "pcap trace" command

Type: docs
Fixes: 33909777c637 ("misc: unify pcap rx / tx / drop trace")
Signed-off-by: Nobuhiro MIKI <nmiki@yahoo-corp.jp>
Change-Id: I049616cfad300658e62e5026c0655ee6f07a2421

diff --git a/docs/developer/corearchitecture/vnet.rst b/docs/developer/corearchitecture/vnet.rst
index 812e2fb..2740ac0 100644 (file)
--- a/docs/developer/corearchitecture/vnet.rst
+++ b/docs/developer/corearchitecture/vnet.rst
@@ -499,7 +499,7 @@ These commands have the following optional parameters:
 
    512.
 
--  filter - Use the pcap rx / tx / drop trace filter, which must be
+-  filter - Use the pcap trace rx / tx / drop filter, which must be
    configured. Use classify filter pcap… to configure the filter. The
    filter will only be executed if the per-interface or any-interface
    tests fail.
@@ -528,8 +528,8 @@ packet trace capture filtering
 ------------------------------
 
 The “classify filter pcap \| \| trace” debug CLI command constructs an
-arbitrary set of packet classifier tables for use with “pcap rx \| tx \|
-drop trace,” and with the vpp packet tracer on a per-interface or
+arbitrary set of packet classifier tables for use with “pcap trace rx \|
+tx \| drop,” and with the vpp packet tracer on a per-interface or
 system-wide basis.
 
 Packets which match a rule in the classifier table chain will be traced.

diff --git a/extras/configs/pcapcli/setup.tracefilter b/extras/configs/pcapcli/setup.tracefilter
index db07a0e..18a55e1 100644 (file)
--- a/extras/configs/pcapcli/setup.tracefilter
+++ b/extras/configs/pcapcli/setup.tracefilter
@@ -17,6 +17,6 @@ packet-generator new {
     }
 }
 
-comment { Pick one, uncomment, and "pcap rx ..." or "trace add pg-input ..." }
+comment { Pick one, uncomment, and "pcap trace rx ..." or "trace add pg-input ..." }
 comment { classify filter trace mask l3 ip4 src match l3 ip4 src 192.168.1.15 }
 comment { classify filter pcap mask l3 ip4 src match l3 ip4 src 192.168.1.15 }

diff --git a/src/plugins/dispatch-trace/main.c b/src/plugins/dispatch-trace/main.c
index ce662dc..40a87dd 100644 (file)
--- a/src/plugins/dispatch-trace/main.c
+++ b/src/plugins/dispatch-trace/main.c
@@ -480,7 +480,7 @@ dispatch_trace_command_fn (vlib_main_t *vm, unformat_input_t *input,
  * pcap dispatch capture on...
  * @cliexend
  * Example of how to display the status of a tx packet capture in progress:
- * @cliexstart{pcap tx trace status}
+ * @cliexstart{pcap trace tx status}
  * max is 35, dispatch trace to file /tmp/vppTest.pcap
  * pcap tx capture is on: 20 of 35 pkts...
  * @cliexend

diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c
index c610c46..8ad8a6a 100644 (file)
--- a/src/vnet/classify/vnet_classify.c
+++ b/src/vnet/classify/vnet_classify.c
@@ -2054,7 +2054,7 @@ vlib_enable_disable_pkt_trace_filter (int enable)
 
 /*?
  * Construct an arbitrary set of packet classifier tables for use with
- * "pcap rx | tx trace," and with the vpp packet tracer
+ * "pcap trace rx | tx," and with the vpp packet tracer
  *
  * Packets which match a rule in the classifier table chain
  * will be traced. The tables are automatically ordered so that
@@ -2097,10 +2097,10 @@ vlib_enable_disable_pkt_trace_filter (int enable)
  * @cliexpar
  * Configuring the classify filter
  *
- * Configure a simple classify filter, and configure pcap rx trace to use it:
+ * Configure a simple classify filter, and configure pcap trace rx to use it:
  *
  * @cliexcmd{classify filter rx mask l3 ip4 src match l3 ip4 src 192.168.1.11}
- * <b><em>pcap rx trace on max 100 filter</em></b>
+ * <b><em>pcap trace rx max 100 filter</em></b>
  *
  * Configure another fairly simple filter
  *

diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 1c553e2..e5122c8 100644 (file)
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -2384,7 +2384,7 @@ pcap_trace_command_fn (vlib_main_t * vm,
  *   packet capture are preserved, so '<em>any</em>' can be used to reset
  *   the interface setting.
  *
- * - <b>filter</b> - Use the pcap rx / tx / drop trace filter, which
+ * - <b>filter</b> - Use the pcap trace rx / tx / drop filter, which
  *   must be configured. Use <b>classify filter pcap...</b> to configure the
  *   filter. The filter will only be executed if the per-interface or
  *   any-interface tests fail.