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

lib: fix deletion of empty prefix-lists

Browse Source 
We delete the prefix-list when its last entry is deleted, but the check
is missed when we delete the description.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-04-06 21:26:09 +03:00
parent a0145975e3
commit ad2b07055c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/filter_cli.c
View File

@ -1462,13 +1462,18 @@ DEFPY_YANG(
ACCESS_LIST_REMARK_STR) ACCESS_LIST_REMARK_STR)
{ {
char xpath[XPATH_MAXLEN]; char xpath[XPATH_MAXLEN];
int rv;
snprintf(xpath, sizeof(xpath), snprintf(xpath, sizeof(xpath),
"/frr-filter:lib/prefix-list[type='ipv4'][name='%s']/remark", "/frr-filter:lib/prefix-list[type='ipv4'][name='%s']/remark",
name); name);
nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL); nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
return nb_cli_apply_changes(vty, NULL); rv = nb_cli_apply_changes(vty, NULL);
if (rv == CMD_SUCCESS)
return plist_remove_if_empty(vty, "ipv4", name);
return rv;
} }
ALIAS( ALIAS(
@ -1658,13 +1663,18 @@ DEFPY_YANG(
ACCESS_LIST_REMARK_STR) ACCESS_LIST_REMARK_STR)
{ {
char xpath[XPATH_MAXLEN]; char xpath[XPATH_MAXLEN];
int rv;
snprintf(xpath, sizeof(xpath), snprintf(xpath, sizeof(xpath),
"/frr-filter:lib/prefix-list[type='ipv6'][name='%s']/remark", "/frr-filter:lib/prefix-list[type='ipv6'][name='%s']/remark",
name); name);
nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL); nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
return nb_cli_apply_changes(vty, NULL); rv = nb_cli_apply_changes(vty, NULL);
if (rv == CMD_SUCCESS)
return plist_remove_if_empty(vty, "ipv6", name);
return rv;
} }
ALIAS( ALIAS(