summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hopps <chopps@labn.net>2024-04-20 13:59:02 +0200
committerChristian Hopps <chopps@labn.net>2024-04-20 14:04:00 +0200
commit74fb4056cb496e3273ea6512ab160b7de0885608 (patch)
treeb8d8191d06d517152b331683b1e4822bb580f5f5
parentMerge pull request #15715 from zhou-run/202404092057 (diff)
downloadfrr-74fb4056cb496e3273ea6512ab160b7de0885608.tar.xz
frr-74fb4056cb496e3273ea6512ab160b7de0885608.zip
yang: add missing `zif-gre` zebra interface type
This was caught by the grpc_basic test which was receiving an invalid error result, which was returned b/c inside zebra the libyang code was flagging the value as invalid for a derived zebra interface type. Signed-off-by: Christian Hopps <chopps@labn.net>
-rw-r--r--yang/frr-zebra.yang6
-rw-r--r--zebra/zebra_nb_state.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang
index f1a69068c..79c524a40 100644
--- a/yang/frr-zebra.yang
+++ b/yang/frr-zebra.yang
@@ -151,6 +151,12 @@ module frr-zebra {
"Zebra interface type macvlan.";
}
+ identity zif-gre {
+ base zebra-interface-type;
+ description
+ "Zebra interface type gre.";
+ }
+
/*
* Multicast RPF mode configurable type
*/
diff --git a/zebra/zebra_nb_state.c b/zebra/zebra_nb_state.c
index 46492f023..63ac7877d 100644
--- a/zebra/zebra_nb_state.c
+++ b/zebra/zebra_nb_state.c
@@ -55,6 +55,10 @@ lib_interface_zebra_state_zif_type_get_elem(struct nb_cb_get_elem_args *args)
zebra_if = ifp->info;
+ /*
+ * NOTE: when adding a new type to the switch, make sure it is defined
+ * in it's YANG model.
+ */
switch (zebra_if->zif_type) {
case ZEBRA_IF_OTHER:
type = "frr-zebra:zif-other";