]> git.puffer.fish Git - matthieu/frr.git/commitdiff
lib: Allow unsetting walltime-warning and cpu-warning
authorDonatas Abraitis <donatas@opensourcerouting.org>
Fri, 11 Aug 2023 15:11:03 +0000 (18:11 +0300)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Tue, 15 Aug 2023 20:28:16 +0000 (20:28 +0000)
With a negative form we get:

```
Internal CLI error [walltime_warning_str]
Internal CLI error [cputime_warning_str]
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit fedf9119a1964abf8e476f239d81b3f4ce385b1d)

lib/event.c

index a8eb89f48d6dc495bae6f6b79f5fa6a7962cece7..14b1564a2f39b36b4019053a6f855d004f3ba445 100644 (file)
@@ -355,7 +355,7 @@ DEFPY (service_cputime_stats,
 
 DEFPY (service_cputime_warning,
        service_cputime_warning_cmd,
-       "[no] service cputime-warning (1-4294967295)",
+       "[no] service cputime-warning ![(1-4294967295)]",
        NO_STR
        "Set up miscellaneous service\n"
        "Warn for tasks exceeding CPU usage threshold\n"
@@ -368,16 +368,9 @@ DEFPY (service_cputime_warning,
        return CMD_SUCCESS;
 }
 
-ALIAS (service_cputime_warning,
-       no_service_cputime_warning_cmd,
-       "no service cputime-warning",
-       NO_STR
-       "Set up miscellaneous service\n"
-       "Warn for tasks exceeding CPU usage threshold\n")
-
 DEFPY (service_walltime_warning,
        service_walltime_warning_cmd,
-       "[no] service walltime-warning (1-4294967295)",
+       "[no] service walltime-warning ![(1-4294967295)]",
        NO_STR
        "Set up miscellaneous service\n"
        "Warn for tasks exceeding total wallclock threshold\n"
@@ -390,13 +383,6 @@ DEFPY (service_walltime_warning,
        return CMD_SUCCESS;
 }
 
-ALIAS (service_walltime_warning,
-       no_service_walltime_warning_cmd,
-       "no service walltime-warning",
-       NO_STR
-       "Set up miscellaneous service\n"
-       "Warn for tasks exceeding total wallclock threshold\n")
-
 static void show_thread_poll_helper(struct vty *vty, struct event_loop *m)
 {
        const char *name = m->name ? m->name : "main";
@@ -525,9 +511,7 @@ void event_cmd_init(void)
 
        install_element(CONFIG_NODE, &service_cputime_stats_cmd);
        install_element(CONFIG_NODE, &service_cputime_warning_cmd);
-       install_element(CONFIG_NODE, &no_service_cputime_warning_cmd);
        install_element(CONFIG_NODE, &service_walltime_warning_cmd);
-       install_element(CONFIG_NODE, &no_service_walltime_warning_cmd);
 
        install_element(VIEW_NODE, &show_thread_timers_cmd);
 }