From: Francis Dupont <fdupont@isc.org>
Date: Wed, 15 May 2019 20:24:21 +0000 (+0200)
Subject: [295-min-max-lease-time-configuration-options] Added examples
X-Git-Tag: Kea-1.6.0-beta2~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fea5ff0736b40cc86cb4bd397363cdd699f24c63;p=thirdparty%2Fkea.git

[295-min-max-lease-time-configuration-options] Added examples
---

diff --git a/doc/examples/kea4/all-keys-current.json b/doc/examples/kea4/all-keys-current.json
index f55eb0b0d9..a5181d7a7f 100644
--- a/doc/examples/kea4/all-keys-current.json
+++ b/doc/examples/kea4/all-keys-current.json
@@ -727,12 +727,32 @@
                         "subnet": "192.0.0.0/8",
 
                         // Subnet level valid lifetime.
-                        "valid-lifetime": 6000
+                        "valid-lifetime": 6000,
+
+                        // Subnet level default valid lifetime.
+                        // (in fact only an alias of valid lifetime)
+                        "default-valid-lifetime": 6000,
+
+                        // Subnet level min valid lifetime.
+                        "min-valid-lifetime": 4000,
+
+                        // Subnet level max valid lifetime.
+                        "max-valid-lifetime": 8000
                     }
                 ],
 
                 // Shared network level valid lifetime.
-                "valid-lifetime": 6001
+                "valid-lifetime": 6001,
+
+                // Shared network level default valid lifetime.
+                // (in fact only an alias of valid lifetime)
+                "default-valid-lifetime": 6001,
+
+                // Subnet level min valid lifetime.
+                "min-valid-lifetime": 4001,
+
+                // Subnet level max valid lifetime.
+                "max-valid-lifetime": 8001
             }
         ],
 
@@ -745,6 +765,16 @@
         // Global valid lifetime value.
         "valid-lifetime": 6000,
 
+        // Global default valid lifetime value.
+        // (in fact only an alias of valid lifetime)
+        "default-valid-lifetime": 6000,
+
+        // Global min valid lifetime value.
+        "min-valid-lifetime": 4000,
+
+        // Global max valid lifetime value.
+        "max-valid-lifetime": 8000,
+
         // Reservations (examples are in other files).
         "reservations": [],
 
diff --git a/doc/examples/kea6/all-keys-current.json b/doc/examples/kea6/all-keys-current.json
index c93957b16b..9f827b1ea9 100644
--- a/doc/examples/kea6/all-keys-current.json
+++ b/doc/examples/kea6/all-keys-current.json
@@ -415,6 +415,16 @@
         // Global value of the preferred lifetime.
         "preferred-lifetime": 50,
 
+        // Global default value of the preferred lifetime.
+        // (in fact only an alias of preferred lifetime)
+        "default-preferred-lifetime": 50,
+
+        // Global min value of the preferred lifetime.
+        "min-preferred-lifetime": 40,
+
+        // Global max value of the preferred lifetime.
+        "max-preferred-lifetime": 60,
+
         // Global value for the rebind timer, i.e. the time after which the
         // DHCP client enters rebind state if it fails to renew the lease.
         "rebind-timer": 40,
@@ -484,6 +494,16 @@
                 // Shared network specific preferred lifetime.
                 "preferred-lifetime": 2000,
 
+                // Shared network specific default preferred lifetime.
+                // (in fact only an alias of preferred lifetime)
+                "default-preferred-lifetime": 2000,
+
+                // Shared network specific min preferred lifetime.
+                "min-preferred-lifetime": 1500,
+
+                // Shared network specific ma xpreferred lifetime.
+                "max-preferred-lifetime": 2500,
+
                 // Boolen flag indicating if the server can respond to
                 // a Solicit message including a Rapid Commit option with
                 // the Reply message (See DHCPv6 rapid commit).
