diff options
| author | Emanuele Di Pascale <emanuele@voltanet.io> | 2020-04-06 17:05:41 +0200 |
|---|---|---|
| committer | Emanuele Di Pascale <emanuele@voltanet.io> | 2020-04-06 17:38:27 +0200 |
| commit | d2c970ffb255e681bfcede881d28476b745ee2b8 (patch) | |
| tree | c0f53fe4d15351b59d8a63ff8ada7f5f3ed08df9 /isisd/isis_nb.h | |
| parent | Merge pull request #6161 from qlyoung/fix-bsm-json-keys (diff) | |
| download | frr-d2c970ffb255e681bfcede881d28476b745ee2b8.tar.xz frr-d2c970ffb255e681bfcede881d28476b745ee2b8.zip | |
isisd, yang: unified lsp-timers command
Yang constraints enforced by the northbound callbacks require that
the maximum lifetime be >= than (refresh interval + 300). When we are
moving from one config to another through frr-reload.py, we issue
a number of vtysh -c commands ('no lsp-refresh-interval level-1 500',
'no max-lsp-lifetime level-1 1000'), which reset these parameters to their
default values, respectively 900 and 1200. Depending on the actual
values in the current config, the order in which these commands are sent
might be the wrong one, in that we hit an invalid intermediate state and
make vtysh (and by extension frr-reload.py) return an error.
As a workaround, let's add a one-liner command that sets all these
inter-related parameters in one go, and make isisd display them as a
single line too, so that the diff will be computed as a single command.
The old individual commands are kept to ensure backwards compatibility.
Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
Diffstat (limited to 'isisd/isis_nb.h')
| -rw-r--r-- | isisd/isis_nb.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/isisd/isis_nb.h b/isisd/isis_nb.h index 29a2ded0d..e028dfd11 100644 --- a/isisd/isis_nb.h +++ b/isisd/isis_nb.h @@ -427,12 +427,8 @@ void cli_show_isis_area_pwd(struct vty *vty, struct lyd_node *dnode, bool show_defaults); void cli_show_isis_domain_pwd(struct vty *vty, struct lyd_node *dnode, bool show_defaults); -void cli_show_isis_lsp_gen_interval(struct vty *vty, struct lyd_node *dnode, - bool show_defaults); -void cli_show_isis_lsp_ref_interval(struct vty *vty, struct lyd_node *dnode, - bool show_defaults); -void cli_show_isis_lsp_max_lifetime(struct vty *vty, struct lyd_node *dnode, - bool show_defaults); +void cli_show_isis_lsp_timers(struct vty *vty, struct lyd_node *dnode, + bool show_defaults); void cli_show_isis_lsp_mtu(struct vty *vty, struct lyd_node *dnode, bool show_defaults); void cli_show_isis_spf_min_interval(struct vty *vty, struct lyd_node *dnode, |