From 307cdb02b4048635ef699571290cb9f3849a25c0 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 30 Jan 2024 09:36:03 +0100 Subject: [PATCH] confd: bump infix-dhcp-client YANG model version for release The DHCP client YANG model saw a lot of changes added in the 23.12 sprint, fortunately there was never an official release. This commit bumps the model version for v24.01. Signed-off-by: Joachim Wiberg --- src/confd/bin/bootstrap | 2 +- src/confd/src/infix-dhcp.c | 2 +- ...3-05-22.yang => infix-dhcp-client@2024-01-30.yang} | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) rename src/confd/yang/{infix-dhcp-client@2023-05-22.yang => infix-dhcp-client@2024-01-30.yang} (92%) diff --git a/src/confd/bin/bootstrap b/src/confd/bin/bootstrap index 3129bf61..bc2d1f03 100755 --- a/src/confd/bin/bootstrap +++ b/src/confd/bin/bootstrap @@ -221,7 +221,7 @@ sysrepoctl -s $SEARCH \ -e vlan-filtering \ -i ieee802-dot1ab-lldp@2022-03-15.yang -g wheel -p 0660 \ -i infix-lldp@2023-08-23.yang -g wheel -p 0660 \ - -i infix-dhcp-client@2023-05-22.yang -g wheel -p 0660 \ + -i infix-dhcp-client@2024-01-30.yang -g wheel -p 0660 \ -i infix-shell-type@2023-08-21.yang -g wheel -p 0660 \ -i infix-system@2023-10-19.yang -g wheel -p 0660 \ -i infix-services@2023-10-16.yang -g wheel -p 0660 \ diff --git a/src/confd/src/infix-dhcp.c b/src/confd/src/infix-dhcp.c index d2a860ef..147a65e6 100644 --- a/src/confd/src/infix-dhcp.c +++ b/src/confd/src/infix-dhcp.c @@ -18,7 +18,7 @@ #define XPATH "/infix-dhcp-client:dhcp-client" static const struct srx_module_requirement reqs[] = { - { .dir = YANG_PATH_, .name = MODULE, .rev = "2023-05-22" }, + { .dir = YANG_PATH_, .name = MODULE, .rev = "2024-01-30" }, { NULL } }; diff --git a/src/confd/yang/infix-dhcp-client@2023-05-22.yang b/src/confd/yang/infix-dhcp-client@2024-01-30.yang similarity index 92% rename from src/confd/yang/infix-dhcp-client@2023-05-22.yang rename to src/confd/yang/infix-dhcp-client@2024-01-30.yang index ef6eb1d0..c73d4512 100644 --- a/src/confd/yang/infix-dhcp-client@2023-05-22.yang +++ b/src/confd/yang/infix-dhcp-client@2024-01-30.yang @@ -10,6 +10,11 @@ module infix-dhcp-client { contact "kernelkit@googlegroups.com"; description "This module implements an IPv4 DHCP client"; + revision 2024-01-30 { + description "Add DHCP client options, arping, and route preference."; + reference "internal"; + } + revision 2023-05-22 { description "Initial revision."; reference "rfc2131 rfc7950"; @@ -123,9 +128,9 @@ module infix-dhcp-client { key "name"; description "List of DHCP options to request (and accept). The default is an - empty list, meaning all supported options. To restrict the - client to only get IP address and default route, set this to: - 'subnet router'"; + empty list, meaning all supported options. To restrict the + client to only get IP address and default route, set this to: + 'subnet router'"; leaf name { type dhcp-options; description "DHCP option to request from, or inform server of.";