Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

*: Use autocomplete for route-maps under commands that require it

Browse source 
For example:

```
donatas-laptop# show bgp ipv4 unicast neighbors 127.0.0.2 advertised-routes route-map ?
  RMAP_NAME  Name of the route map
       testas2 testas

donatas-laptop(config)# router bgp
donatas-laptop(config-router)# address-family ipv4
donatas-laptop(config-router-af)# redistribute connected route-map ?
  RMAP_NAME  Pointer to route-map entries
       testas2 testas

donatas-laptop(config-router-af)# network 192.168.0.0/23 route-map ?
  RMAP_NAME  Name of the route map
       testas2 testas
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2022-06-13 12:18:36 +03:00
parent faa8c700e6
commit 70dd370f5a
12 changed files with 62 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bgpd/bgp_evpn_vty.c
View file

@ -1940,7 +1940,7 @@ DEFUN(show_bgp_l2vpn_evpn_com,
/* For testing purpose, static route of EVPN RT-5. */
DEFUN(evpnrt5_network,
evpnrt5_network_cmd,
"network <A.B.C.D/M|X:X::X:X/M> rd ASN:NN_OR_IP-ADDRESS:NN ethtag WORD label WORD esi WORD gwip <A.B.C.D|X:X::X:X> routermac WORD [route-map WORD]",
"network <A.B.C.D/M|X:X::X:X/M> rd ASN:NN_OR_IP-ADDRESS:NN ethtag WORD label WORD esi WORD gwip <A.B.C.D|X:X::X:X> routermac WORD [route-map RMAP_NAME]",
"Specify a network to announce via BGP\n"
"IP prefix\n"
"IPv6 prefix\n"
@ -3812,7 +3812,7 @@ DEFUN_HIDDEN (no_bgp_evpn_advertise_vni_subnet,
DEFUN (bgp_evpn_advertise_type5,
bgp_evpn_advertise_type5_cmd,
"advertise " BGP_AFI_CMD_STR "" BGP_SAFI_CMD_STR " [gateway-ip] [route-map WORD]",
"advertise " BGP_AFI_CMD_STR "" BGP_SAFI_CMD_STR " [gateway-ip] [route-map RMAP_NAME]",
"Advertise prefix routes\n"
BGP_AFI_HELP_STR
BGP_SAFI_HELP_STR

4
bgpd/bgp_mplsvpn.c
View file

@ -2339,7 +2339,7 @@ DEFUN (vpnv4_network,
DEFUN (vpnv4_network_route_map,
vpnv4_network_route_map_cmd,
"network A.B.C.D/M rd ASN:NN_OR_IP-ADDRESS:NN <tag|label> (0-1048575) route-map WORD",
"network A.B.C.D/M rd ASN:NN_OR_IP-ADDRESS:NN <tag|label> (0-1048575) route-map RMAP_NAME",
"Specify a network to announce via BGP\n"
"IPv4 prefix\n"
"Specify Route Distinguisher\n"
@ -2384,7 +2384,7 @@ DEFUN (no_vpnv4_network,
DEFUN (vpnv6_network,
vpnv6_network_cmd,
"network X:X::X:X/M rd ASN:NN_OR_IP-ADDRESS:NN <tag|label> (0-1048575) [route-map WORD]",
"network X:X::X:X/M rd ASN:NN_OR_IP-ADDRESS:NN <tag|label> (0-1048575) [route-map RMAP_NAME]",
"Specify a network to announce via BGP\n"
"IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
"Specify Route Distinguisher\n"

18
bgpd/bgp_route.c
View file

@ -6859,7 +6859,7 @@ DEFPY(bgp_network,
bgp_network_cmd,
"[no] network \
<A.B.C.D/M$prefix|A.B.C.D$address [mask A.B.C.D$netmask]> \
[{route-map WORD$map_name|label-index (0-1048560)$label_index| \
[{route-map RMAP_NAME$map_name|label-index (0-1048560)$label_index| \
backdoor$backdoor}]",
NO_STR
"Specify a network to announce via BGP\n"
@ -6896,7 +6896,7 @@ DEFPY(bgp_network,
DEFPY(ipv6_bgp_network,
ipv6_bgp_network_cmd,
"[no] network X:X::X:X/M$prefix \
[{route-map WORD$map_name|label-index (0-1048560)$label_index}]",
[{route-map RMAP_NAME$map_name|label-index (0-1048560)$label_index}]",
NO_STR
"Specify a network to announce via BGP\n"
"IPv6 prefix\n"
@ -12227,7 +12227,7 @@ DEFPY(show_ip_bgp, show_ip_bgp_cmd,
|community-list <(1-500)|COMMUNITY_LIST_NAME> [exact-match]\
|filter-list AS_PATH_FILTER_NAME\
|prefix-list WORD\
|route-map WORD\
|route-map RMAP_NAME\
|rpki <invalid|valid|notfound>\
|version (1-4294967295)\
|alias ALIAS_NAME\
@ -13962,7 +13962,7 @@ DEFPY (show_ip_bgp_instance_neighbor_bestpath_route,
DEFPY (show_ip_bgp_instance_neighbor_advertised_route,
show_ip_bgp_instance_neighbor_advertised_route_cmd,
"show [ip] bgp [<view|vrf> VIEWVRFNAME] ["BGP_AFI_CMD_STR" ["BGP_SAFI_WITH_LABEL_CMD_STR"]] [all$all] neighbors <A.B.C.D|X:X::X:X|WORD> <advertised-routes|received-routes|filtered-routes> [route-map WORD] [json$uj | wide$wide]",
"show [ip] bgp [<view|vrf> VIEWVRFNAME] ["BGP_AFI_CMD_STR" ["BGP_SAFI_WITH_LABEL_CMD_STR"]] [all$all] neighbors <A.B.C.D|X:X::X:X|WORD> <advertised-routes|received-routes|filtered-routes> [route-map RMAP_NAME$route_map] [json$uj | wide$wide]",
SHOW_STR
IP_STR
BGP_STR
@ -13984,7 +13984,6 @@ DEFPY (show_ip_bgp_instance_neighbor_advertised_route,
{
afi_t afi = AFI_IP6;
safi_t safi = SAFI_UNICAST;
char *rmap_name = NULL;
char *peerstr = NULL;
struct bgp *bgp = NULL;
struct peer *peer;
@ -14032,11 +14031,8 @@ DEFPY (show_ip_bgp_instance_neighbor_advertised_route,
else if (argv_find(argv, argc, "filtered-routes", &idx))
type = bgp_show_adj_route_filtered;
if (argv_find(argv, argc, "route-map", &idx))
rmap_name = argv[++idx]->arg;
if (!all)
return peer_adj_routes(vty, peer, afi, safi, type, rmap_name,
return peer_adj_routes(vty, peer, afi, safi, type, route_map,
show_flags);
if (uj)
vty_out(vty, "{\n");
@ -14065,7 +14061,7 @@ DEFPY (show_ip_bgp_instance_neighbor_advertised_route,
false));
peer_adj_routes(vty, peer, afi, safi, type,
rmap_name, show_flags);
route_map, show_flags);
}
}
} else {
@ -14089,7 +14085,7 @@ DEFPY (show_ip_bgp_instance_neighbor_advertised_route,
false));
peer_adj_routes(vty, peer, afi, safi, type,
rmap_name, show_flags);
route_map, show_flags);
}
}
}

58
bgpd/bgp_vty.c
View file

@ -6673,7 +6673,7 @@ ALIAS_HIDDEN(neighbor_default_originate, neighbor_default_originate_hidden_cmd,
DEFUN (neighbor_default_originate_rmap,
neighbor_default_originate_rmap_cmd,
"neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map WORD",
"neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map RMAP_NAME",
NEIGHBOR_STR
NEIGHBOR_ADDR_STR2
"Originate default route to this neighbor\n"
@ -6690,7 +6690,7 @@ DEFUN (neighbor_default_originate_rmap,
ALIAS_HIDDEN(
neighbor_default_originate_rmap,
neighbor_default_originate_rmap_hidden_cmd,
"neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map WORD",
"neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map RMAP_NAME",
NEIGHBOR_STR NEIGHBOR_ADDR_STR2
"Originate default route to this neighbor\n"
"Route-map to specify criteria to originate default\n"
@ -6698,7 +6698,7 @@ ALIAS_HIDDEN(
DEFUN (no_neighbor_default_originate,
no_neighbor_default_originate_cmd,
"no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate [route-map WORD]",
"no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate [route-map RMAP_NAME]",
NO_STR
NEIGHBOR_STR
NEIGHBOR_ADDR_STR2
@ -6714,7 +6714,7 @@ DEFUN (no_neighbor_default_originate,
ALIAS_HIDDEN(
no_neighbor_default_originate, no_neighbor_default_originate_hidden_cmd,
"no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate [route-map WORD]",
"no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate [route-map RMAP_NAME]",
NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2
"Originate default route to this neighbor\n"
"Route-map to specify criteria to originate default\n"
@ -7627,7 +7627,7 @@ static int peer_route_map_unset_vty(struct vty *vty, const char *ip_str,
DEFUN (neighbor_route_map,
neighbor_route_map_cmd,
"neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
"neighbor <A.B.C.D|X:X::X:X|WORD> route-map RMAP_NAME <in|out>",
NEIGHBOR_STR
NEIGHBOR_ADDR_STR2
"Apply route map to neighbor\n"
@ -7644,7 +7644,7 @@ DEFUN (neighbor_route_map,
}
ALIAS_HIDDEN(neighbor_route_map, neighbor_route_map_hidden_cmd,
"neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
"neighbor <A.B.C.D|X:X::X:X|WORD> route-map RMAP_NAME <in|out>",
NEIGHBOR_STR NEIGHBOR_ADDR_STR2
"Apply route map to neighbor\n"
"Name of route map\n"
@ -7653,7 +7653,7 @@ ALIAS_HIDDEN(neighbor_route_map, neighbor_route_map_hidden_cmd,
DEFUN (no_neighbor_route_map,
no_neighbor_route_map_cmd,
"no neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
"no neighbor <A.B.C.D|X:X::X:X|WORD> route-map RMAP_NAME <in|out>",
NO_STR
NEIGHBOR_STR
NEIGHBOR_ADDR_STR2
@ -7670,7 +7670,7 @@ DEFUN (no_neighbor_route_map,
}
ALIAS_HIDDEN(no_neighbor_route_map, no_neighbor_route_map_hidden_cmd,
"no neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
"no neighbor <A.B.C.D|X:X::X:X|WORD> route-map RMAP_NAME <in|out>",
NO_STR NEIGHBOR_STR NEIGHBOR_ADDR_STR2
"Apply route map to neighbor\n"
"Name of route map\n"
@ -15485,7 +15485,7 @@ ALIAS_HIDDEN(
DEFUN (bgp_redistribute_ipv4_rmap,
bgp_redistribute_ipv4_rmap_cmd,
"redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD",
"redistribute " FRR_IP_REDIST_STR_BGPD " route-map RMAP_NAME",
"Redistribute information from another routing protocol\n"
FRR_IP_REDIST_HELP_STR_BGPD
"Route map reference\n"
@ -15514,7 +15514,7 @@ DEFUN (bgp_redistribute_ipv4_rmap,
ALIAS_HIDDEN(
bgp_redistribute_ipv4_rmap, bgp_redistribute_ipv4_rmap_hidden_cmd,
"redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD",
"redistribute " FRR_IP_REDIST_STR_BGPD " route-map RMAP_NAME",
"Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n")
@ -15556,7 +15556,7 @@ ALIAS_HIDDEN(
DEFUN (bgp_redistribute_ipv4_rmap_metric,
bgp_redistribute_ipv4_rmap_metric_cmd,
"redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)",
"redistribute " FRR_IP_REDIST_STR_BGPD " route-map RMAP_NAME metric (0-4294967295)",
"Redistribute information from another routing protocol\n"
FRR_IP_REDIST_HELP_STR_BGPD
"Route map reference\n"
@ -15593,7 +15593,7 @@ ALIAS_HIDDEN(
bgp_redistribute_ipv4_rmap_metric,
bgp_redistribute_ipv4_rmap_metric_hidden_cmd,
"redistribute " FRR_IP_REDIST_STR_BGPD
" route-map WORD metric (0-4294967295)",
" route-map RMAP_NAME metric (0-4294967295)",
"Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n"
@ -15602,7 +15602,7 @@ ALIAS_HIDDEN(
DEFUN (bgp_redistribute_ipv4_metric_rmap,
bgp_redistribute_ipv4_metric_rmap_cmd,
"redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD",
"redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map RMAP_NAME",
"Redistribute information from another routing protocol\n"
FRR_IP_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
@ -15639,7 +15639,7 @@ ALIAS_HIDDEN(
bgp_redistribute_ipv4_metric_rmap,
bgp_redistribute_ipv4_metric_rmap_hidden_cmd,
"redistribute " FRR_IP_REDIST_STR_BGPD
" metric (0-4294967295) route-map WORD",
" metric (0-4294967295) route-map RMAP_NAME",
"Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n"
@ -15680,7 +15680,7 @@ ALIAS_HIDDEN(bgp_redistribute_ipv4_ospf, bgp_redistribute_ipv4_ospf_hidden_cmd,
DEFUN (bgp_redistribute_ipv4_ospf_rmap,
bgp_redistribute_ipv4_ospf_rmap_cmd,
"redistribute <ospf|table> (1-65535) route-map WORD",
"redistribute <ospf|table> (1-65535) route-map RMAP_NAME",
"Redistribute information from another routing protocol\n"
"Open Shortest Path First (OSPFv2)\n"
"Non-main Kernel Routing Table\n"
@ -15713,7 +15713,7 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap,
ALIAS_HIDDEN(bgp_redistribute_ipv4_ospf_rmap,
bgp_redistribute_ipv4_ospf_rmap_hidden_cmd,
"redistribute <ospf|table> (1-65535) route-map WORD",
"redistribute <ospf|table> (1-65535) route-map RMAP_NAME",
"Redistribute information from another routing protocol\n"
"Open Shortest Path First (OSPFv2)\n"
"Non-main Kernel Routing Table\n"
@ -15767,7 +15767,7 @@ ALIAS_HIDDEN(bgp_redistribute_ipv4_ospf_metric,
DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric,
bgp_redistribute_ipv4_ospf_rmap_metric_cmd,
"redistribute <ospf|table> (1-65535) route-map WORD metric (0-4294967295)",
"redistribute <ospf|table> (1-65535) route-map RMAP_NAME metric (0-4294967295)",
"Redistribute information from another routing protocol\n"
"Open Shortest Path First (OSPFv2)\n"
"Non-main Kernel Routing Table\n"
@ -15809,7 +15809,7 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric,
ALIAS_HIDDEN(
bgp_redistribute_ipv4_ospf_rmap_metric,
bgp_redistribute_ipv4_ospf_rmap_metric_hidden_cmd,
"redistribute <ospf|table> (1-65535) route-map WORD metric (0-4294967295)",
"redistribute <ospf|table> (1-65535) route-map RMAP_NAME metric (0-4294967295)",
"Redistribute information from another routing protocol\n"
"Open Shortest Path First (OSPFv2)\n"
"Non-main Kernel Routing Table\n"
@ -15821,7 +15821,7 @@ ALIAS_HIDDEN(
DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
bgp_redistribute_ipv4_ospf_metric_rmap_cmd,
"redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map WORD",
"redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map RMAP_NAME",
"Redistribute information from another routing protocol\n"
"Open Shortest Path First (OSPFv2)\n"
"Non-main Kernel Routing Table\n"
@ -15863,7 +15863,7 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
ALIAS_HIDDEN(
bgp_redistribute_ipv4_ospf_metric_rmap,
bgp_redistribute_ipv4_ospf_metric_rmap_hidden_cmd,
"redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map WORD",
"redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map RMAP_NAME",
"Redistribute information from another routing protocol\n"
"Open Shortest Path First (OSPFv2)\n"
"Non-main Kernel Routing Table\n"
@ -15875,7 +15875,7 @@ ALIAS_HIDDEN(
DEFUN (no_bgp_redistribute_ipv4_ospf,
no_bgp_redistribute_ipv4_ospf_cmd,
"no redistribute <ospf|table> (1-65535) [{metric (0-4294967295)|route-map WORD}]",
"no redistribute <ospf|table> (1-65535) [{metric (0-4294967295)|route-map RMAP_NAME}]",
NO_STR
"Redistribute information from another routing protocol\n"
"Open Shortest Path First (OSPFv2)\n"
@ -15903,7 +15903,7 @@ DEFUN (no_bgp_redistribute_ipv4_ospf,
ALIAS_HIDDEN(
no_bgp_redistribute_ipv4_ospf, no_bgp_redistribute_ipv4_ospf_hidden_cmd,
"no redistribute <ospf|table> (1-65535) [{metric (0-4294967295)|route-map WORD}]",
"no redistribute <ospf|table> (1-65535) [{metric (0-4294967295)|route-map RMAP_NAME}]",
NO_STR
"Redistribute information from another routing protocol\n"
"Open Shortest Path First (OSPFv2)\n"
@ -15916,7 +15916,7 @@ ALIAS_HIDDEN(
DEFUN (no_bgp_redistribute_ipv4,
no_bgp_redistribute_ipv4_cmd,
"no redistribute " FRR_IP_REDIST_STR_BGPD " [{metric (0-4294967295)|route-map WORD}]",
"no redistribute " FRR_IP_REDIST_STR_BGPD " [{metric (0-4294967295)|route-map RMAP_NAME}]",
NO_STR
"Redistribute information from another routing protocol\n"
FRR_IP_REDIST_HELP_STR_BGPD
@ -15940,7 +15940,7 @@ DEFUN (no_bgp_redistribute_ipv4,
ALIAS_HIDDEN(
no_bgp_redistribute_ipv4, no_bgp_redistribute_ipv4_hidden_cmd,
"no redistribute " FRR_IP_REDIST_STR_BGPD
" [{metric (0-4294967295)|route-map WORD}]",
" [{metric (0-4294967295)|route-map RMAP_NAME}]",
NO_STR
"Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
@ -15970,7 +15970,7 @@ DEFUN (bgp_redistribute_ipv6,
DEFUN (bgp_redistribute_ipv6_rmap,
bgp_redistribute_ipv6_rmap_cmd,
"redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD",
"redistribute " FRR_IP6_REDIST_STR_BGPD " route-map RMAP_NAME",
"Redistribute information from another routing protocol\n"
FRR_IP6_REDIST_HELP_STR_BGPD
"Route map reference\n"
@ -16027,7 +16027,7 @@ DEFUN (bgp_redistribute_ipv6_metric,
DEFUN (bgp_redistribute_ipv6_rmap_metric,
bgp_redistribute_ipv6_rmap_metric_cmd,
"redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)",
"redistribute " FRR_IP6_REDIST_STR_BGPD " route-map RMAP_NAME metric (0-4294967295)",
"Redistribute information from another routing protocol\n"
FRR_IP6_REDIST_HELP_STR_BGPD
"Route map reference\n"
@ -16063,7 +16063,7 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric,
DEFUN (bgp_redistribute_ipv6_metric_rmap,
bgp_redistribute_ipv6_metric_rmap_cmd,
"redistribute " FRR_IP6_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD",
"redistribute " FRR_IP6_REDIST_STR_BGPD " metric (0-4294967295) route-map RMAP_NAME",
"Redistribute information from another routing protocol\n"
FRR_IP6_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
@ -16099,7 +16099,7 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
DEFUN (no_bgp_redistribute_ipv6,
no_bgp_redistribute_ipv6_cmd,
"no redistribute " FRR_IP6_REDIST_STR_BGPD " [{metric (0-4294967295)|route-map WORD}]",
"no redistribute " FRR_IP6_REDIST_STR_BGPD " [{metric (0-4294967295)|route-map RMAP_NAME}]",
NO_STR
"Redistribute information from another routing protocol\n"
FRR_IP6_REDIST_HELP_STR_BGPD
@ -19166,7 +19166,7 @@ void bgp_vty_init(void)
install_element(BGP_IPV6_NODE, &bgp_redistribute_ipv6_rmap_metric_cmd);
install_element(BGP_IPV6_NODE, &bgp_redistribute_ipv6_metric_rmap_cmd);
/* import|export vpn [route-map WORD] */
/* import|export vpn [route-map RMAP_NAME] */
install_element(BGP_IPV4_NODE, &bgp_imexport_vpn_cmd);
install_element(BGP_IPV6_NODE, &bgp_imexport_vpn_cmd);

4
isisd/isis_cli.c
View file

@ -1206,7 +1206,7 @@ void cli_show_isis_mpls_te_export(struct vty *vty, const struct lyd_node *dnode,
* XPath: /frr-isisd:isis/instance/default-information-originate
*/
DEFPY_YANG(isis_default_originate, isis_default_originate_cmd,
"[no] default-information originate <ipv4|ipv6>$ip <level-1|level-2>$level [always]$always [{metric (0-16777215)$metric|route-map WORD$rmap}]",
"[no] default-information originate <ipv4|ipv6>$ip <level-1|level-2>$level [always]$always [{metric (0-16777215)$metric|route-map RMAP_NAME$rmap}]",
NO_STR
"Control distribution of default information\n"
"Distribute a default route\n"
@ -1286,7 +1286,7 @@ void cli_show_isis_def_origin_ipv6(struct vty *vty,
DEFPY_YANG(isis_redistribute, isis_redistribute_cmd,
"[no] redistribute <ipv4$ip " PROTO_IP_REDIST_STR "$proto|ipv6$ip "
PROTO_IP6_REDIST_STR "$proto> <level-1|level-2>$level"
"[{metric (0-16777215)|route-map WORD}]",
"[{metric (0-16777215)|route-map RMAP_NAME$route_map}]",
NO_STR REDIST_STR
"Redistribute IPv4 routes\n"
PROTO_IP_REDIST_HELP

4
isisd/isis_redist.c
View file

@ -544,7 +544,7 @@ void isis_redist_area_finish(struct isis_area *area)
DEFUN (isis_redistribute,
isis_redistribute_cmd,
"redistribute <ipv4 " PROTO_IP_REDIST_STR "|ipv6 " PROTO_IP6_REDIST_STR ">"
" [{metric (0-16777215)|route-map WORD}]",
" [{metric (0-16777215)|route-map RMAP_NAME}]",
REDIST_STR
"Redistribute IPv4 routes\n"
PROTO_IP_REDIST_HELP
@ -636,7 +636,7 @@ DEFUN (no_isis_redistribute,
DEFUN (isis_default_originate,
isis_default_originate_cmd,
"default-information originate <ipv4|ipv6> [always] [{metric (0-16777215)|route-map WORD}]",
"default-information originate <ipv4|ipv6> [always] [{metric (0-16777215)|route-map RMAP_NAME}]",
"Control distribution of default information\n"
"Distribute a default route\n"
"Distribute default route for IPv4\n"

2
lib/routemap.c
View file

@ -3270,7 +3270,7 @@ void route_map_counter_decrement(struct route_map *map)
}
DEFUN_HIDDEN(show_route_map_pfx_tbl, show_route_map_pfx_tbl_cmd,
"show route-map WORD prefix-table",
"show route-map RMAP_NAME prefix-table",
SHOW_STR
"route-map\n"
"route-map name\n"

8
ospf6d/ospf6_asbr.c
View file

@ -1661,7 +1661,7 @@ void ospf6_asbr_redistribute_remove(int type, ifindex_t ifindex,
DEFPY (ospf6_redistribute,
ospf6_redistribute_cmd,
"redistribute " FRR_REDIST_STR_OSPF6D "[{metric (0-16777214)|metric-type (1-2)$metric_type|route-map WORD$rmap_str}]",
"redistribute " FRR_REDIST_STR_OSPF6D "[{metric (0-16777214)|metric-type (1-2)$metric_type|route-map RMAP_NAME$rmap_str}]",
"Redistribute\n"
FRR_REDIST_HELP_STR_OSPF6D
"Metric for redistributed routes\n"
@ -1715,7 +1715,7 @@ DEFPY (ospf6_redistribute,
DEFUN (no_ospf6_redistribute,
no_ospf6_redistribute_cmd,
"no redistribute " FRR_REDIST_STR_OSPF6D "[{metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
"no redistribute " FRR_REDIST_STR_OSPF6D "[{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
NO_STR
"Redistribute\n"
FRR_REDIST_HELP_STR_OSPF6D
@ -1893,7 +1893,7 @@ static void ospf6_redistribute_default_set(struct ospf6 *ospf6, int originate)
/* Default Route originate. */
DEFPY (ospf6_default_route_originate,
ospf6_default_route_originate_cmd,
"default-information originate [{always$always|metric (0-16777214)$mval|metric-type (1-2)$mtype|route-map WORD$rtmap}]",
"default-information originate [{always$always|metric (0-16777214)$mval|metric-type (1-2)$mtype|route-map RMAP_NAME$rtmap}]",
"Control distribution of default route\n"
"Distribute a default route\n"
"Always advertise default route\n"
@ -1951,7 +1951,7 @@ DEFPY (ospf6_default_route_originate,
DEFPY (no_ospf6_default_information_originate,
no_ospf6_default_information_originate_cmd,
"no default-information originate [{always|metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
"no default-information originate [{always|metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
NO_STR
"Control distribution of default information\n"
"Distribute a default route\n"

20
ospfd/ospf_vty.c
View file

@ -9116,7 +9116,7 @@ DEFUN (no_ip_ospf_passive,
DEFUN (ospf_redistribute_source,
ospf_redistribute_source_cmd,
"redistribute " FRR_REDIST_STR_OSPFD " [{metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
"redistribute " FRR_REDIST_STR_OSPFD " [{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
REDIST_STR
FRR_REDIST_HELP_STR_OSPFD
"Metric for redistributed routes\n"
@ -9160,8 +9160,8 @@ DEFUN (ospf_redistribute_source,
update = true;
/* Get route-map */
if (argv_find(argv, argc, "WORD", &idx)) {
ospf_routemap_set(red, argv[idx]->arg);
if (argv_find(argv, argc, "route-map", &idx)) {
ospf_routemap_set(red, argv[idx + 1]->arg);
} else
ospf_routemap_unset(red);
@ -9175,7 +9175,7 @@ DEFUN (ospf_redistribute_source,
DEFUN (no_ospf_redistribute_source,
no_ospf_redistribute_source_cmd,
"no redistribute " FRR_REDIST_STR_OSPFD " [{metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
"no redistribute " FRR_REDIST_STR_OSPFD " [{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
NO_STR
REDIST_STR
FRR_REDIST_HELP_STR_OSPFD
@ -9207,7 +9207,7 @@ DEFUN (no_ospf_redistribute_source,
DEFUN (ospf_redistribute_instance_source,
ospf_redistribute_instance_source_cmd,
"redistribute <ospf|table> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
"redistribute <ospf|table> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
REDIST_STR
"Open Shortest Path First\n"
"Non-main Kernel Routing Table\n"
@ -9283,7 +9283,7 @@ DEFUN (ospf_redistribute_instance_source,
DEFUN (no_ospf_redistribute_instance_source,
no_ospf_redistribute_instance_source_cmd,
"no redistribute <ospf|table> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
"no redistribute <ospf|table> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
NO_STR
REDIST_STR
"Open Shortest Path First\n"
@ -9378,7 +9378,7 @@ DEFUN (no_ospf_distribute_list_out,
/* Default information originate. */
DEFUN (ospf_default_information_originate,
ospf_default_information_originate_cmd,
"default-information originate [{always|metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
"default-information originate [{always|metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
"Control distribution of default information\n"
"Distribute a default route\n"
"Always advertise default route\n"
@ -9418,8 +9418,8 @@ DEFUN (ospf_default_information_originate,
}
idx = 1;
/* Get route-map */
if (argv_find(argv, argc, "WORD", &idx))
rtmap = argv[idx]->arg;
if (argv_find(argv, argc, "route-map", &idx))
rtmap = argv[idx]->arg + 1;
/* To check if user is providing same route map */
if ((!rtmap && !ROUTEMAP_NAME(red)) ||
@ -9450,7 +9450,7 @@ DEFUN (ospf_default_information_originate,
DEFUN (no_ospf_default_information_originate,
no_ospf_default_information_originate_cmd,
"no default-information originate [{always|metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
"no default-information originate [{always|metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
NO_STR
"Control distribution of default information\n"
"Distribute a default route\n"

2
ripd/rip_cli.c
View file

@ -439,7 +439,7 @@ void cli_show_rip_non_passive_interface(struct vty *vty,
*/
DEFPY_YANG (rip_redistribute,
rip_redistribute_cmd,
"[no] redistribute " FRR_REDIST_STR_RIPD "$protocol [{metric (0-16)|route-map WORD}]",
"[no] redistribute " FRR_REDIST_STR_RIPD "$protocol [{metric (0-16)|route-map RMAP_NAME$route_map}]",
NO_STR
REDIST_STR
FRR_REDIST_HELP_STR_RIPD

2
ripngd/ripng_cli.c
View file

@ -300,7 +300,7 @@ void cli_show_ripng_passive_interface(struct vty *vty,
*/
DEFPY_YANG (ripng_redistribute,
ripng_redistribute_cmd,
"[no] redistribute " FRR_REDIST_STR_RIPNGD "$protocol [{metric (0-16)|route-map WORD}]",
"[no] redistribute " FRR_REDIST_STR_RIPNGD "$protocol [{metric (0-16)|route-map RMAP_NAME$route_map}]",
NO_STR
REDIST_STR
FRR_REDIST_HELP_STR_RIPNGD

2
zebra/zebra_vty.c
View file

@ -3704,7 +3704,7 @@ static int zebra_ip_config(struct vty *vty)
DEFUN (ip_zebra_import_table_distance,
ip_zebra_import_table_distance_cmd,
"ip import-table (1-252) [distance (1-255)] [route-map WORD]",
"ip import-table (1-252) [distance (1-255)] [route-map RMAP_NAME]",
IP_STR
"import routes from non-main kernel table\n"
"kernel routing table id\n"