From 2063c94f422ac75488d42ab3ff02f19268f0e5cd Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 23 Sep 2024 12:17:18 +0200 Subject: [PATCH] confd: drop deviation for /if:interfaces-state Not the most obvious patch, but let me explain -- there will always be a conflict betweem usability and "maintainability". The ietf-interfaces yang model already declares /interfaces-state as deprecated, so we don't really need to add a deviation 'not-supported', for usability, however, it may be useful since the deviation helps cut out that tree completely. While working with ietf-routing and our companion models, I found that since it relies on ietf-interfaces, it also breaks the reload/reimport of infix-routing while developing extensions/changes: $ lint.sh -f tree ieee802-* iana-if-type@2023-01-26.yang \ ietf-interfaces@2018-02-20.yang \ infix-interfaces@2024-01-15.yang \ ietf-routing@2018-03-13.yang \ ietf-ipv4-unicast-routing@2018-03-13.yang \ ietf-ospf@2022-10-19.yang \ infix-routing@2024-09-22.yang libyang err : Not found node "interfaces-state" in path. (Schema location "/ietf-routing:routing-state/interfaces/interface".) libyang err : Target of leafref "interface" cannot be referenced because it is disabled. (Schema location "/ietf-routing:routing-state/interfaces/interface".) YANGLINT[E]: Parsing schema module "ietf-routing@2018-03-13.yang" failed. The only way to change/update models for a given build is to either, a) surgically remove offending models from output/target/, then reinstall all dependencies and hope it works better, or b) rebuild from distclean. In most cases you end up with alternative b). Signed-off-by: Joachim Wiberg --- src/confd/yang/confd.inc | 2 +- src/confd/yang/containers.inc | 2 +- ...024-01-15.yang => infix-interfaces@2024-09-23.yang} | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/confd/yang/{infix-interfaces@2024-01-15.yang => infix-interfaces@2024-09-23.yang} (92%) diff --git a/src/confd/yang/confd.inc b/src/confd/yang/confd.inc index 8b96b08d..215113b0 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-01-15.yang -e vlan-filtering" + "infix-interfaces@2024-09-23.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 6ddd9166..7e63b0f2 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-01-15.yang -e vlan-filtering -e containers" + "infix-interfaces@2024-09-23.yang -e vlan-filtering -e containers" "infix-containers@2024-03-27.yang" ) diff --git a/src/confd/yang/infix-interfaces@2024-01-15.yang b/src/confd/yang/infix-interfaces@2024-09-23.yang similarity index 92% rename from src/confd/yang/infix-interfaces@2024-01-15.yang rename to src/confd/yang/infix-interfaces@2024-09-23.yang index 3b042e3e..6f807882 100644 --- a/src/confd/yang/infix-interfaces@2024-01-15.yang +++ b/src/confd/yang/infix-interfaces@2024-09-23.yang @@ -20,6 +20,11 @@ module infix-interfaces { contact "kernelkit@googlegroups.com"; description "Linux bridge and lag extensions for ietf-interfaces."; + revision 2024-09-23 { + description "Drop interfaces-state deviation, already marked deprecated."; + reference "internal"; + } + revision 2024-01-15 { description "Add support for container ports (CNI networks)."; reference "internal"; @@ -71,9 +76,4 @@ module infix-interfaces { config true; } } - - deviation "/if:interfaces-state" { - deviate not-supported; - description "Deprecated"; - } }