Merge pull request #6847 from donaldsharp/time_to_rerun

Time to rerun

3 files changed, 12 insertions, 10 deletions

diff --git a/lib/routemap.c b/lib/routemap.c
index 22b4beb79d..df9a6a33ea 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -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_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->optimization_disabled ? "disabled" : "enabled");
+		map->optimization_disabled ? "disabled" : "enabled",
+		map->to_be_processed ? "true" : "false");
 
 	for (index = map->head; index; index = index->next) {
 		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) {
 		if (!skip_match_clause) {
+			index->applied++;
 			/* Apply this index. */
 			match_ret = route_map_apply_match(&index->match_list,
 							  prefix, type, object);
diff --git a/lib/routemap_cli.c b/lib/routemap_cli.c
index 014147c3f8..7fa759252b 100644
--- a/lib/routemap_cli.c
+++ b/lib/routemap_cli.c
@@ -949,7 +949,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_rmap_call, no_rmap_call_cmd,
-	"no call",
+	"no call [NAME]",
 	NO_STR
 	"Jump to another Route-Map after match+set\n")
 {
diff --git a/tests/topotests/all-protocol-startup/r1/show_route_map.ref b/tests/topotests/all-protocol-startup/r1/show_route_map.ref
index f95c48b7d7..612d0a729d 100644
--- a/tests/topotests/all-protocol-startup/r1/show_route_map.ref
+++ b/tests/topotests/all-protocol-startup/r1/show_route_map.ref
@@ -1,5 +1,5 @@
 ZEBRA:
-route-map: LIES Invoked: 0 Optimization: enabled
+route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
  deny, sequence 10 Invoked 0
   Match clauses:
     interface notpresent
@@ -8,7 +8,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
   Action:
     Exit routemap
 RIP:
-route-map: LIES Invoked: 0 Optimization: enabled
+route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
  deny, sequence 10 Invoked 0
   Match clauses:
     interface notpresent
@@ -17,7 +17,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
   Action:
     Exit routemap
 RIPNG:
-route-map: LIES Invoked: 0 Optimization: enabled
+route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
  deny, sequence 10 Invoked 0
   Match clauses:
     interface notpresent
@@ -26,7 +26,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
   Action:
     Exit routemap
 OSPF:
-route-map: LIES Invoked: 0 Optimization: enabled
+route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
  deny, sequence 10 Invoked 0
   Match clauses:
     interface notpresent
@@ -35,7 +35,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
   Action:
     Exit routemap
 OSPF6:
-route-map: LIES Invoked: 0 Optimization: enabled
+route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
  deny, sequence 10 Invoked 0
   Match clauses:
     interface notpresent
@@ -44,7 +44,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
   Action:
     Exit routemap
 BGP:
-route-map: LIES Invoked: 0 Optimization: enabled
+route-map: LIES Invoked: 0 Optimization: enabled Processed Change: false
  deny, sequence 10 Invoked 0
   Match clauses:
     interface notpresent
@@ -52,7 +52,7 @@ route-map: LIES Invoked: 0 Optimization: enabled
   Call clause:
   Action:
     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
   Match clauses:
   Set clauses: