Skip to content

kea: T7821: Update Kea to 3.0 #4723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2025
Merged

kea: T7821: Update Kea to 3.0 #4723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ Depends:
# For "service dhcp-relay"
isc-dhcp-relay,
# For "service dhcp-server"
kea,
isc-kea-dhcp4,
isc-kea-dhcp6,
isc-kea-dhcp-ddns,
isc-kea-hooks,
# End "service dhcp-server"
# For "service lldp"
lldpd,
Expand Down
8 changes: 4 additions & 4 deletions op-mode-definitions/monitor-log.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
<properties>
<help>Monitor last lines of DHCP server log</help>
</properties>
<command>journalctl --no-hostname --follow --boot --unit kea-dhcp4-server.service</command>
<command>journalctl --no-hostname --follow --boot --unit kea-dhcp4.service</command>
<children>
<tagNode name="vrf">
<properties>
<help>Monitor last lines of DHCP server log on specific vrf</help>
</properties>
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp4-server@$6.service"</command>
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp4@$6.service"</command>
</tagNode>
</children>
</node>
Expand Down Expand Up @@ -82,13 +82,13 @@
<properties>
<help>Monitor last lines of DHCPv6 server log</help>
</properties>
<command>journalctl --no-hostname --follow --boot --unit kea-dhcp6-server.service</command>
<command>journalctl --no-hostname --follow --boot --unit kea-dhcp6.service</command>
<children>
<tagNode name="vrf">
<properties>
<help>Monitor last lines of DHCPv6 server log on specific vrf</help>
</properties>
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp6-server@$6.service"</command>
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp6@$6.service"</command>
</tagNode>
</children>
</node>
Expand Down
8 changes: 4 additions & 4 deletions op-mode-definitions/show-log.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@
<properties>
<help>Show log for DHCP server</help>
</properties>
<command>journalctl --no-hostname --boot --unit kea-dhcp4-server.service</command>
<command>journalctl --no-hostname --boot --unit kea-dhcp4.service</command>
<children>
<tagNode name="vrf">
<properties>
<help>Monitor last lines of DHCP server log on specific vrf</help>
</properties>
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp4-server@$6.service"</command>
<command>journalctl --no-hostname --follow --boot --unit "kea-dhcp4@$6.service"</command>
</tagNode>
</children>
</node>
Expand Down Expand Up @@ -142,13 +142,13 @@
<properties>
<help>Show log for DHCPv6 server</help>
</properties>
<command>journalctl --no-hostname --boot --unit kea-dhcp6-server.service</command>
<command>journalctl --no-hostname --boot --unit kea-dhcp6.service</command>
<children>
<tagNode name="vrf">
<properties>
<help>Monitor last lines of DHCPv6 server log on specific vrf</help>
</properties>
<command>journalctl --no-hostname --boot --unit "kea-dhcp6-server@$6.service"</command>
<command>journalctl --no-hostname --boot --unit "kea-dhcp6@$6.service"</command>
</tagNode>
</children>
</node>
Expand Down
1 change: 0 additions & 1 deletion smoketest/scripts/cli/test_service_dhcp-server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

PROCESS_NAME = 'kea-dhcp4'
D2_PROCESS_NAME = 'kea-dhcp-ddns'
CTRL_PROCESS_NAME = 'kea-ctrl-agent'
KEA4_CONF = '/run/kea/kea-dhcp4.conf'
KEA4_D2_CONF = '/run/kea/kea-dhcp-ddns.conf'
KEA4_CTRL = '/run/kea/dhcp4-ctrl-socket'
Expand Down
4 changes: 2 additions & 2 deletions src/conf_mode/service_dhcp-server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,9 +582,9 @@ def apply(dhcp):
# if running in vrf, set base diffrently
if argv and len(argv) > 1:
vrf_name = argv[1]
services = [f'kea-dhcp4-server@{vrf_name}', f'kea-dhcp-ddns-server@{vrf_name}']
services = [f'kea-dhcp4@{vrf_name}', f'kea-dhcp-ddns@{vrf_name}']
else:
services = ['kea-dhcp4-server', 'kea-dhcp-ddns-server']
services = ['kea-dhcp4', 'kea-dhcp-ddns']

