From: Francis Dupont <fdupont@isc.org>
Date: Mon, 3 Sep 2018 15:39:17 +0000 (+0200)
Subject: [65-libyang-models] Small changes from last kea-yang tests
X-Git-Tag: 65-libyang-models-update_base~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07d761f28d10a1921abb4137271a1a99a171d2c8;p=thirdparty%2Fkea.git

[65-libyang-models] Small changes from last kea-yang tests
---

diff --git a/src/lib/yang/models/kea-control-agent.yang b/src/lib/yang/models/kea-control-agent.yang
index c1f1621cf5..d2fcb06f62 100644
--- a/src/lib/yang/models/kea-control-agent.yang
+++ b/src/lib/yang/models/kea-control-agent.yang
@@ -61,10 +61,7 @@ module kea-control-agent {
       }
    }
 
-   container hooks-libraries {
-     description "Hooks libraries.";
-     uses kea:hooks-libraries;
-   }
+   uses kea:hooks-libraries;
 
    leaf user-context {
      type kea:user-context;
diff --git a/src/lib/yang/models/kea-dhcp4.yang b/src/lib/yang/models/kea-dhcp4.yang
index 6dc8bf1147..3945162423 100644
--- a/src/lib/yang/models/kea-dhcp4.yang
+++ b/src/lib/yang/models/kea-dhcp4.yang
@@ -298,8 +298,8 @@ module kea-dhcp4 {
       type uint32;
       description "Database connection timeout.";
     }
-    leaf-list contact-points {
-      type inet:ip-address;
+    leaf contact-points {
+      type string;
       description "Cassandra database contact points.";
     }
     leaf keyspace {
@@ -676,10 +676,10 @@ module kea-dhcp4 {
       }
       leaf ncr-protocol {
         type enumeration {
-          enum "udp";
-          enum "tcp";
+          enum "UDP";
+          enum "TCP";
         }
-        default "udp";
+        default "UDP";
         description "Protocol to use for DHCP-DDNS.";
       }
       leaf ncr-format {
diff --git a/src/lib/yang/models/kea-dhcp6.yang b/src/lib/yang/models/kea-dhcp6.yang
index 2572b3653a..3b2e4152ba 100644
--- a/src/lib/yang/models/kea-dhcp6.yang
+++ b/src/lib/yang/models/kea-dhcp6.yang
@@ -297,8 +297,8 @@ module kea-dhcp6 {
       type uint32;
       description "Database connection timeout.";
     }
-    leaf-list contact-points {
-      type inet:ip-address;
+    leaf contact-points {
+      type string;
       description "Cassandra database contact points.";
     }
     leaf keyspace {
@@ -700,10 +700,10 @@ module kea-dhcp6 {
       }
       leaf ncr-protocol {
         type enumeration {
-          enum "udp";
-          enum "tcp";
+          enum "UDP";
+          enum "TCP";
         }
-        default "udp";
+        default "UDP";
         description "Protocol to use for DHCP-DDNS.";
       }
       leaf ncr-format {
diff --git a/src/lib/yang/models/kea-logging.yang b/src/lib/yang/models/kea-logging.yang
index 00fb3a4115..4973e95c38 100644
--- a/src/lib/yang/models/kea-logging.yang
+++ b/src/lib/yang/models/kea-logging.yang
@@ -41,30 +41,33 @@ module kea-logging {
         }
         container output-options {
           description "Output options.";
-          leaf output {
-            type string;
-            description "Type of output. Special values are stdout (standard
-              output), stderr (standard error), syslog (syslog using default
-              name), syslog:name (syslog using specified name). Any other
-              value is interpreted as a filename.";
-          }
-          leaf flush {
-            type boolean;
-            default true;
-            description "When true flush buffers after each message.";
-          }
-          leaf maxsize {
-            type uint32;
-            default 10240000;
-            description "Maximum size of output file before rotation.
-              Values below 204800 including 0 disable rotation.";
-          }
-          leaf maxver {
-            type uint32 {
-              range 1..max;
+          list option {
+            key output;
+            leaf output {
+              type string;
+              description "Type of output. Special values are stdout (standard
+                output), stderr (standard error), syslog (syslog using default
+                name), syslog:name (syslog using specified name). Any other
+                value is interpreted as a filename.";
+            }
+            leaf flush {
+              type boolean;
+              default true;
+              description "When true flush buffers after each message.";
+            }
+            leaf maxsize {
+              type uint32;
+              default 10240000;
+              description "Maximum size of output file before rotation.
+                Values below 204800 including 0 disable rotation.";
+            }
+            leaf maxver {
+              type uint32 {
+                range 1..max;
+              }
+              default 1;
+              description "Maximum version to keep a rotated output file.";
             }
-            default 1;
-            description "Maximum version to keep a rotated output file.";
           }
         }
         leaf debuglevel {
diff --git a/src/lib/yang/models/kea-types.yang b/src/lib/yang/models/kea-types.yang
index 08b01860f8..e6954e9512 100644
--- a/src/lib/yang/models/kea-types.yang
+++ b/src/lib/yang/models/kea-types.yang
@@ -52,17 +52,19 @@ module kea-types {
   }
 
   grouping hooks-libraries {
-    description "Hook libraries.";
-    list hook-library {
-      key library;
-      leaf library {
-        type string;
-        mandatory true;
-        description "Path to the DSO.";
-      }
-      leaf parameters {
-        type string;
-        description "Parameters (JSON value).";
+    container hooks-libraries {
+      description "Hook libraries.";
+      list hook-library {
+        key library;
+        leaf library {
+          type string;
+          mandatory true;
+          description "Path to the DSO.";
+        }
+        leaf parameters {
+          type string;
+          description "Parameters (JSON value).";
+        }
       }
     }
   }