summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure.ac4
-rw-r--r--debian/control2
-rw-r--r--doc/developer/building-libyang.rst6
-rw-r--r--redhat/frr.spec.in2
-rw-r--r--yang/frr-interface.yang6
-rw-r--r--yang/frr-ripd.yang6
-rw-r--r--yang/frr-ripngd.yang2
-rw-r--r--yang/frr-route-map.yang2
-rw-r--r--yang/frr-zebra.yang20
9 files changed, 16 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac
index 3c65bc91a..36a5ce242 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1740,8 +1740,8 @@ AC_SUBST([SNMP_CFLAGS])
dnl ---------------
dnl libyang
dnl ---------------
-PKG_CHECK_MODULES([LIBYANG], [libyang >= 0.16.105], , [
- AC_MSG_ERROR([libyang (>= 0.16.105) was not found on your system.])
+PKG_CHECK_MODULES([LIBYANG], [libyang >= 1.0.184], , [
+ AC_MSG_ERROR([libyang (>= 1.0.184) was not found on your system.])
])
ac_cflags_save="$CFLAGS"
CFLAGS="$CFLAGS $LIBYANG_CFLAGS"
diff --git a/debian/control b/debian/control
index f4275471d..fca695676 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
libsnmp-dev,
libssh-dev <!pkg.frr.nortrlib>,
libsystemd-dev <!pkg.frr.nosystemd>,
- libyang-dev (>= 0.16.74),
+ libyang-dev (>= 1.0.184),
pkg-config,
python3,
python3-dev,
diff --git a/doc/developer/building-libyang.rst b/doc/developer/building-libyang.rst
index f50b8cf72..5bd11cd10 100644
--- a/doc/developer/building-libyang.rst
+++ b/doc/developer/building-libyang.rst
@@ -10,7 +10,7 @@ The FRR project builds binary ``libyang`` packages, which we offer for download
.. warning::
- ``libyang`` version 0.16.105 or newer is required to build FRR.
+ ``libyang`` version 1.0.184 or newer is required to build FRR.
.. note::
@@ -51,7 +51,3 @@ The FRR project builds binary ``libyang`` packages, which we offer for download
make
sudo make install
-When building ``libyang`` version ``0.16.x`` it's also necessary to pass the
-``-DENABLE_CACHE=OFF`` parameter to ``cmake`` to work around a
-`known bug <https://github.com/CESNET/libyang/issues/752>`_ in libyang.
-
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 929214a14..bd0d5b27f 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -170,7 +170,7 @@ BuildRequires: make
BuildRequires: ncurses-devel
BuildRequires: readline-devel
BuildRequires: texinfo
-BuildRequires: libyang-devel >= 0.16.74
+BuildRequires: libyang-devel >= 1.0.184
%if 0%{?rhel} && 0%{?rhel} < 7
#python27-devel is available from ius community repo for RedHat/CentOS 6
BuildRequires: python27-devel
diff --git a/yang/frr-interface.yang b/yang/frr-interface.yang
index dade9f97f..46c03a1d1 100644
--- a/yang/frr-interface.yang
+++ b/yang/frr-interface.yang
@@ -300,11 +300,7 @@ module frr-interface {
}
leaf vrf {
- type string {
- length "1..16";
- }
- /* yang version 0.16 having issue accessing leafref. */
- /* type frr-vrf:vrf-ref;*/
+ type frr-vrf:vrf-ref;
description
"VRF this interface is associated with.";
}
diff --git a/yang/frr-ripd.yang b/yang/frr-ripd.yang
index 4e5795b8f..f5775ab96 100644
--- a/yang/frr-ripd.yang
+++ b/yang/frr-ripd.yang
@@ -143,7 +143,7 @@ module frr-ripd {
"Enable RIP on the specified IP network.";
}
leaf-list interface {
- type string;
+ type frr-interface:interface-ref;
description
"Enable RIP on the specified interface.";
}
@@ -204,14 +204,14 @@ module frr-ripd {
}
leaf-list passive-interface {
when "../passive-default = 'false'";
- type string;
+ type frr-interface:interface-ref;
description
"A list of interfaces where the sending of RIP packets
is disabled.";
}
leaf-list non-passive-interface {
when "../passive-default = 'true'";
- type string;
+ type frr-interface:interface-ref;
description
"A list of interfaces where the sending of RIP packets
is enabled.";
diff --git a/yang/frr-ripngd.yang b/yang/frr-ripngd.yang
index 47ae67b23..52e208b2c 100644
--- a/yang/frr-ripngd.yang
+++ b/yang/frr-ripngd.yang
@@ -101,7 +101,7 @@ module frr-ripngd {
"Enable RIPng on the specified IPv6 network.";
}
leaf-list interface {
- type string;
+ type frr-interface:interface-ref;
description
"Enable RIPng on the specified interface.";
}
diff --git a/yang/frr-route-map.yang b/yang/frr-route-map.yang
index b895cd12a..c9d35938c 100644
--- a/yang/frr-route-map.yang
+++ b/yang/frr-route-map.yang
@@ -249,7 +249,7 @@ module frr-route-map {
case interface {
when "./condition = 'interface'";
leaf interface {
- type string;
+ type frr-interface:interface-ref;
}
}
diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang
index 7762c75d6..2efc45c14 100644
--- a/yang/frr-zebra.yang
+++ b/yang/frr-zebra.yang
@@ -393,9 +393,7 @@ module frr-zebra {
}
leaf vrf {
- type string {
- length "1..36";
- }
+ type frr-vrf:vrf-ref;
description
"The tenant VRF.";
}
@@ -715,9 +713,7 @@ module frr-zebra {
choice vrf-choice {
case single {
leaf vrf {
- type string {
- length "1..36";
- }
+ type frr-vrf:vrf-ref;
description
"Retrieve routes in a non-default vrf.";
}
@@ -815,9 +811,7 @@ module frr-zebra {
choice vrf-choice {
case single {
leaf vrf {
- type string {
- length "1..36";
- }
+ type frr-vrf:vrf-ref;
description
"Retrieve routes in a non-default vrf.";
}
@@ -853,9 +847,7 @@ module frr-zebra {
output {
list vrf-list {
leaf name {
- type string {
- length "1..36";
- }
+ type frr-vrf:vrf-ref;
description
"The VRF name";
}
@@ -910,9 +902,7 @@ module frr-zebra {
output {
list vrf-vni-list {
leaf vrf-name {
- type string {
- length "1..36";
- }
+ type frr-vrf:vrf-ref;
description
"The VRF name.";
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-09 12:18:49 +0100