[PATCH iproute2 0/2] nexthop: Small usage improvements

[PATCH iproute2 0/2] nexthop: Small usage improvements

[Ido Schimmel]

From: Ido Schimmel <idosch@nvidia.com>

Two small usage improvements in ip-nexthop and ip-monitor. Noticed while
adding support for resilient nexthop groups.

Ido Schimmel (2):
  nexthop: Fix usage output
  ipmonitor: Mention "nexthop" object in help and man page

 ip/ipmonitor.c        | 2 +-
 ip/ipnexthop.c        | 6 +++---
 man/man8/ip-monitor.8 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.29.2

[PATCH iproute2 1/2] nexthop: Fix usage output

[Ido Schimmel]

From: Ido Schimmel <idosch@nvidia.com>

Before:

 # ip nexthop help
 Usage: ip nexthop { list | flush } [ protocol ID ] SELECTOR
        ip nexthop { add | replace } id ID NH [ protocol ID ]
        ip nexthop { get| del } id ID
 SELECTOR := [ id ID ] [ dev DEV ] [ vrf NAME ] [ master DEV ]
             [ groups ] [ fdb ]
 NH := { blackhole | [ via ADDRESS ] [ dev DEV ] [ onlink ]
       [ encap ENCAPTYPE ENCAPHDR ] | group GROUP ] }
 GROUP := [ id[,weight]>/<id[,weight]>/... ]
 ENCAPTYPE := [ mpls ]
 ENCAPHDR := [ MPLSLABEL ]

After:

 # ip nexthop help
 Usage: ip nexthop { list | flush } [ protocol ID ] SELECTOR
        ip nexthop { add | replace } id ID NH [ protocol ID ]
        ip nexthop { get | del } id ID
 SELECTOR := [ id ID ] [ dev DEV ] [ vrf NAME ] [ master DEV ]
             [ groups ] [ fdb ]
 NH := { blackhole | [ via ADDRESS ] [ dev DEV ] [ onlink ]
         [ encap ENCAPTYPE ENCAPHDR ] | group GROUP [ fdb ] }
 GROUP := [ <id[,weight]>/<id[,weight]>/... ]
 ENCAPTYPE := [ mpls ]
 ENCAPHDR := [ MPLSLABEL ]

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 ip/ipnexthop.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ip/ipnexthop.c b/ip/ipnexthop.c
index b7ffff77c160..20cde586596b 100644
--- a/ip/ipnexthop.c
+++ b/ip/ipnexthop.c
@@ -38,12 +38,12 @@ static void usage(void)
 	fprintf(stderr,
 		"Usage: ip nexthop { list | flush } [ protocol ID ] SELECTOR\n"
 		"       ip nexthop { add | replace } id ID NH [ protocol ID ]\n"
-		"       ip nexthop { get| del } id ID\n"
+		"       ip nexthop { get | del } id ID\n"
 		"SELECTOR := [ id ID ] [ dev DEV ] [ vrf NAME ] [ master DEV ]\n"
 		"            [ groups ] [ fdb ]\n"
 		"NH := { blackhole | [ via ADDRESS ] [ dev DEV ] [ onlink ]\n"
-		"      [ encap ENCAPTYPE ENCAPHDR ] | group GROUP ] }\n"
-		"GROUP := [ id[,weight]>/<id[,weight]>/... ]\n"
+		"        [ encap ENCAPTYPE ENCAPHDR ] | group GROUP [ fdb ] }\n"
+		"GROUP := [ <id[,weight]>/<id[,weight]>/... ]\n"
 		"ENCAPTYPE := [ mpls ]\n"
 		"ENCAPHDR := [ MPLSLABEL ]\n");
 	exit(-1);
-- 
2.29.2

[PATCH iproute2 2/2] ipmonitor: Mention "nexthop" object in help and man page

[Ido Schimmel]

From: Ido Schimmel <idosch@nvidia.com>

Before:

 # ip monitor help
 Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ] [ label ] [all-nsid] [dev DEVICE]
 LISTofOBJECTS := link | address | route | mroute | prefix |
                  neigh | netconf | rule | nsid
 FILE := file FILENAME

After:

 # ip monitor help
 Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ] [ label ] [all-nsid] [dev DEVICE]
 LISTofOBJECTS := link | address | route | mroute | prefix |
                  neigh | netconf | rule | nsid | nexthop
 FILE := file FILENAME

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 ip/ipmonitor.c        | 2 +-
 man/man8/ip-monitor.8 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c
index 685be52cfe64..99f5fda8ba1f 100644
--- a/ip/ipmonitor.c
+++ b/ip/ipmonitor.c
@@ -32,7 +32,7 @@ static void usage(void)
 	fprintf(stderr,
 		"Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ] [ label ] [all-nsid] [dev DEVICE]\n"
 		"LISTofOBJECTS := link | address | route | mroute | prefix |\n"
-		"		 neigh | netconf | rule | nsid\n"
+		"		 neigh | netconf | rule | nsid | nexthop\n"
 		"FILE := file FILENAME\n");
 	exit(-1);
 }
diff --git a/man/man8/ip-monitor.8 b/man/man8/ip-monitor.8
index 86f8f9885fef..f886d31b8013 100644
--- a/man/man8/ip-monitor.8
+++ b/man/man8/ip-monitor.8
@@ -55,7 +55,7 @@ command is the first in the command line and then the object list follows:
 is the list of object types that we want to monitor.
 It may contain
 .BR link ", " address ", " route ", " mroute ", " prefix ", "
-.BR neigh ", " netconf ", "  rule " and " nsid "."
+.BR neigh ", " netconf ", "  rule ", " nsid " and " nexthop "."
 If no
 .B file
 argument is given,
-- 
2.29.2

Re: [PATCH iproute2 0/2] nexthop: Small usage improvements

[David Ahern]

On 1/7/21 8:23 AM, Ido Schimmel wrote:
> From: Ido Schimmel <idosch@nvidia.com>
> 
> Two small usage improvements in ip-nexthop and ip-monitor. Noticed while
> adding support for resilient nexthop groups.
> 
> Ido Schimmel (2):
>   nexthop: Fix usage output
>   ipmonitor: Mention "nexthop" object in help and man page
> 
>  ip/ipmonitor.c        | 2 +-
>  ip/ipnexthop.c        | 6 +++---
>  man/man8/ip-monitor.8 | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 

applied to iproute2-next. Thanks