summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/vrf.c9
-rw-r--r--yang/frr-affinity-map.yang16
2 files changed, 6 insertions, 19 deletions
diff --git a/lib/vrf.c b/lib/vrf.c
index 0b39d93602..997926fd9a 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -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 *
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 *
lib_vrf_state_active_get_elem(struct nb_cb_get_elem_args *args)
{
struct vrf *vrfp = (struct vrf *)args->list_entry;
- if (vrfp->status == VRF_ACTIVE)
- return yang_data_new_bool(args->xpath, true);
-
- return NULL;
+ return yang_data_new_bool(args->xpath, vrfp->status == VRF_ACTIVE ? true : false);
}
/* clang-format off */
diff --git a/yang/frr-affinity-map.yang b/yang/frr-affinity-map.yang
index f1d9e44738..b53309661b 100644
--- a/yang/frr-affinity-map.yang
+++ b/yang/frr-affinity-map.yang
@@ -3,18 +3,6 @@ module frr-affinity-map {
namespace "http://frrouting.org/yang/affinity-map";
prefix frr-affinity-map;
- import ietf-inet-types {
- prefix inet;
- }
-
- import frr-filter {
- prefix filter;
- }
-
- import frr-interface {
- prefix frr-interface;
- }
-
organization
"FRRouting";
contact
@@ -51,6 +39,7 @@ module frr-affinity-map {
revision 2022-11-03 {
description
"Initial revision";
+ reference "FRRouting";
}
typedef affinity-map-ref {
@@ -63,6 +52,7 @@ module frr-affinity-map {
}
container lib {
+ description "Affinity map library";
container affinity-maps {
description
"Affinity Mapping Table";
@@ -79,10 +69,10 @@ module frr-affinity-map {
"Affinity Name";
}
leaf value {
- mandatory true;
type uint16 {
range "0..1023";
}
+ mandatory true;
description
"Bit position";
}