if not dhcp or 'disable' in dhcp:
for service in services:
Expand Down
4 changes: 2 additions & 2 deletions src/conf_mode/service_dhcpv6-server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,9 @@ def apply(dhcpv6):
# if running in vrf, set base diffrently
if argv and len(argv) > 1:
vrf_name = argv[1]
service_name = f'kea-dhcp6-server@{vrf_name}.service'
service_name = f'kea-dhcp6@{vrf_name}.service'
else:
service_name = 'kea-dhcp6-server.service'
service_name = 'kea-dhcp6.service'

# bail out early - looks like removal from running config
if not dhcpv6 or 'disable' in dhcpv6:
Expand Down
0 ...-dhcp-ddns-server.service.d/override.conf → ...tem/kea-dhcp-ddns.service.d/override.conf
View file
Open in desktop
File renamed without changes.
0 ...temd/system/[email protected] → ...etc/systemd/system/[email protected]
View file
Open in desktop
File renamed without changes.
0 .../kea-dhcp4-server.service.d/override.conf → .../system/kea-dhcp4.service.d/override.conf
View file
Open in desktop
File renamed without changes.
0 .../systemd/system/[email protected] → src/etc/systemd/system/[email protected]
View file
Open in desktop
File renamed without changes.
0 .../kea-dhcp6-server.service.d/override.conf → .../system/kea-dhcp6.service.d/override.conf
View file
Open in desktop
File renamed without changes.
0 .../systemd/system/[email protected] → src/etc/systemd/system/[email protected]
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions src/op_mode/dhcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,9 @@ def show_server_pool_statistics(
inet_suffix = '6' if family == 'inet6' else '4'

if vrf:
service = f'kea-dhcp{inet_suffix}-server@{vrf}.service'
service = f'kea-dhcp{inet_suffix}@{vrf}.service'
else:
service = f'kea-dhcp{inet_suffix}-server.service'
service = f'kea-dhcp{inet_suffix}.service'

if not is_systemd_service_running(service):
Warning(stale_warn_msg)
Expand Down Expand Up @@ -372,9 +372,9 @@ def show_server_leases(
inet_suffix = '6' if family == 'inet6' else '4'

if vrf:
service = f'kea-dhcp{inet_suffix}-server@{vrf}.service'
service = f'kea-dhcp{inet_suffix}@{vrf}.service'
else:
service = f'kea-dhcp{inet_suffix}-server.service'
service = f'kea-dhcp{inet_suffix}.service'

if not is_systemd_service_running(service):
Warning(stale_warn_msg)
Expand Down Expand Up @@ -433,9 +433,9 @@ def show_server_static_mappings(
inet_suffix = '6' if family == 'inet6' else '4'

if vrf:
service = f'kea-dhcp{inet_suffix}-server@{vrf}.service'
service = f'kea-dhcp{inet_suffix}@{vrf}.service'
else:
service = f'kea-dhcp{inet_suffix}-server.service'
service = f'kea-dhcp{inet_suffix}.service'

if not is_systemd_service_running(service):
Warning(stale_warn_msg)
Expand Down
4 changes: 2 additions & 2 deletions src/op_mode/restart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@

service_map = {
'dhcp': {
'systemd_service': 'kea-dhcp4-server',
'systemd_service': 'kea-dhcp4',
'path': ['service', 'dhcp-server'],
},
'dhcpv6': {
'systemd_service': 'kea-dhcp6-server',
'systemd_service': 'kea-dhcp6',
'path': ['service', 'dhcpv6-server'],
},
'dns_dynamic': {
Expand Down
Loading