From d7efcee90fa27427e246d1c96973f36a2b944b40 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Wed, 17 Jul 2019 20:27:07 +0800 Subject: [PATCH] app/testpmd: move VXLAN/NVGRE help in filters section The help string of set vxlan*, set nvgre* are in "config" section. But they actually 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 Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 55 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 27 deletions(-) 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" + ); } -- 2.20.1