From: Andrei Pavel Date: Fri, 5 Nov 2021 06:50:48 +0000 (+0200) Subject: [#2136] YANG: add lifetimes to client classes X-Git-Tag: Kea-2.1.1~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=424c42813015fc2c3da258334c3caf8e497b9c4b;p=thirdparty%2Fkea.git [#2136] YANG: add lifetimes to client classes --- diff --git a/src/lib/yang/yang_revisions.h b/src/lib/yang/yang_revisions.h index 6571045420..494b462c3a 100644 --- a/src/lib/yang/yang_revisions.h +++ b/src/lib/yang/yang_revisions.h @@ -23,8 +23,8 @@ static const std::map YANG_REVISIONS = { { "ietf-dhcpv6-server", "2018-09-04" }, { "kea-types", "2019-08-12" }, { "kea-dhcp-types", "2021-08-25" }, - { "kea-dhcp4-server", "2021-08-25" }, - { "kea-dhcp6-server", "2021-08-25" }, + { "kea-dhcp4-server", "2021-11-24" }, + { "kea-dhcp6-server", "2021-11-24" }, { "kea-ctrl-agent", "2019-08-12" }, { "kea-dhcp-ddns", "2019-08-12" } }; diff --git a/src/share/yang/modules/Makefile.am b/src/share/yang/modules/Makefile.am index dd0197d0f4..27e0d780c5 100644 --- a/src/share/yang/modules/Makefile.am +++ b/src/share/yang/modules/Makefile.am @@ -14,8 +14,8 @@ yangmodules_list += ietf-yang-types@2013-07-15.yang yangmodules_list += kea-ctrl-agent@2019-08-12.yang yangmodules_list += kea-dhcp-ddns@2019-08-12.yang yangmodules_list += kea-dhcp-types@2021-08-25.yang -yangmodules_list += kea-dhcp4-server@2021-08-25.yang -yangmodules_list += kea-dhcp6-server@2021-08-25.yang +yangmodules_list += kea-dhcp4-server@2021-11-24.yang +yangmodules_list += kea-dhcp6-server@2021-11-24.yang yangmodules_list += kea-types@2019-08-12.yang yangmodules_list += keatest-module@2018-11-20.yang diff --git a/src/share/yang/modules/hashes/kea-dhcp4-server@2021-08-25.hash b/src/share/yang/modules/hashes/kea-dhcp4-server@2021-08-25.hash deleted file mode 100644 index 299144eab9..0000000000 --- a/src/share/yang/modules/hashes/kea-dhcp4-server@2021-08-25.hash +++ /dev/null @@ -1 +0,0 @@ -e285a73b42ca5be3d920c6284a10bd14c2347bd2383570d7854cd3421ac6b1fb diff --git a/src/share/yang/modules/hashes/kea-dhcp4-server@2021-11-24.hash b/src/share/yang/modules/hashes/kea-dhcp4-server@2021-11-24.hash new file mode 100644 index 0000000000..28ba6e891e --- /dev/null +++ b/src/share/yang/modules/hashes/kea-dhcp4-server@2021-11-24.hash @@ -0,0 +1 @@ +deb52bcbe4b7e558971526fc69ce5fffa67dca9caf6360560b96430507ef78d8 diff --git a/src/share/yang/modules/hashes/kea-dhcp6-server@2021-08-25.hash b/src/share/yang/modules/hashes/kea-dhcp6-server@2021-08-25.hash deleted file mode 100644 index edccc05aad..0000000000 --- a/src/share/yang/modules/hashes/kea-dhcp6-server@2021-08-25.hash +++ /dev/null @@ -1 +0,0 @@ -bc8226204578bb3be7e73db344ea9d5f3154cad0916ef35889906afe4a7b68c3 diff --git a/src/share/yang/modules/hashes/kea-dhcp6-server@2021-11-24.hash b/src/share/yang/modules/hashes/kea-dhcp6-server@2021-11-24.hash new file mode 100644 index 0000000000..329ea7265a --- /dev/null +++ b/src/share/yang/modules/hashes/kea-dhcp6-server@2021-11-24.hash @@ -0,0 +1 @@ +591fd1a79071ae61046844f1a7a5b048cd7c61abbc9d993de63b5a61557044b1 diff --git a/src/share/yang/modules/kea-dhcp4-server@2021-08-25.yang b/src/share/yang/modules/kea-dhcp4-server@2021-11-24.yang similarity index 98% rename from src/share/yang/modules/kea-dhcp4-server@2021-08-25.yang rename to src/share/yang/modules/kea-dhcp4-server@2021-11-24.yang index 688ed17bba..a390512b69 100644 --- a/src/share/yang/modules/kea-dhcp4-server@2021-08-25.yang +++ b/src/share/yang/modules/kea-dhcp4-server@2021-11-24.yang @@ -20,6 +20,10 @@ module kea-dhcp4-server { description "This model defines a YANG data model that can be used to configure and manage a Kea DHCPv4 server."; + revision 2021-11-24 { + description "Added lifetimes to client classes."; + } + revision 2021-08-25 { description "Added store-extended-info"; } @@ -230,6 +234,9 @@ module kea-dhcp4-server { uses next-server; uses server-hostname; uses boot-file-name; + uses dhcp:min-valid-lifetime; + uses dhcp:max-valid-lifetime; + uses dhcp:valid-lifetime; uses dhcp:class-user-context; } } diff --git a/src/share/yang/modules/kea-dhcp6-server@2021-08-25.yang b/src/share/yang/modules/kea-dhcp6-server@2021-11-24.yang similarity index 98% rename from src/share/yang/modules/kea-dhcp6-server@2021-08-25.yang rename to src/share/yang/modules/kea-dhcp6-server@2021-11-24.yang index 438075ddfb..a616553e76 100644 --- a/src/share/yang/modules/kea-dhcp6-server@2021-08-25.yang +++ b/src/share/yang/modules/kea-dhcp6-server@2021-11-24.yang @@ -20,6 +20,10 @@ module kea-dhcp6-server { description "This model defines a YANG data model that can be used to configure and manage a Kea DHCPv6 server."; + revision 2021-11-24 { + description "Added lifetimes to client classes."; + } + revision 2021-08-25 { description "Added store-extended-info"; } @@ -252,7 +256,7 @@ module kea-dhcp6-server { } grouping client-classes { - description "Client classes grouping."; + description "Client class grouping."; list client-class { key name; ordered-by user; @@ -261,6 +265,12 @@ module kea-dhcp6-server { uses dhcp:class-test; uses dhcp:class-only-if-required; uses option-data-list; + uses min-preferred-lifetime; + uses max-preferred-lifetime; + uses preferred-lifetime; + uses dhcp:min-valid-lifetime; + uses dhcp:max-valid-lifetime; + uses dhcp:valid-lifetime; uses dhcp:class-user-context; } }