[v4,1/4] app/testpmd: put set vxlan/nvgre help in filters section

Message ID 7655e72dbc4cdf0247c082823ed7ea09b82a1b1b.1563365940.git.jackmin@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series app/testpmd: support raw encap/decap actions |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS

Commit Message

Xiaoyu Min July 17, 2019, 12:27 p.m. UTC
  The help string of set vxlan*, set nvgre* are in "config"" section.
But they acutally do not alter NIC or testpmd's configuration and
they will be used by "flow" command later.

Put them in "filters" section along with "flow" command seems more
reasonable.

Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
---
 app/test-pmd/cmdline.c | 55 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 27 deletions(-)
  

Patch

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 01dd45f27c..f7eb8a7776 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -733,33 +733,6 @@  static void cmd_help_long_parsed(void *parsed_result,
 			"show port (port_id) queue-region\n"
 			"    show all queue region related configuration info\n\n"
 
-			"vxlan ip-version (ipv4|ipv6) vni (vni) udp-src"
-			" (udp-src) udp-dst (udp-dst) ip-src (ip-src) ip-dst"
-			" (ip-dst) eth-src (eth-src) eth-dst (eth-dst)\n"
-			"       Configure the VXLAN encapsulation for flows.\n\n"
-
-			"vxlan-with-vlan ip-version (ipv4|ipv6) vni (vni)"
-			" udp-src (udp-src) udp-dst (udp-dst) ip-src (ip-src)"
-			" ip-dst (ip-dst) vlan-tci (vlan-tci) eth-src (eth-src)"
-			" eth-dst (eth-dst)\n"
-			"       Configure the VXLAN encapsulation for flows.\n\n"
-
-			"vxlan-tos-ttl ip-version (ipv4|ipv6) vni (vni) udp-src"
-			" (udp-src) udp-dst (udp-dst) ip-tos (ip-tos) ip-ttl (ip-ttl)"
-			" ip-src (ip-src) ip-dst (ip-dst) eth-src (eth-src)"
-			" eth-dst (eth-dst)\n"
-			"       Configure the VXLAN encapsulation for flows.\n\n"
-
-			"nvgre ip-version (ipv4|ipv6) tni (tni) ip-src"
-			" (ip-src) ip-dst (ip-dst) eth-src (eth-src) eth-dst"
-			" (eth-dst)\n"
-			"       Configure the NVGRE encapsulation for flows.\n\n"
-
-			"nvgre-with-vlan ip-version (ipv4|ipv6) tni (tni)"
-			" ip-src (ip-src) ip-dst (ip-dst) vlan-tci (vlan-tci)"
-			" eth-src (eth-src) eth-dst (eth-dst)\n"
-			"       Configure the NVGRE encapsulation for flows.\n\n"
-
 			, list_pkt_forwarding_modes()
 		);
 	}
@@ -1137,6 +1110,34 @@  static void cmd_help_long_parsed(void *parsed_result,
 			"flow isolate {port_id} {boolean}\n"
 			"    Restrict ingress traffic to the defined"
 			" flow rules\n\n"
+
+			"set vxlan ip-version (ipv4|ipv6) vni (vni) udp-src"
+			" (udp-src) udp-dst (udp-dst) ip-src (ip-src) ip-dst"
+			" (ip-dst) eth-src (eth-src) eth-dst (eth-dst)\n"
+			"       Configure the VXLAN encapsulation for flows.\n\n"
+
+			"set vxlan-with-vlan ip-version (ipv4|ipv6) vni (vni)"
+			" udp-src (udp-src) udp-dst (udp-dst) ip-src (ip-src)"
+			" ip-dst (ip-dst) vlan-tci (vlan-tci) eth-src (eth-src)"
+			" eth-dst (eth-dst)\n"
+			"       Configure the VXLAN encapsulation for flows.\n\n"
+
+			"set vxlan-tos-ttl ip-version (ipv4|ipv6) vni (vni) udp-src"
+			" (udp-src) udp-dst (udp-dst) ip-tos (ip-tos) ip-ttl (ip-ttl)"
+			" ip-src (ip-src) ip-dst (ip-dst) eth-src (eth-src)"
+			" eth-dst (eth-dst)\n"
+			"       Configure the VXLAN encapsulation for flows.\n\n"
+
+			"set nvgre ip-version (ipv4|ipv6) tni (tni) ip-src"
+			" (ip-src) ip-dst (ip-dst) eth-src (eth-src) eth-dst"
+			" (eth-dst)\n"
+			"       Configure the NVGRE encapsulation for flows.\n\n"
+
+			"set nvgre-with-vlan ip-version (ipv4|ipv6) tni (tni)"
+			" ip-src (ip-src) ip-dst (ip-dst) vlan-tci (vlan-tci)"
+			" eth-src (eth-src) eth-dst (eth-dst)\n"
+			"       Configure the NVGRE encapsulation for flows.\n\n"
+
 		);
 	}