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

lib: add ability to sort CLI commands printed by NB layer

Browse Source 
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-03-23 16:16:01 +03:00
parent 634aa8253e
commit c6f1f711bf
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/northbound.h
View File

@ -473,6 +473,23 @@ struct nb_callbacks {
*/ */
int (*rpc)(struct nb_cb_rpc_args *args); int (*rpc)(struct nb_cb_rpc_args *args);
/*
* Optional callback to compare the data nodes when printing
* the CLI commands associated with them.
*
* dnode1
* The first data node to compare.
*
* dnode2
* The second data node to compare.
*
* Returns:
* <0 when the CLI command for the dnode1 should be printed first
* >0 when the CLI command for the dnode2 should be printed first
* 0 when there is no difference
*/
int (*cli_cmp)(struct lyd_node *dnode1, struct lyd_node *dnode2);
/* /*
* Optional callback to show the CLI command associated to the given * Optional callback to show the CLI command associated to the given
* YANG data node. * YANG data node.

47
lib/northbound_cli.c
View File

@ -553,10 +553,55 @@ void nb_cli_show_config_prepare(struct nb_config *config, bool with_defaults)
static void show_dnode_children_cmds(struct vty *vty, struct lyd_node *root, static void show_dnode_children_cmds(struct vty *vty, struct lyd_node *root,
bool with_defaults) bool with_defaults)
{ {
struct nb_node *nb_node, *sort_node = NULL;
struct listnode *listnode;
struct lyd_node *child; struct lyd_node *child;
struct list *sort_list;
void *data;
LY_TREE_FOR (root->child, child) {
nb_node = child->schema->priv;
/*
* We finished processing current list,
* it's time to print the config.
*/
if (sort_node && nb_node != sort_node) {
for (ALL_LIST_ELEMENTS_RO(sort_list, listnode, data))
nb_cli_show_dnode_cmds(vty, data,
with_defaults);
list_delete(&sort_list);
sort_node = NULL;
}
/*
* If the config needs to be sorted,
* then add the dnode to the sorting
* list for later processing.
*/
if (nb_node && nb_node->cbs.cli_cmp) {
if (!sort_node) {
sort_node = nb_node;
sort_list = list_new();
sort_list->cmp = (int (*)(void *, void *))
nb_node->cbs.cli_cmp;
}
listnode_add_sort(sort_list, child);
continue;
}
LY_TREE_FOR (root->child, child)
nb_cli_show_dnode_cmds(vty, child, with_defaults); nb_cli_show_dnode_cmds(vty, child, with_defaults);
}
if (sort_node) {
for (ALL_LIST_ELEMENTS_RO(sort_list, listnode, data))
nb_cli_show_dnode_cmds(vty, data, with_defaults);
list_delete(&sort_list);
sort_node = NULL;
}
} }
void nb_cli_show_dnode_cmds(struct vty *vty, struct lyd_node *root, void nb_cli_show_dnode_cmds(struct vty *vty, struct lyd_node *root,