Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8073 from idryzhov/vtysh-show-config 

lib: allow "show config running" command for non-transactional CLI
This commit is contained in:
Santosh P K 2021-03-01 18:40:06 +05:30 committed by GitHub
parent 8cf565010c bcbe60d456
commit 0a1e7b612a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/northbound_cli.c
View File

@ -1906,7 +1906,6 @@ void nb_cli_init(struct thread_master *tm)
if (frr_get_cli_mode() == FRR_CLI_TRANSACTIONAL) {
install_element(ENABLE_NODE, &config_exclusive_cmd);
install_element(ENABLE_NODE, &config_private_cmd);
install_element(ENABLE_NODE, &show_config_running_cmd);
install_element(ENABLE_NODE,
&show_config_compare_without_candidate_cmd);
install_element(ENABLE_NODE, &show_config_transaction_cmd);
@ -1919,6 +1918,7 @@ void nb_cli_init(struct thread_master *tm)
}
/* Other commands. */
install_element(ENABLE_NODE, &show_config_running_cmd);
install_element(CONFIG_NODE, &yang_module_translator_load_cmd);
install_element(CONFIG_NODE, &yang_module_translator_unload_cmd);
install_element(ENABLE_NODE, &show_yang_operational_data_cmd);

19
vtysh/vtysh.c
View File

@ -2851,6 +2851,24 @@ DEFUN (vtysh_show_error_code,
}
/* Northbound. */
DEFUN (show_config_running,
show_config_running_cmd,
"show configuration running\
[<json|xml> [translate WORD]]\
[with-defaults]" DAEMONS_LIST,
SHOW_STR
"Configuration information\n"
"Running configuration\n"
"Change output format to JSON\n"
"Change output format to XML\n"
"Translate output\n"
"YANG module translator\n"
"Show default values\n"
DAEMONS_STR)
{
return show_one_daemon(vty, argv, argc - 1, argv[argc - 1]->text);
}
DEFUN (show_yang_operational_data,
show_yang_operational_data_cmd,
"show yang operational-data XPATH\
@ -4564,6 +4582,7 @@ void vtysh_init_vty(void)
install_element(CONFIG_NODE, &vtysh_debug_memstats_cmd);
/* northbound */
install_element(ENABLE_NODE, &show_config_running_cmd);
install_element(ENABLE_NODE, &show_yang_operational_data_cmd);
install_element(ENABLE_NODE, &debug_nb_cmd);
install_element(CONFIG_NODE, &debug_nb_cmd);