proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 12:49:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5444 from opensourcerouting/show-candidate-fix

Browse Source 
lib: fix display of candidate configurations
This commit is contained in:
Donald Sharp 2019-12-02 11:26:33 -05:00 committed by GitHub
commit 7a4429d1f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/northbound_cli.c
View File

@ -432,12 +432,12 @@ void nb_cli_show_config_prepare(struct nb_config *config, bool with_defaults)
lyd_schema_sort(config->dnode, 1); lyd_schema_sort(config->dnode, 1);
/* /*
* When "with-defaults" is used, call lyd_validate() only to create * Call lyd_validate() only to create default child nodes, ignoring
* default child nodes, ignoring any possible validation error. This * any possible validation error. This doesn't need to be done when
* doesn't need to be done when displaying the running configuration * displaying the running configuration since it's always fully
* since it's always fully validated. * validated.
*/ */
if (with_defaults && config != running_config) if (config != running_config)
(void)lyd_validate(&config->dnode, (void)lyd_validate(&config->dnode,
LYD_OPT_CONFIG | LYD_OPT_WHENAUTODEL, LYD_OPT_CONFIG | LYD_OPT_WHENAUTODEL,
ly_native_ctx); ly_native_ctx);