diff mbox series

[ovs-dev,v7,3/5] ofproto: Fix mam page for tunnel related commands.

Message ID 20230306024919.69574-4-nmiki@yahoo-corp.jp
State Accepted
Headers show
Series Add support for preffered src address in ovs-router | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/intel-ovs-compilation success test: success

Commit Message

Nobuhiro MIKI March 6, 2023, 2:49 a.m. UTC 
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.

Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Nobuhiro MIKI <nmiki@yahoo-corp.jp>
---
 lib/ovs-router.c                | 6 +++---
 ofproto/ofproto-tnl-unixctl.man | 8 ++++----
 tests/ovs-router.at             | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

Comments

Eelco Chaudron March 7, 2023, 3:01 p.m. UTC | #1 
On 6 Mar 2023, at 3:49, Nobuhiro MIKI wrote:

> 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.
>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: Nobuhiro MIKI <nmiki@yahoo-corp.jp>
> ---
>  lib/ovs-router.c                | 6 +++---
>  ofproto/ofproto-tnl-unixctl.man | 8 ++++----
>  tests/ovs-router.at             | 2 +-
>  3 files changed, 8 insertions(+), 8 deletions(-)

Changes look good to me! Thanks for following through!

Acked-by: Eelco Chaudron <echaudro@redhat.com>
diff mbox series

Patch

diff --git a/lib/ovs-router.c b/lib/ovs-router.c
index b5ac1edb6c65..02fce9095a98 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 13a465119a90..6ed7e7fcea9b 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 a36990f1ea1d..ec3b1dffe58b 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