From cf0cfc2dad1812ecd188e0ea5388b2dc3582c76d Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 20 Sep 2024 15:12:03 +0200 Subject: [PATCH] confd: clarify route preference in DHCP client model Signed-off-by: Joachim Wiberg --- src/confd/yang/confd.inc | 2 +- ...2.yang => infix-dhcp-client@2024-09-20.yang} | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) rename src/confd/yang/{infix-dhcp-client@2024-04-12.yang => infix-dhcp-client@2024-09-20.yang} (87%) diff --git a/src/confd/yang/confd.inc b/src/confd/yang/confd.inc index 35458c45..4c6e2981 100644 --- a/src/confd/yang/confd.inc +++ b/src/confd/yang/confd.inc @@ -30,7 +30,7 @@ MODULES=( "infix-routing@2024-09-20.yang" "ieee802-dot1ab-lldp@2022-03-15.yang" "infix-lldp@2023-08-23.yang" - "infix-dhcp-client@2024-04-12.yang" + "infix-dhcp-client@2024-09-20.yang" "infix-meta@2024-06-19.yang" "infix-system@2024-09-13.yang" "infix-services@2024-05-30.yang" diff --git a/src/confd/yang/infix-dhcp-client@2024-04-12.yang b/src/confd/yang/infix-dhcp-client@2024-09-20.yang similarity index 87% rename from src/confd/yang/infix-dhcp-client@2024-04-12.yang rename to src/confd/yang/infix-dhcp-client@2024-09-20.yang index 9991861f..9d59be45 100644 --- a/src/confd/yang/infix-dhcp-client@2024-04-12.yang +++ b/src/confd/yang/infix-dhcp-client@2024-09-20.yang @@ -10,6 +10,11 @@ module infix-dhcp-client { contact "kernelkit@googlegroups.com"; description "This module implements an IPv4 DHCP client"; + revision 2024-09-20 { + description "Routes are installed in Frr (staticd), clarify preference + vs metric and adjust default preference 100 -> 5."; + reference "internal"; + } revision 2024-04-12 { description "Adjust DHCP client hostname option, max 64 charachters."; reference "internal"; @@ -29,7 +34,7 @@ module infix-dhcp-client { typedef route-preference { type uint32; - description "This type is used for route preferences (metric)."; + description "This type is used for selecting route preference (distance)."; } typedef dhcp-options { @@ -149,12 +154,12 @@ module infix-dhcp-client { } leaf route-preference { type route-preference; - default 100; + default 5; description - "The metric any route is installed with, both option 33 and 121. - The default (100) is based on a plain Ethernet interface, the - interface type determines this, e.g. a WiFi interface would be - metric 500."; + "The preference (administrative distance) that all DHCP routes are + installed with, option 3, 33 and 121. The default preferfence (5) + is higher (less worth) than static routes, but lower than those + learned via dynamic routing protocols, like OSPF."; } } }