Skip to content

Commit 33f45ce

Browse files
donaldsharpdonaldsharp
authored
Merge pull request #17070 from FRRouting/mergify/bp/stable/9.0/pr-17059
bgpd: Move some non BGP-specific route-map functions to lib (backport #17059)
2 parents 025520f + 88ae1ad commit 33f45ce

File tree

2 files changed

+73
-80
lines changed

2 files changed

+73
-80
lines changed

‎bgpd/bgp_routemap.c

-80
Original file line numberDiff line numberDiff line change
@@ -6696,43 +6696,6 @@ DEFUN_YANG (no_set_aggregator_as,
66966696
return nb_cli_apply_changes(vty, NULL);
66976697
}
66986698

6699-
DEFUN_YANG (match_ipv6_next_hop,
6700-
match_ipv6_next_hop_cmd,
6701-
"match ipv6 next-hop ACCESSLIST6_NAME",
6702-
MATCH_STR
6703-
IPV6_STR
6704-
"Match IPv6 next-hop address of route\n"
6705-
"IPv6 access-list name\n")
6706-
{
6707-
const char *xpath =
6708-
"./match-condition[condition='frr-route-map:ipv6-next-hop-list']";
6709-
char xpath_value[XPATH_MAXLEN];
6710-
6711-
nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL);
6712-
snprintf(xpath_value, sizeof(xpath_value),
6713-
"%s/rmap-match-condition/list-name", xpath);
6714-
nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY,
6715-
argv[argc - 1]->arg);
6716-
6717-
return nb_cli_apply_changes(vty, NULL);
6718-
}
6719-
6720-
DEFUN_YANG (no_match_ipv6_next_hop,
6721-
no_match_ipv6_next_hop_cmd,
6722-
"no match ipv6 next-hop [ACCESSLIST6_NAME]",
6723-
NO_STR
6724-
MATCH_STR
6725-
IPV6_STR
6726-
"Match IPv6 next-hop address of route\n"
6727-
"IPv6 access-list name\n")
6728-
{
6729-
const char *xpath =
6730-
"./match-condition[condition='frr-route-map:ipv6-next-hop-list']";
6731-
6732-
nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
6733-
return nb_cli_apply_changes(vty, NULL);
6734-
}
6735-
67366699
DEFUN_YANG (match_ipv6_next_hop_address,
67376700
match_ipv6_next_hop_address_cmd,
67386701
"match ipv6 next-hop address X:X::X:X",
@@ -6790,45 +6753,6 @@ ALIAS_HIDDEN (no_match_ipv6_next_hop_address,
67906753
"Match IPv6 next-hop address of route\n"
67916754
"IPv6 address of next hop\n")
67926755

6793-
DEFUN_YANG (match_ipv6_next_hop_prefix_list,
6794-
match_ipv6_next_hop_prefix_list_cmd,
6795-
"match ipv6 next-hop prefix-list PREFIXLIST_NAME",
6796-
MATCH_STR
6797-
IPV6_STR
6798-
"Match IPv6 next-hop address of route\n"
6799-
"Match entries by prefix-list\n"
6800-
"IPv6 prefix-list name\n")
6801-
{
6802-
const char *xpath =
6803-
"./match-condition[condition='frr-route-map:ipv6-next-hop-prefix-list']";
6804-
char xpath_value[XPATH_MAXLEN];
6805-
6806-
nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL);
6807-
snprintf(xpath_value, sizeof(xpath_value),
6808-
"%s/rmap-match-condition/list-name", xpath);
6809-
nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY,
6810-
argv[argc - 1]->arg);
6811-
6812-
return nb_cli_apply_changes(vty, NULL);
6813-
}
6814-
6815-
DEFUN_YANG (no_match_ipv6_next_hop_prefix_list,
6816-
no_match_ipv6_next_hop_prefix_list_cmd,
6817-
"no match ipv6 next-hop prefix-list [PREFIXLIST_NAME]",
6818-
NO_STR
6819-
MATCH_STR
6820-
IPV6_STR
6821-
"Match IPv6 next-hop address of route\n"
6822-
"Match entries by prefix-list\n"
6823-
"IPv6 prefix-list name\n")
6824-
{
6825-
const char *xpath =
6826-
"./match-condition[condition='frr-route-map:ipv6-next-hop-prefix-list']";
6827-
6828-
nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
6829-
return nb_cli_apply_changes(vty, NULL);
6830-
}
6831-
68326756
DEFPY_YANG (match_ipv4_next_hop,
68336757
match_ipv4_next_hop_cmd,
68346758
"match ip next-hop address A.B.C.D",
@@ -7488,12 +7412,8 @@ void bgp_route_map_init(void)
74887412
route_map_install_set(&route_set_ipv6_nexthop_peer_cmd);
74897413
route_map_install_match(&route_match_rpki_extcommunity_cmd);
74907414

7491-
install_element(RMAP_NODE, &match_ipv6_next_hop_cmd);
74927415
install_element(RMAP_NODE, &match_ipv6_next_hop_address_cmd);
7493-
install_element(RMAP_NODE, &match_ipv6_next_hop_prefix_list_cmd);
7494-
install_element(RMAP_NODE, &no_match_ipv6_next_hop_cmd);
74957416
install_element(RMAP_NODE, &no_match_ipv6_next_hop_address_cmd);
7496-
install_element(RMAP_NODE, &no_match_ipv6_next_hop_prefix_list_cmd);
74977417
install_element(RMAP_NODE, &match_ipv6_next_hop_old_cmd);
74987418
install_element(RMAP_NODE, &no_match_ipv6_next_hop_old_cmd);
74997419
install_element(RMAP_NODE, &match_ipv4_next_hop_cmd);

‎lib/routemap_cli.c

+73
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,74 @@ DEFPY_YANG(
417417
return nb_cli_apply_changes(vty, NULL);
418418
}
419419

420+
DEFUN_YANG (match_ipv6_next_hop,
421+
match_ipv6_next_hop_cmd,
422+
"match ipv6 next-hop ACCESSLIST6_NAME",
423+
MATCH_STR
424+
IPV6_STR
425+
"Match IPv6 next-hop address of route\n"
426+
"IPv6 access-list name\n")
427+
{
428+
const char *xpath = "./match-condition[condition='frr-route-map:ipv6-next-hop-list']";
429+
char xpath_value[XPATH_MAXLEN];
430+
431+
nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL);
432+
snprintf(xpath_value, sizeof(xpath_value), "%s/rmap-match-condition/list-name", xpath);
433+
nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY, argv[argc - 1]->arg);
434+
435+
return nb_cli_apply_changes(vty, NULL);
436+
}
437+
438+
DEFUN_YANG (no_match_ipv6_next_hop,
439+
no_match_ipv6_next_hop_cmd,
440+
"no match ipv6 next-hop [ACCESSLIST6_NAME]",
441+
NO_STR
442+
MATCH_STR
443+
IPV6_STR
444+
"Match IPv6 next-hop address of route\n"
445+
"IPv6 access-list name\n")
446+
{
447+
const char *xpath = "./match-condition[condition='frr-route-map:ipv6-next-hop-list']";
448+
449+
nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
450+
return nb_cli_apply_changes(vty, NULL);
451+
}
452+
453+
DEFUN_YANG (match_ipv6_next_hop_prefix_list,
454+
match_ipv6_next_hop_prefix_list_cmd,
455+
"match ipv6 next-hop prefix-list PREFIXLIST_NAME",
456+
MATCH_STR
457+
IPV6_STR
458+
"Match IPv6 next-hop address of route\n"
459+
"Match entries by prefix-list\n"
460+
"IPv6 prefix-list name\n")
461+
{
462+
const char *xpath = "./match-condition[condition='frr-route-map:ipv6-next-hop-prefix-list']";
463+
char xpath_value[XPATH_MAXLEN];
464+
465+
nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL);
466+
snprintf(xpath_value, sizeof(xpath_value), "%s/rmap-match-condition/list-name", xpath);
467+
nb_cli_enqueue_change(vty, xpath_value, NB_OP_MODIFY, argv[argc - 1]->arg);
468+
469+
return nb_cli_apply_changes(vty, NULL);
470+
}
471+
472+
DEFUN_YANG (no_match_ipv6_next_hop_prefix_list,
473+
no_match_ipv6_next_hop_prefix_list_cmd,
474+
"no match ipv6 next-hop prefix-list [PREFIXLIST_NAME]",
475+
NO_STR
476+
MATCH_STR
477+
IPV6_STR
478+
"Match IPv6 next-hop address of route\n"
479+
"Match entries by prefix-list\n"
480+
"IPv6 prefix-list name\n")
481+
{
482+
const char *xpath = "./match-condition[condition='frr-route-map:ipv6-next-hop-prefix-list']";
483+
484+
nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
485+
return nb_cli_apply_changes(vty, NULL);
486+
}
487+
420488
DEFPY_YANG(
421489
match_ipv6_next_hop_type, match_ipv6_next_hop_type_cmd,
422490
"match ipv6 next-hop type <blackhole>$type",
@@ -1621,6 +1689,11 @@ void route_map_cli_init(void)
16211689
install_element(RMAP_NODE, &match_ipv6_next_hop_type_cmd);
16221690
install_element(RMAP_NODE, &no_match_ipv6_next_hop_type_cmd);
16231691

1692+
install_element(RMAP_NODE, &match_ipv6_next_hop_cmd);
1693+
install_element(RMAP_NODE, &match_ipv6_next_hop_prefix_list_cmd);
1694+
install_element(RMAP_NODE, &no_match_ipv6_next_hop_cmd);
1695+
install_element(RMAP_NODE, &no_match_ipv6_next_hop_prefix_list_cmd);
1696+
16241697
install_element(RMAP_NODE, &match_metric_cmd);
16251698
install_element(RMAP_NODE, &no_match_metric_cmd);
16261699

0 commit comments

Comments
 (0)