@@ -616,6 +636,16 @@
                         // Subnet specific preferred lifetime.
                         "preferred-lifetime": 2000,
 
+                        // Subnet specific default preferred lifetime.
+                        // (in fact only an alias of preferred lifetime)
+                        "default-preferred-lifetime": 2000,
+
+                        // Subnet specific min preferred lifetime.
+                        "min-preferred-lifetime": 1500,
+
+                        // Subnet specific max referred lifetime.
+                        "max-preferred-lifetime": 2500,
+
                         // Boolen flag indicating if the server can respond to
                         // a Solicit message including a Rapid Commit option with
                         // the Reply message (See DHCPv6 rapid commit).
@@ -686,12 +716,32 @@
                         "subnet": "2001:db8::/32",
 
                         // Subnet level valid lifetime.
-                        "valid-lifetime": 6000
+                        "valid-lifetime": 6000,
+
+                        // Subnet level default valid lifetime.
+                        // (in fact only an alias of valid lifetime)
+                        "default-valid-lifetime": 6000,
+
+                        // Subnet level min valid lifetime.
+                        "min-valid-lifetime": 4000,
+
+                        // Subnet level max valid lifetime.
+                        "max-valid-lifetime": 8000
                     }
                 ],
 
                 // Shared network level valid lifetime.
-                "valid-lifetime": 6001
+                "valid-lifetime": 6001,
+
+                // Shared network level default valid lifetime.
+                // (in fact only an alias of valid lifetime)
+                "default-valid-lifetime": 6001,
+
+                // Shared network level min valid lifetime.
+                "min-valid-lifetime": 4001,
+
+                // Shared network level max valid lifetime.
+                "max-valid-lifetime": 8001
             }
         ],
 
@@ -701,6 +751,16 @@
         // Global valid lifetime value.
         "valid-lifetime": 6000,
 
+        // Global default valid lifetime value.
+        // (in fact only an alias of valid lifetime)
+        "default-valid-lifetime": 6000,
+
+        // Global min valid lifetime value.
+        "min-valid-lifetime": 4000,
+
+        // Global max valid lifetime value.
+        "max-valid-lifetime": 8000,
+
         // Reservations (examples are in other files).
         "reservations": [],
 
diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index 7205580314..6698870de9 100644
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -495,7 +495,7 @@ valid_lifetime: VALID_LIFETIME COLON INTEGER {
 
 default_valid_lifetime: DEFAULT_VALID_LIFETIME COLON INTEGER {
     ElementPtr prf(new IntElement($3, ctx.loc2pos(@3)));
-    ctx.stack_.back()->set("valid-lifetime", prf);
+    ctx.stack_.back()->set("default-valid-lifetime", prf);
 };
 
 min_valid_lifetime: MIN_VALID_LIFETIME COLON INTEGER {
diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index c8366a64f3..e2ff93a09b 100644
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -511,7 +511,7 @@ preferred_lifetime: PREFERRED_LIFETIME COLON INTEGER {
 
 default_preferred_lifetime: DEFAULT_PREFERRED_LIFETIME COLON INTEGER {
     ElementPtr prf(new IntElement($3, ctx.loc2pos(@3)));
-    ctx.stack_.back()->set("preferred-lifetime", prf);
+    ctx.stack_.back()->set("default-preferred-lifetime", prf);
 };
 
 min_preferred_lifetime: MIN_PREFERRED_LIFETIME COLON INTEGER {
@@ -531,7 +531,7 @@ valid_lifetime: VALID_LIFETIME COLON INTEGER {
 
 default_valid_lifetime: DEFAULT_VALID_LIFETIME COLON INTEGER {
     ElementPtr prf(new IntElement($3, ctx.loc2pos(@3)));
-    ctx.stack_.back()->set("valid-lifetime", prf);
+    ctx.stack_.back()->set("default-valid-lifetime", prf);
 };
 
 min_valid_lifetime: MIN_VALID_LIFETIME COLON INTEGER {