2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-28 20:47:48 +00:00

[#1944] NETCONF: move store-extended-info from kea-types to kea-dhcp-types

This commit is contained in:
Andrei Pavel 2021-08-20 18:27:03 +03:00
parent 3d841a846a
commit e5b0288922
No known key found for this signature in database
GPG Key ID: 86E9385BC2203766
18 changed files with 53 additions and 45 deletions

View File

@ -17,19 +17,19 @@ namespace yang {
static const std::map<std::string, std::string> YANG_REVISIONS = {
#ifdef KEATEST_MODULE
{ "keatest-module", "2018-11-20" },
#endif // KEATEST_MODULE
#endif // KEATEST_MODULE
{ "ietf-dhcpv6-types", "2018-09-04" },
{ "ietf-dhcpv6-options", "2018-09-04" },
{ "ietf-dhcpv6-server", "2018-09-04" },
{ "kea-types", "2021-07-28" },
{ "kea-dhcp-types", "2019-08-12" },
{ "kea-dhcp4-server", "2021-07-28" },
{ "kea-dhcp6-server", "2021-07-28" },
{ "kea-types", "2019-08-12" },
{ "kea-dhcp-types", "2021-08-25" },
{ "kea-dhcp4-server", "2021-08-25" },
{ "kea-dhcp6-server", "2021-08-25" },
{ "kea-ctrl-agent", "2019-08-12" },
{ "kea-dhcp-ddns", "2019-08-12" }
};
}; // end of namespace isc::yang
}; // end of namespace isc
} // namespace yang
} // namespace isc
#endif // ISC_YANG_REVISIONS_H

View File

@ -13,10 +13,10 @@ yangmodules_list += ietf-inet-types@2013-07-15.yang
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@2019-08-12.yang
yangmodules_list += kea-dhcp4-server@2021-07-28.yang
yangmodules_list += kea-dhcp6-server@2021-07-28.yang
yangmodules_list += kea-types@2021-07-28.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-types@2019-08-12.yang
yangmodules_list += keatest-module@2018-11-20.yang
EXTRA_DIST = hashes ${yangmodules_list}

View File

@ -1 +1 @@
0eec8b9fda520d7d4160fb52a12f8e5488942de2acd49b70b9f3df12e018867d
5d11568b445edc65a4783f53fe5e8571af9a79b759272d4a3e4bfba994f71087

View File

@ -1 +1 @@
96585e06eb96d3938cd63a98003cf6b35393b83700863e204fb56232c7b48c71
230145eb977108912d0015b8fb0d77bd4f53df0f4dfc317329ea5892569a7ba8

View File

@ -1 +0,0 @@
c3e17f01be9d00b33561ed7b1a8fb73ce95a7d3bdf4da36c340662410bfffb74

View File

@ -0,0 +1 @@
4e82ff3d43d89f0973edd0ec4b11d761829e89a9ddcbb122c2c418a3d28afe18

View File

@ -1 +0,0 @@
a3842405494ed469a91661cc32fe300326e55c4a1f3adde6b264ab1f54dbfe4b

View File

@ -0,0 +1 @@
e285a73b42ca5be3d920c6284a10bd14c2347bd2383570d7854cd3421ac6b1fb

View File

@ -1 +0,0 @@
fa6065bce7e34f39a1cb1571a69795b37ec12d98aaa5cffa6e66aa7cbb2ad1e5

View File

@ -0,0 +1 @@
bc8226204578bb3be7e73db344ea9d5f3154cad0916ef35889906afe4a7b68c3

View File

@ -0,0 +1 @@
c06b5242654257c9b8d7f9d2375ab78e9c5cfce74ed4e9f8e21face43a949b9a

View File

@ -1 +0,0 @@
7fe443fddcc4831a6f28c2dadcbcfb786e7af72a0383db32630fc00bfca108dd

View File

@ -8,7 +8,7 @@ module kea-ctrl-agent {
}
import kea-types {
prefix kea;
revision-date 2021-07-28;
revision-date 2019-08-12;
}
organization "Internet Systems Consortium";

View File

@ -8,7 +8,7 @@ module kea-dhcp-ddns {
}
import kea-types {
prefix kea;
revision-date 2021-07-28;
revision-date 2019-08-12;
}
organization "Internet Systems Consortium";

View File

@ -8,16 +8,20 @@ module kea-dhcp-types {
}
import kea-types {
prefix kea;
revision-date 2021-07-28;
revision-date 2019-08-12;
}
organization "Internet Systems Consortium";
contact "kea-dev@lists.isc.org";
description "This file defines some commonly used Kea DHCP types and
groupings.";
revision 2021-08-25 {
description "Added store-extended-info";
}
revision 2019-08-12 {
description "Initial revision";
reference "";
}
/*
@ -834,4 +838,10 @@ module kea-dhcp-types {
}
}
grouping store-extended-info {
leaf store-extended-info {
description "whether Kea should store additional client query data e.g. RAI in packets";
type boolean;
}
}
}

View File

@ -8,11 +8,11 @@ module kea-dhcp4-server {
}
import kea-types {
prefix kea;
revision-date 2021-07-28;
revision-date 2019-08-12;
}
import kea-dhcp-types {
prefix dhcp;
revision-date 2019-08-12;
revision-date 2021-08-25;
}
organization "Internet Systems Consortium";
@ -20,9 +20,12 @@ 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-07-28 {
description "Initial revision + added store-extended-info";
reference "";
revision 2021-08-25 {
description "Added store-extended-info";
}
revision 2019-08-12 {
description "Initial revision";
}
/*
@ -209,7 +212,7 @@ module kea-dhcp4-server {
}
uses authoritative;
uses dhcp:subnet-user-context;
uses kea:store-extended-info;
uses dhcp:store-extended-info;
}
}
@ -517,6 +520,6 @@ module kea-dhcp4-server {
}
}
uses kea:store-extended-info;
uses dhcp:store-extended-info;
}
}

View File

@ -8,11 +8,11 @@ module kea-dhcp6-server {
}
import kea-types {
prefix kea;
revision-date 2021-07-28;
revision-date 2019-08-12;
}
import kea-dhcp-types {
prefix dhcp;
revision-date 2019-08-12;
revision-date 2021-08-25;
}
organization "Internet Systems Consortium";
@ -20,9 +20,12 @@ 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-07-28 {
description "Initial revision + added store-extended-info";
reference "";
revision 2021-08-25 {
description "Added store-extended-info";
}
revision 2019-08-12 {
description "Initial revision";
}
/*
@ -244,7 +247,7 @@ module kea-dhcp6-server {
uses relay;
}
uses dhcp:subnet-user-context;
uses kea:store-extended-info;
uses dhcp:store-extended-info;
}
}
@ -620,6 +623,6 @@ module kea-dhcp6-server {
}
}
uses kea:store-extended-info;
uses dhcp:store-extended-info;
}
}

View File

@ -7,9 +7,8 @@ module kea-types {
contact "kea-dev@lists.isc.org";
description "This file defines some commonly used Kea types and groupings.";
revision 2021-07-28 {
description "Initial revision + added store-extended-info";
reference "";
revision 2019-08-12 {
description "Initial revision";
}
/*
@ -157,11 +156,4 @@ module kea-types {
}
}
}
grouping store-extended-info {
leaf store-extended-info {
description "whether Kea should store additional client query data e.g. RAI in packets";
type boolean;
}
}
}