dhcp: T3316: Migrate dhcp/dhcpv6 server to Kea

1 files changed, 119 insertions, 37 deletions

diff --git a/smoketest/scripts/cli/test_service_dhcpv6-server.py b/smoketest/scripts/cli/test_service_dhcpv6-server.py
index 4d9dabc3f..175a67537 100755
--- a/smoketest/scripts/cli/test_service_dhcpv6-server.py
+++ b/smoketest/scripts/cli/test_service_dhcpv6-server.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2022 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -16,6 +16,8 @@
 
 import unittest
 
+from json import loads
+
 from base_vyostest_shim import VyOSUnitTestSHIM
 
 from vyos.configsession import ConfigSessionError
@@ -23,8 +25,8 @@ from vyos.template import inc_ip
 from vyos.utils.process import process_named_running
 from vyos.utils.file import read_file
 
-PROCESS_NAME = 'dhcpd'
-DHCPD_CONF = '/run/dhcp-server/dhcpdv6.conf'
+PROCESS_NAME = 'kea-dhcp6'
+KEA6_CONF = '/run/kea/kea-dhcp6.conf'
 base_path = ['service', 'dhcpv6-server']
 
 subnet = '2001:db8:f00::/64'
@@ -52,6 +54,36 @@ class TestServiceDHCPv6Server(VyOSUnitTestSHIM.TestCase):
         self.cli_delete(base_path)
         self.cli_commit()
 
+    def walk_path(self, obj, path):
+        current = obj
+
+        for i, key in enumerate(path):
+            if isinstance(key, str):
+                self.assertTrue(isinstance(current, dict), msg=f'Failed path: {path}')
+                self.assertTrue(key in current, msg=f'Failed path: {path}')
+            elif isinstance(key, int):
+                self.assertTrue(isinstance(current, list), msg=f'Failed path: {path}')
+                self.assertTrue(0 <= key < len(current), msg=f'Failed path: {path}')
+            else:
+                assert False, "Invalid type"
+
+            current = current[key]
+
+        return current
+
+    def verify_config_object(self, obj, path, value):
+        base_obj = self.walk_path(obj, path)
+        self.assertTrue(isinstance(base_obj, list))
+        self.assertTrue(any(True for v in base_obj if v == value))
+
+    def verify_config_value(self, obj, path, key, value):
+        base_obj = self.walk_path(obj, path)
+        if isinstance(base_obj, list):
+            self.assertTrue(any(True for v in base_obj if key in v and v[key] == value))
+        elif isinstance(base_obj, dict):
+            self.assertTrue(key in base_obj)
+            self.assertEqual(base_obj[key], value)
+
     def test_single_pool(self):
         shared_net_name = 'SMOKE-1'
         search_domains  = ['foo.vyos.net', 'bar.vyos.net']
@@ -99,34 +131,66 @@ class TestServiceDHCPv6Server(VyOSUnitTestSHIM.TestCase):
         # commit changes
         self.cli_commit()
 
-        config = read_file(DHCPD_CONF)
-        self.assertIn(f'option dhcp6.preference {preference};', config)
-
-        self.assertIn(f'subnet6 {subnet}' + r' {', config)
-        search = '"' + '", "'.join(search_domains) + '"'
-        nissrv = ', '.join(nis_servers)
-        self.assertIn(f'range6 {range_start} {range_stop};', config)
-        self.assertIn(f'default-lease-time {lease_time};', config)
-        self.assertIn(f'default-lease-time {lease_time};', config)
-        self.assertIn(f'max-lease-time {max_lease_time};', config)
-        self.assertIn(f'min-lease-time {min_lease_time};', config)
-        self.assertIn(f'option dhcp6.domain-search {search};', config)
-        self.assertIn(f'option dhcp6.name-servers {dns_1}, {dns_2};', config)
-        self.assertIn(f'option dhcp6.nis-domain-name "{domain}";', config)
-        self.assertIn(f'option dhcp6.nis-servers {nissrv};', config)
-        self.assertIn(f'option dhcp6.nisp-domain-name "{domain}";', config)
-        self.assertIn(f'option dhcp6.nisp-servers {nissrv};', config)
-        self.assertIn(f'set shared-networkname = "{shared_net_name}";', config)
+        config = read_file(KEA6_CONF)
+        obj = loads(config)
+
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks'], 'name', shared_net_name)
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks', 0, 'subnet6'], 'subnet', subnet)
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks', 0, 'subnet6'], 'valid-lifetime', int(lease_time))
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks', 0, 'subnet6'], 'min-valid-lifetime', int(min_lease_time))
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks', 0, 'subnet6'], 'max-valid-lifetime', int(max_lease_time))
+
+        # Verify options
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'option-data'],
+                {'name': 'dns-servers', 'data': f'{dns_1}, {dns_2}'})
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'option-data'],
+                {'name': 'domain-search', 'data': ", ".join(search_domains)})
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'option-data'],
+                {'name': 'nis-domain-name', 'data': domain})
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'option-data'],
+                {'name': 'nis-servers', 'data': ", ".join(nis_servers)})
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'option-data'],
+                {'name': 'nisp-domain-name', 'data': domain})
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'option-data'],
+                {'name': 'nisp-servers', 'data': ", ".join(nis_servers)})
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'option-data'],
+                {'name': 'sntp-servers', 'data': sntp_server})
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'option-data'],
+                {'name': 'sip-server-dns', 'data': sip_server})
+
+        # Verify pools
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'pools'],
+                {'pool': f'{range_start} - {range_stop}'})
 
         client_base = 1
         for client in ['client1', 'client2', 'client3']:
             cid = '00:01:00:01:12:34:56:78:aa:bb:cc:dd:ee:{}'.format(client_base)
             ip = inc_ip(subnet, client_base)
             prefix = inc_ip(subnet, client_base << 64) + '/64'
