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

isisd: fix instance ldp-sync configuration

Browse Source 
Don't rely on operational data to validate that configuration is applied
to the default VRF. The VRF name is stored in the config - use it instead.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-06-23 00:23:18 +03:00
parent 0a156eecf2
commit 80ab95b134
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
isisd/isis_nb_config.c
View File

@ -2383,14 +2383,14 @@ int isis_instance_segment_routing_prefix_sid_map_prefix_sid_n_flag_clear_modify(
int isis_instance_mpls_ldp_sync_create(struct nb_cb_create_args *args)
{
struct isis_area *area;
const char *vrfname;
switch (args->event) {
case NB_EV_VALIDATE:
area = nb_running_get_entry(args->dnode, NULL, false);
if (area == NULL || area->isis == NULL)
return NB_ERR_VALIDATION;
vrfname = yang_dnode_get_string(
lyd_parent(lyd_parent(args->dnode)), "./vrf");
if (area->isis->vrf_id != VRF_DEFAULT) {
if (strcmp(vrfname, VRF_DEFAULT_NAME)) {
snprintf(args->errmsg, args->errmsg_len,
"LDP-Sync only runs on Default VRF");
return NB_ERR_VALIDATION;
@ -2427,14 +2427,15 @@ int isis_instance_mpls_ldp_sync_holddown_modify(struct nb_cb_modify_args *args)
{
struct isis_area *area;
uint16_t holddown;
const char *vrfname;
switch (args->event) {
case NB_EV_VALIDATE:
area = nb_running_get_entry(args->dnode, NULL, false);
if (area == NULL || area->isis == NULL)
return NB_ERR_VALIDATION;
vrfname = yang_dnode_get_string(
lyd_parent(lyd_parent(lyd_parent(args->dnode))),
"./vrf");
if (area->isis->vrf_id != VRF_DEFAULT) {
if (strcmp(vrfname, VRF_DEFAULT_NAME)) {
snprintf(args->errmsg, args->errmsg_len,
"LDP-Sync only runs on Default VRF");
return NB_ERR_VALIDATION;