mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

ofproto: Fix man page for tunnel related commands.

Browse Source 
Fixed the manual page to indicate that both IPv4/IPv6
are supported. Also added missing pkt_mark on one side
and fixed the "gw" and "bridge" notation quirks.

Acked-by: Eelco Chaudron <echaudro@redhat.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Nobuhiro MIKI <nmiki@yahoo-corp.jp>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Nobuhiro MIKI 2023-03-06 11:49:17 +09:00 committed by Ilya Maximets
parent 915f084b9f
commit 01acf09f74
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ovs-router.c
View File

@ -359,7 +359,7 @@ ovs_router_add(struct unixctl_conn *conn, int argc,
is_ipv6 = true; is_ipv6 = true;
} else { } else {
unixctl_command_reply_error(conn, unixctl_command_reply_error(conn,
"Invalid 'ip_addr/prefix_len' parameter"); "Invalid 'ip/plen' parameter");
return; return;
} }
@ -537,12 +537,12 @@ ovs_router_init(void)
fatal_signal_add_hook(ovs_router_flush_handler, NULL, NULL, true); fatal_signal_add_hook(ovs_router_flush_handler, NULL, NULL, true);
classifier_init(&cls, NULL); classifier_init(&cls, NULL);
unixctl_command_register("ovs/route/add", unixctl_command_register("ovs/route/add",
"ip_addr/prefix_len out_br_name [gw] " "ip/plen output_bridge [gw] "
"[pkt_mark=mark]", "[pkt_mark=mark]",
2, 4, ovs_router_add, NULL); 2, 4, ovs_router_add, NULL);
unixctl_command_register("ovs/route/show", "", 0, 0, unixctl_command_register("ovs/route/show", "", 0, 0,
ovs_router_show, NULL); ovs_router_show, NULL);
unixctl_command_register("ovs/route/del", "ip_addr/prefix_len " unixctl_command_register("ovs/route/del", "ip/plen "
"[pkt_mark=mark]", 1, 2, ovs_router_del, "[pkt_mark=mark]", 1, 2, ovs_router_del,
NULL); NULL);
unixctl_command_register("ovs/route/lookup", "ip_addr " unixctl_command_register("ovs/route/lookup", "ip_addr "

8
ofproto/ofproto-tnl-unixctl.man
View File

@ -1,8 +1,8 @@
.SS "OPENVSWITCH TUNNELING COMMANDS" .SS "OPENVSWITCH TUNNELING COMMANDS"
These commands query and modify OVS tunnel components. These commands query and modify OVS tunnel components.
. .
.IP "\fBovs/route/add ipv4_address/plen output_bridge [GW]\fR" .IP "\fBovs/route/add ip/plen output_bridge [gw] [pkt_mark=mark]\fR"
Adds ipv4_address/plen route to vswitchd routing table. output_bridge Adds ip/plen route to vswitchd routing table. output_bridge
needs to be OVS bridge name. This command is useful if OVS cached needs to be OVS bridge name. This command is useful if OVS cached
routes does not look right. routes does not look right.
. .
@ -10,8 +10,8 @@ routes does not look right.
Print all routes in OVS routing table, This includes routes cached Print all routes in OVS routing table, This includes routes cached
from system routing table and user configured routes. from system routing table and user configured routes.
. .
.IP "\fBovs/route/del ipv4_address/plen\fR" .IP "\fBovs/route/del ip/plen [pkt_mark=mark]\fR"
Delete ipv4_address/plen route from OVS routing table. Delete ip/plen route from OVS routing table.
. .
.IP "\fBtnl/neigh/show\fR" .IP "\fBtnl/neigh/show\fR"
.IP "\fBtnl/arp/show\fR" .IP "\fBtnl/arp/show\fR"

2
tests/ovs-router.at
View File

@ -16,7 +16,7 @@ Error while inserting route.
ovs-appctl: ovs-vswitchd: server returned an error ovs-appctl: ovs-vswitchd: server returned an error
]) ])
AT_CHECK([ovs-appctl ovs/route/add 1.1.foo.bar/24 br0 2.2.2.10], [2], [], [dnl AT_CHECK([ovs-appctl ovs/route/add 1.1.foo.bar/24 br0 2.2.2.10], [2], [], [dnl
Invalid 'ip_addr/prefix_len' parameter Invalid 'ip/plen' parameter
ovs-appctl: ovs-vswitchd: server returned an error ovs-appctl: ovs-vswitchd: server returned an error
]) ])
AT_CHECK([ovs-appctl ovs/route/add 2.2.2.4/24 br0 pkt_mark=baz], [2], [], [dnl AT_CHECK([ovs-appctl ovs/route/add 2.2.2.4/24 br0 pkt_mark=baz], [2], [], [dnl