From 4e1b826eecdf611fc318b2b95a27d289799ae5f4 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Sun, 17 Dec 2023 15:21:30 -0600
Subject: dhcp: T3316: Support hostname, DUID and MAC address in reservation

Reinstate support for hostname in DHCP reservation. Having `hostname` in
allows for server-side assignment of hostname. This is useful for static
lookup of hostname.

Ensure that hostname is a valid FQDN (doesn't have underscore, etc.)

Additionally, support using either of DUID or MAC address for
reservation. While MAC address is typically used for IPv4, and DUID is
typically used for IPv6, either of them can be used in IPv4 and IPv6
reservations in Kea.
---
 python/vyos/kea.py | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'python')

diff --git a/python/vyos/kea.py b/python/vyos/kea.py
index 4a517da5f..819fe16a9 100644
--- a/python/vyos/kea.py
+++ b/python/vyos/kea.py
@@ -121,14 +121,20 @@ def kea_parse_subnet(subnet, config):
             if 'disable' in host_config:
                 continue
 
-            obj = {
-                'hw-address': host_config['mac_address']
+            reservation = {
+                'hostname': host,
             }
 
+            if 'mac' in host_config:
+                reservation['hw-address'] = host_config['mac']
+
+            if 'duid' in host_config:
+                reservation['duid'] = host_config['duid']
+
             if 'ip_address' in host_config:
-                obj['ip-address'] = host_config['ip_address']
+                reservation['ip-address'] = host_config['ip_address']
 
-            reservations.append(obj)
+            reservations.append(reservation)
         out['reservations'] = reservations
 
     unifi_controller = dict_search_args(config, 'vendor_option', 'ubiquiti', 'unifi_controller')
@@ -178,7 +184,7 @@ def kea6_parse_options(config):
 
         if addrs:
             options.append({'name': 'sip-server-addr', 'data': ", ".join(addrs)})
-        
+
         if hosts:
             options.append({'name': 'sip-server-dns', 'data': ", ".join(hosts)})
 
@@ -234,10 +240,15 @@ def kea6_parse_subnet(subnet, config):
             if 'disable' in host_config:
                 continue
 
-            reservation = {}
+            reservation = {
+                'hostname': host
+            }
+
+            if 'mac' in host_config:
+                reservation['hw-address'] = host_config['mac']
 
-            if 'identifier' in host_config:
-                reservation['duid'] = host_config['identifier']
+            if 'duid' in host_config:
+                reservation['duid'] = host_config['duid']
 
             if 'ipv6_address' in host_config:
                 reservation['ip-addresses'] = [ host_config['ipv6_address'] ]
@@ -305,7 +316,7 @@ def kea_get_active_config(inet):
     ctrl_socket = f'/run/kea/dhcp{inet}-ctrl-socket'
 
     config = _ctrl_socket_command(ctrl_socket, 'config-get')
-    
+
     if not config or 'result' not in config or config['result'] != 0:
         return None
 
-- 
cgit v1.2.3