From 2922b909afba511bcc5857b6a67af7bd965c1165 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 12 Nov 2024 06:05:31 +0100 Subject: [PATCH] confd: add validation of min/max interface name length A sane interface name is at least two characters long, and in Linux the interface name (using ip link) is at most 15 characthers long. Signed-off-by: Joachim Wiberg --- src/confd/yang/confd.inc | 2 +- src/confd/yang/containers.inc | 2 +- src/confd/yang/infix-interfaces.yang | 13 +++++++++++++ ...-10-28.yang => infix-interfaces@2024-11-12.yang} | 0 4 files changed, 15 insertions(+), 2 deletions(-) rename src/confd/yang/{infix-interfaces@2024-10-28.yang => infix-interfaces@2024-11-12.yang} (100%) diff --git a/src/confd/yang/confd.inc b/src/confd/yang/confd.inc index ea4fe93b..cb7eee3d 100644 --- a/src/confd/yang/confd.inc +++ b/src/confd/yang/confd.inc @@ -37,7 +37,7 @@ MODULES=( "ieee802-ethernet-interface@2019-06-21.yang" "infix-ethernet-interface@2024-02-27.yang" "infix-factory-default@2023-06-28.yang" - "infix-interfaces@2024-10-28.yang -e vlan-filtering" + "infix-interfaces@2024-11-12.yang -e vlan-filtering" # from rousette "ietf-restconf@2017-01-26.yang" diff --git a/src/confd/yang/containers.inc b/src/confd/yang/containers.inc index af72dc83..c143090d 100644 --- a/src/confd/yang/containers.inc +++ b/src/confd/yang/containers.inc @@ -1,6 +1,6 @@ # -*- sh -*- # REMEMBER TO UPDATE infix-interfaces ALSO IN confd.inc MODULES=( - "infix-interfaces@2024-10-28.yang -e vlan-filtering -e containers" + "infix-interfaces@2024-11-12.yang -e vlan-filtering -e containers" "infix-containers@2024-10-14.yang" ) diff --git a/src/confd/yang/infix-interfaces.yang b/src/confd/yang/infix-interfaces.yang index b5c0bbd6..16c7d603 100644 --- a/src/confd/yang/infix-interfaces.yang +++ b/src/confd/yang/infix-interfaces.yang @@ -23,6 +23,11 @@ module infix-interfaces { contact "kernelkit@googlegroups.com"; description "Linux bridge and lag extensions for ietf-interfaces."; + revision 2024-11-12 { + description "Limit name 1-15 chars, Linux limitation."; + reference "internal"; + } + revision 2024-10-28 { description "Limit description to 64 chars, matching IF-MIB max."; reference "internal"; @@ -89,6 +94,14 @@ module infix-interfaces { } } + deviation "/if:interfaces/if:interface/if:name" { + deviate replace { + type string { + length "1..15"; + } + } + } + deviation "/if:interfaces/if:interface/if:description" { deviate replace { type string { diff --git a/src/confd/yang/infix-interfaces@2024-10-28.yang b/src/confd/yang/infix-interfaces@2024-11-12.yang similarity index 100% rename from src/confd/yang/infix-interfaces@2024-10-28.yang rename to src/confd/yang/infix-interfaces@2024-11-12.yang