proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-28 23:43:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6847 from donaldsharp/time_to_rerun

Browse Source 
Time to rerun
This commit is contained in:
Donatas Abraitis 2020-08-05 17:34:46 +03:00 committed by GitHub
commit 2b42623bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/routemap.c
View File

@ -821,9 +821,10 @@ static void vty_show_route_map_entry(struct vty *vty, struct route_map *map)
struct route_map_index *index; struct route_map_index *index;
struct route_map_rule *rule; struct route_map_rule *rule;
vty_out(vty, "route-map: %s Invoked: %" PRIu64 " Optimization: %s\n", vty_out(vty, "route-map: %s Invoked: %" PRIu64 " Optimization: %s Processed Change: %s\n",
map->name, map->applied - map->applied_clear, map->name, map->applied - map->applied_clear,
map->optimization_disabled ? "disabled" : "enabled"); map->optimization_disabled ? "disabled" : "enabled",
map->to_be_processed ? "true" : "false");
for (index = map->head; index; index = index->next) { for (index = map->head; index; index = index->next) {
vty_out(vty, " %s, sequence %d Invoked %" PRIu64 "\n", vty_out(vty, " %s, sequence %d Invoked %" PRIu64 "\n",
@ -2412,6 +2413,7 @@ route_map_result_t route_map_apply(struct route_map *map,
for (; index; index = index->next) { for (; index; index = index->next) {
if (!skip_match_clause) { if (!skip_match_clause) {
index->applied++;
/* Apply this index. */ /* Apply this index. */
match_ret = route_map_apply_match(&index->match_list, match_ret = route_map_apply_match(&index->match_list,
prefix, type, object); prefix, type, object);

2
lib/routemap_cli.c
View File

@ -949,7 +949,7 @@ DEFPY_YANG(
DEFPY_YANG( DEFPY_YANG(
no_rmap_call, no_rmap_call_cmd, no_rmap_call, no_rmap_call_cmd,
"no call", "no call [NAME]",
NO_STR NO_STR
"Jump to another Route-Map after match+set\n") "Jump to another Route-Map after match+set\n")
{ {

14
tests/topotests/all-protocol-startup/r1/show_route_map.ref
View File

@ -1,5 +1,5 @@
ZEBRA: ZEBRA:
route-map: LIES Invoked: 0 Optimization: enabled route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
deny, sequence 10 Invoked 0 deny, sequence 10 Invoked 0
Match clauses: Match clauses:
interface notpresent interface notpresent
@ -8,7 +8,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
Action: Action:
Exit routemap Exit routemap
RIP: RIP:
route-map: LIES Invoked: 0 Optimization: enabled route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
deny, sequence 10 Invoked 0 deny, sequence 10 Invoked 0
Match clauses: Match clauses:
interface notpresent interface notpresent
@ -17,7 +17,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
Action: Action:
Exit routemap Exit routemap
RIPNG: RIPNG:
route-map: LIES Invoked: 0 Optimization: enabled route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
deny, sequence 10 Invoked 0 deny, sequence 10 Invoked 0
Match clauses: Match clauses:
interface notpresent interface notpresent
@ -26,7 +26,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
Action: Action:
Exit routemap Exit routemap
OSPF: OSPF:
route-map: LIES Invoked: 0 Optimization: enabled route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
deny, sequence 10 Invoked 0 deny, sequence 10 Invoked 0
Match clauses: Match clauses:
interface notpresent interface notpresent
@ -35,7 +35,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
Action: Action:
Exit routemap Exit routemap
OSPF6: OSPF6:
route-map: LIES Invoked: 0 Optimization: enabled route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
deny, sequence 10 Invoked 0 deny, sequence 10 Invoked 0
Match clauses: Match clauses:
interface notpresent interface notpresent
@ -44,7 +44,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
Action: Action:
Exit routemap Exit routemap
BGP: BGP:
route-map: LIES Invoked: 0 Optimization: enabled route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
deny, sequence 10 Invoked 0 deny, sequence 10 Invoked 0
Match clauses: Match clauses:
interface notpresent interface notpresent
@ -52,7 +52,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
Call clause: Call clause:
Action: Action:
Exit routemap Exit routemap
route-map: bgp-map Invoked: 0 Optimization: enabled route-map: bgp-map Invoked: 0 Optimization: enabled Processed Change: false
permit, sequence 10 Invoked 0 permit, sequence 10 Invoked 0
Match clauses: Match clauses:
Set clauses: Set clauses: