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

diff --git a/src/lib/yang/yang_revisions.h b/src/lib/yang/yang_revisions.h
index 4e42dc42e3fc4cda091cd28ecbfc21aaf0542763..773907814ed198d334ca0a967cee9f2f84e6092f 100644 (file)
--- a/src/lib/yang/yang_revisions.h
+++ b/src/lib/yang/yang_revisions.h
@@ -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

diff --git a/src/share/yang/modules/Makefile.am b/src/share/yang/modules/Makefile.am
index 18ca84edc50324df2e402ae332b44d080ce3e29b..dd0197d0f4d8ef8ac1e5a07c8268ebf81115c20e 100644 (file)
--- a/src/share/yang/modules/Makefile.am
+++ b/src/share/yang/modules/Makefile.am
@@ -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}

diff --git a/src/share/yang/modules/hashes/kea-ctrl-agent@2019-08-12.hash b/src/share/yang/modules/hashes/kea-ctrl-agent@2019-08-12.hash
index ebe2ab0738a635bfd1d7f5b54d881865a632dee1..bf142b8bb365b84b54538e991f96938aedb0c2d3 100644 (file)
--- a/src/share/yang/modules/hashes/kea-ctrl-agent@2019-08-12.hash
+++ b/src/share/yang/modules/hashes/kea-ctrl-agent@2019-08-12.hash
@@ -1 +1 @@
-0eec8b9fda520d7d4160fb52a12f8e5488942de2acd49b70b9f3df12e018867d
+5d11568b445edc65a4783f53fe5e8571af9a79b759272d4a3e4bfba994f71087

diff --git a/src/share/yang/modules/hashes/kea-dhcp-ddns@2019-08-12.hash b/src/share/yang/modules/hashes/kea-dhcp-ddns@2019-08-12.hash
index 6de9c4ecd7f624df8e5431af195615d4d46f4f4d..537b73cbf029badf992ba67c0a2f8ceb3db9354d 100644 (file)
--- a/src/share/yang/modules/hashes/kea-dhcp-ddns@2019-08-12.hash
+++ b/src/share/yang/modules/hashes/kea-dhcp-ddns@2019-08-12.hash
@@ -1 +1 @@
-96585e06eb96d3938cd63a98003cf6b35393b83700863e204fb56232c7b48c71
+230145eb977108912d0015b8fb0d77bd4f53df0f4dfc317329ea5892569a7ba8

diff --git a/src/share/yang/modules/hashes/kea-dhcp-types@2019-08-12.hash b/src/share/yang/modules/hashes/kea-dhcp-types@2019-08-12.hash
deleted file mode 100644 (file)
index 054f103..0000000
--- a/src/share/yang/modules/hashes/kea-dhcp-types@2019-08-12.hash
+++ /dev/null
@@ -1 +0,0 @@
-c3e17f01be9d00b33561ed7b1a8fb73ce95a7d3bdf4da36c340662410bfffb74

diff --git a/src/share/yang/modules/hashes/kea-dhcp-types@2021-08-25.hash b/src/share/yang/modules/hashes/kea-dhcp-types@2021-08-25.hash
new file mode 100644 (file)
index 0000000..bd4f73f
--- /dev/null
+++ b/src/share/yang/modules/hashes/kea-dhcp-types@2021-08-25.hash
@@ -0,0 +1 @@
+4e82ff3d43d89f0973edd0ec4b11d761829e89a9ddcbb122c2c418a3d28afe18

diff --git a/src/share/yang/modules/hashes/kea-dhcp4-server@2021-07-28.hash b/src/share/yang/modules/hashes/kea-dhcp4-server@2021-07-28.hash
deleted file mode 100644 (file)
index 9758848..0000000
--- a/src/share/yang/modules/hashes/kea-dhcp4-server@2021-07-28.hash
+++ /dev/null
@@ -1 +0,0 @@
-a3842405494ed469a91661cc32fe300326e55c4a1f3adde6b264ab1f54dbfe4b

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
new file mode 100644 (file)
index 0000000..299144e
--- /dev/null
+++ b/src/share/yang/modules/hashes/kea-dhcp4-server@2021-08-25.hash
@@ -0,0 +1 @@
+e285a73b42ca5be3d920c6284a10bd14c2347bd2383570d7854cd3421ac6b1fb

diff --git a/src/share/yang/modules/hashes/kea-dhcp6-server@2021-07-28.hash b/src/share/yang/modules/hashes/kea-dhcp6-server@2021-07-28.hash
deleted file mode 100644 (file)
index 6b3dbd6..0000000
--- a/src/share/yang/modules/hashes/kea-dhcp6-server@2021-07-28.hash
+++ /dev/null
@@ -1 +0,0 @@
-fa6065bce7e34f39a1cb1571a69795b37ec12d98aaa5cffa6e66aa7cbb2ad1e5

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
new file mode 100644 (file)
index 0000000..edccc05
--- /dev/null
+++ b/src/share/yang/modules/hashes/kea-dhcp6-server@2021-08-25.hash
@@ -0,0 +1 @@
+bc8226204578bb3be7e73db344ea9d5f3154cad0916ef35889906afe4a7b68c3

diff --git a/src/share/yang/modules/hashes/kea-types@2019-08-12.hash b/src/share/yang/modules/hashes/kea-types@2019-08-12.hash
new file mode 100644 (file)
index 0000000..b0c8859
--- /dev/null
+++ b/src/share/yang/modules/hashes/kea-types@2019-08-12.hash
@@ -0,0 +1 @@
+c06b5242654257c9b8d7f9d2375ab78e9c5cfce74ed4e9f8e21face43a949b9a

diff --git a/src/share/yang/modules/hashes/kea-types@2021-07-28.hash b/src/share/yang/modules/hashes/kea-types@2021-07-28.hash
deleted file mode 100644 (file)
index 4cc1970..0000000
--- a/src/share/yang/modules/hashes/kea-types@2021-07-28.hash
+++ /dev/null
@@ -1 +0,0 @@
-7fe443fddcc4831a6f28c2dadcbcfb786e7af72a0383db32630fc00bfca108dd

diff --git a/src/share/yang/modules/kea-ctrl-agent@2019-08-12.yang b/src/share/yang/modules/kea-ctrl-agent@2019-08-12.yang
index 65fb48ef9099fb63dac4634f0a7286d2cca7d887..ff25896d077e7d84f3a79103914d3b6276155885 100644 (file)
--- a/src/share/yang/modules/kea-ctrl-agent@2019-08-12.yang
+++ b/src/share/yang/modules/kea-ctrl-agent@2019-08-12.yang
@@ -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";

diff --git a/src/share/yang/modules/kea-dhcp-ddns@2019-08-12.yang b/src/share/yang/modules/kea-dhcp-ddns@2019-08-12.yang
index 1069b77f13b76015dbf7f98d0157af0b542e609b..fdffc1560f7bc885bc3e5ef5799617a687d3a84c 100644 (file)
--- a/src/share/yang/modules/kea-dhcp-ddns@2019-08-12.yang
+++ b/src/share/yang/modules/kea-dhcp-ddns@2019-08-12.yang
@@ -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";

diff --git a/src/share/yang/modules/kea-dhcp-types@2019-08-12.yang b/src/share/yang/modules/kea-dhcp-types@2021-08-25.yang
similarity index 98%
rename from src/share/yang/modules/kea-dhcp-types@2019-08-12.yang
rename to src/share/yang/modules/kea-dhcp-types@2021-08-25.yang
index e4ad152f40f09572b14bc6944476b3c213edd490..862d159b218f8fcc97c8ae9f454e7212ca4c514a 100644 (file)
--- a/src/share/yang/modules/kea-dhcp-types@2019-08-12.yang
+++ b/src/share/yang/modules/kea-dhcp-types@2021-08-25.yang
@@ -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;
+    }
+  }
 }

diff --git a/src/share/yang/modules/kea-dhcp4-server@2021-07-28.yang b/src/share/yang/modules/kea-dhcp4-server@2021-08-25.yang
similarity index 98%
rename from src/share/yang/modules/kea-dhcp4-server@2021-07-28.yang
rename to src/share/yang/modules/kea-dhcp4-server@2021-08-25.yang
index 6a564adc4c940f8dfc7ec532c39d077898e4de91..688ed17bbab6e647100b47dbc0d04742ccb43529 100644 (file)
--- a/src/share/yang/modules/kea-dhcp4-server@2021-07-28.yang
+++ b/src/share/yang/modules/kea-dhcp4-server@2021-08-25.yang
@@ -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;
   }
 }

diff --git a/src/share/yang/modules/kea-dhcp6-server@2021-07-28.yang b/src/share/yang/modules/kea-dhcp6-server@2021-08-25.yang
similarity index 98%
rename from src/share/yang/modules/kea-dhcp6-server@2021-07-28.yang
rename to src/share/yang/modules/kea-dhcp6-server@2021-08-25.yang
index ca017ea1d5f98703d3d4e427d67bf0167cc05a33..438075ddfb7b5142039a6754bf78cf28426bbd47 100644 (file)
--- a/src/share/yang/modules/kea-dhcp6-server@2021-07-28.yang
+++ b/src/share/yang/modules/kea-dhcp6-server@2021-08-25.yang
@@ -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;
   }
 }

diff --git a/src/share/yang/modules/kea-types@2021-07-28.yang b/src/share/yang/modules/kea-types@2019-08-12.yang
similarity index 93%
rename from src/share/yang/modules/kea-types@2021-07-28.yang
rename to src/share/yang/modules/kea-types@2019-08-12.yang
index 4fdefae0b9f185cfb35a643f8d2defe860904ec8..a19c18f9e8b04e64633e74e5785370735cbb01f9 100644 (file)
--- a/src/share/yang/modules/kea-types@2021-07-28.yang
+++ b/src/share/yang/modules/kea-types@2019-08-12.yang
@@ -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;
-    }
-  }
 }