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

lib: always return valid data format for show yang command.

Browse Source 
For JSON return `{}` for XPath return an XML comment `<!-- Not found -->`

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2023-04-17 01:29:33 -04:00
parent 4ac51e2430
commit d249d7e0ab
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/northbound_cli.c
View File

@ -1434,6 +1434,7 @@ DEFPY (show_yang_operational_data,
struct lyd_node *dnode; struct lyd_node *dnode;
char *strp; char *strp;
uint32_t print_options = LYD_PRINT_WITHSIBLINGS; uint32_t print_options = LYD_PRINT_WITHSIBLINGS;
int ret;
if (xml) if (xml)
format = LYD_XML; format = LYD_XML;
@ -1454,10 +1455,15 @@ DEFPY (show_yang_operational_data,
/* Obtain data. */ /* Obtain data. */
dnode = yang_dnode_new(ly_ctx, false); dnode = yang_dnode_new(ly_ctx, false);
if (nb_oper_data_iterate(xpath, translator, 0, nb_cli_oper_data_cb, ret = nb_oper_data_iterate(xpath, translator, 0, nb_cli_oper_data_cb,
dnode) dnode);
!= NB_OK) { if (ret != NB_OK) {
vty_out(vty, "%% Failed to fetch operational data.\n"); if (format == LYD_JSON)
vty_out(vty, "{}\n");
else {
/* embed ly_last_errmsg() when we get newer libyang */
vty_out(vty, "<!-- Not found -->\n");
}
yang_dnode_free(dnode); yang_dnode_free(dnode);
return CMD_WARNING; return CMD_WARNING;
} }