diff options
| author | Nobuhiro MIKI <nmiki@yahoo-corp.jp> | 2023-03-06 11:49:17 +0900 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2023-03-07 18:23:12 +0100 |
| commit | 01acf09f746e4678e81b545b38ca682171628d02 (patch) | |
| tree | 258b531c03bdbb03a36fd887c09c9dbd037607be | |
| parent | 915f084b9ff80f32e265c66c9b1aa51f9bbbd275 (diff) | |
| download | openvswitch-01acf09f746e4678e81b545b38ca682171628d02.tar.gz | |
ofproto: Fix man page for tunnel related commands.
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>
| -rw-r--r-- | lib/ovs-router.c | 6 | ||||
| -rw-r--r-- | ofproto/ofproto-tnl-unixctl.man | 8 | ||||
| -rw-r--r-- | tests/ovs-router.at | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/ovs-router.c b/lib/ovs-router.c index b5ac1edb6..02fce9095 100644 --- a/lib/ovs-router.c +++ b/lib/ovs-router.c @@ -359,7 +359,7 @@ ovs_router_add(struct unixctl_conn *conn, int argc, is_ipv6 = true; } else { unixctl_command_reply_error(conn, - "Invalid 'ip_addr/prefix_len' parameter"); + "Invalid 'ip/plen' parameter"); return; } @@ -537,12 +537,12 @@ ovs_router_init(void) fatal_signal_add_hook(ovs_router_flush_handler, NULL, NULL, true); classifier_init(&cls, NULL); unixctl_command_register("ovs/route/add", - "ip_addr/prefix_len out_br_name [gw] " + "ip/plen output_bridge [gw] " "[pkt_mark=mark]", 2, 4, ovs_router_add, NULL); unixctl_command_register("ovs/route/show", "", 0, 0, 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, NULL); unixctl_command_register("ovs/route/lookup", "ip_addr " diff --git a/ofproto/ofproto-tnl-unixctl.man b/ofproto/ofproto-tnl-unixctl.man index 13a465119..6ed7e7fce 100644 --- a/ofproto/ofproto-tnl-unixctl.man +++ b/ofproto/ofproto-tnl-unixctl.man @@ -1,8 +1,8 @@ .SS "OPENVSWITCH TUNNELING COMMANDS" These commands query and modify OVS tunnel components. . -.IP "\fBovs/route/add ipv4_address/plen output_bridge [GW]\fR" -Adds ipv4_address/plen route to vswitchd routing table. output_bridge +.IP "\fBovs/route/add ip/plen output_bridge [gw] [pkt_mark=mark]\fR" +Adds ip/plen route to vswitchd routing table. output_bridge needs to be OVS bridge name. This command is useful if OVS cached 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 from system routing table and user configured routes. . -.IP "\fBovs/route/del ipv4_address/plen\fR" -Delete ipv4_address/plen route from OVS routing table. +.IP "\fBovs/route/del ip/plen [pkt_mark=mark]\fR" +Delete ip/plen route from OVS routing table. . .IP "\fBtnl/neigh/show\fR" .IP "\fBtnl/arp/show\fR" diff --git a/tests/ovs-router.at b/tests/ovs-router.at index a36990f1e..ec3b1dffe 100644 --- a/tests/ovs-router.at +++ b/tests/ovs-router.at @@ -16,7 +16,7 @@ Error while inserting route. 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 -Invalid 'ip_addr/prefix_len' parameter +Invalid 'ip/plen' parameter 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 |