-            self.assertIn(f'host {shared_net_name}_{client}' + ' {', config)
-            self.assertIn(f'fixed-address6 {ip};', config)
-            self.assertIn(f'fixed-prefix6 {prefix};', config)
-            self.assertIn(f'host-identifier option dhcp6.client-id {cid};', config)
+
+            self.verify_config_object(
+                    obj,
+                    ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'reservations'],
+                    {'duid': cid, 'ip-addresses': [ip], 'prefixes': [prefix]})
+
             client_base += 1
 
         # Check for running process
@@ -138,22 +202,34 @@ class TestServiceDHCPv6Server(VyOSUnitTestSHIM.TestCase):
         range_start = inc_ip(subnet, 256)  # ::100
         range_stop = inc_ip(subnet, 65535) # ::ffff
         delegate_start = '2001:db8:ee::'
-        delegate_stop = '2001:db8:ee:ff00::'
-        delegate_len = '56'
+        delegate_len = '64'
+        prefix_len = '56'
 
         pool = base_path + ['shared-network-name', shared_net_name, 'subnet', subnet]
 
         self.cli_set(pool + ['address-range', 'start', range_start, 'stop', range_stop])
-        self.cli_set(pool + ['prefix-delegation', 'start', delegate_start, 'stop', delegate_stop])
-        self.cli_set(pool + ['prefix-delegation', 'start', delegate_start, 'prefix-length', delegate_len])
+        self.cli_set(pool + ['prefix-delegation', 'prefix', delegate_start, 'delegated-length', delegate_len])
+        self.cli_set(pool + ['prefix-delegation', 'prefix', delegate_start, 'prefix-length', prefix_len])
 
         # commit changes
         self.cli_commit()
 
-        config = read_file(DHCPD_CONF)
-        self.assertIn(f'subnet6 {subnet}' + r' {', config)
-        self.assertIn(f'range6 {range_start} {range_stop};', config)
-        self.assertIn(f'prefix6 {delegate_start} {delegate_stop} /{delegate_len};', config)
+        config = read_file(KEA6_CONF)
+        obj = loads(config)
+
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks'], 'name', shared_net_name)
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks', 0, 'subnet6'], 'subnet', subnet)
+
+        # Verify pools
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'pools'],
+                {'pool': f'{range_start} - {range_stop}'})
+
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'shared-networks', 0, 'subnet6', 0, 'pd-pools'],
+                {'prefix': delegate_start, 'prefix-len': int(prefix_len), 'delegated-len': int(delegate_len)})
 
         # Check for running process
         self.assertTrue(process_named_running(PROCESS_NAME))
@@ -170,10 +246,16 @@ class TestServiceDHCPv6Server(VyOSUnitTestSHIM.TestCase):
         # commit changes
         self.cli_commit()
 
-        config = read_file(DHCPD_CONF)
-        self.assertIn(f'option dhcp6.name-servers {ns_global_1}, {ns_global_2};', config)
-        self.assertIn(f'subnet6 {subnet}' + r' {', config)
-        self.assertIn(f'set shared-networkname = "{shared_net_name}";', config)
+        config = read_file(KEA6_CONF)
+        obj = loads(config)
+
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks'], 'name', shared_net_name)
+        self.verify_config_value(obj, ['Dhcp6', 'shared-networks', 0, 'subnet6'], 'subnet', subnet)
+
+        self.verify_config_object(
+                obj,
+                ['Dhcp6', 'option-data'],
+                {'name': 'dns-servers', "code": 23, "space": "dhcp6", "csv-format": True, 'data': f'{ns_global_1}, {ns_global_2}'})
 
         # Check for running process
         self.assertTrue(process_named_running(PROCESS_NAME))