matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #18268 from donaldsharp/yang_correct_vrf_issue

Browse source 
lib: Correct handling of /frr-vrf:lib/vrf/state/active
This commit is contained in:
Christian Hopps 2025-03-05 01:19:05 -05:00 committed by GitHub
parent e47a0557e5 ad04988ad4
commit 5cf533ba74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/vrf.c
View file

@ -1044,7 +1044,7 @@ static const void *lib_vrf_lookup_next(struct nb_cb_lookup_entry_args *args)
} }
/* /*
* XPath: /frr-vrf:lib/vrf/id * XPath: /frr-vrf:lib/vrf/state/id
*/ */
static struct yang_data * static struct yang_data *
lib_vrf_state_id_get_elem(struct nb_cb_get_elem_args *args) lib_vrf_state_id_get_elem(struct nb_cb_get_elem_args *args)
@ -1055,17 +1055,14 @@ lib_vrf_state_id_get_elem(struct nb_cb_get_elem_args *args)
} }
/* /*
* XPath: /frr-vrf:lib/vrf/active * XPath: /frr-vrf:lib/vrf/state/active
*/ */
static struct yang_data * static struct yang_data *
lib_vrf_state_active_get_elem(struct nb_cb_get_elem_args *args) lib_vrf_state_active_get_elem(struct nb_cb_get_elem_args *args)
{ {
struct vrf *vrfp = (struct vrf *)args->list_entry; struct vrf *vrfp = (struct vrf *)args->list_entry;
if (vrfp->status == VRF_ACTIVE) return yang_data_new_bool(args->xpath, vrfp->status == VRF_ACTIVE ? true : false);
return yang_data_new_bool(args->xpath, true);
return NULL;
} }
/* clang-format off */ /* clang-format off */