kea: T7821: Update Kea to 3.0

10 files changed, 12 insertions, 12 deletions

diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py
index a273dff50..ae0338996 100755
--- a/src/conf_mode/service_dhcp-server.py
+++ b/src/conf_mode/service_dhcp-server.py
@@ -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:
diff --git a/src/conf_mode/service_dhcpv6-server.py b/src/conf_mode/service_dhcpv6-server.py
index a5febd303..1b2f07e43 100755
--- a/src/conf_mode/service_dhcpv6-server.py
+++ b/src/conf_mode/service_dhcpv6-server.py
@@ -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:
diff --git a/src/etc/systemd/system/kea-dhcp-ddns-server.service.d/override.conf b/src/etc/systemd/system/kea-dhcp-ddns.service.d/override.conf
index cdfdea8eb..cdfdea8eb 100644
--- a/src/etc/systemd/system/kea-dhcp-ddns-server.service.d/override.conf
+++ b/src/etc/systemd/system/kea-dhcp-ddns.service.d/override.conf
diff --git a/src/etc/systemd/system/kea-dhcp-ddns-server@.service b/src/etc/systemd/system/kea-dhcp-ddns@.service
index b6360e573..b6360e573 100644
--- a/src/etc/systemd/system/kea-dhcp-ddns-server@.service
+++ b/src/etc/systemd/system/kea-dhcp-ddns@.service
diff --git a/src/etc/systemd/system/kea-dhcp4-server.service.d/override.conf b/src/etc/systemd/system/kea-dhcp4.service.d/override.conf
index 4a04892c0..4a04892c0 100644
--- a/src/etc/systemd/system/kea-dhcp4-server.service.d/override.conf
+++ b/src/etc/systemd/system/kea-dhcp4.service.d/override.conf
diff --git a/src/etc/systemd/system/kea-dhcp4-server@.service b/src/etc/systemd/system/kea-dhcp4@.service
index f63364275..f63364275 100644
--- a/src/etc/systemd/system/kea-dhcp4-server@.service
+++ b/src/etc/systemd/system/kea-dhcp4@.service
diff --git a/src/etc/systemd/system/kea-dhcp6-server.service.d/override.conf b/src/etc/systemd/system/kea-dhcp6.service.d/override.conf
index cb33fc057..cb33fc057 100644
--- a/src/etc/systemd/system/kea-dhcp6-server.service.d/override.conf
+++ b/src/etc/systemd/system/kea-dhcp6.service.d/override.conf
diff --git a/src/etc/systemd/system/kea-dhcp6-server@.service b/src/etc/systemd/system/kea-dhcp6@.service
index 1d2330f74..1d2330f74 100644
--- a/src/etc/systemd/system/kea-dhcp6-server@.service
+++ b/src/etc/systemd/system/kea-dhcp6@.service
diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py
index 4d6d092e6..446799ddb 100755
--- a/src/op_mode/dhcp.py
+++ b/src/op_mode/dhcp.py
@@ -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)
@@ -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)
@@ -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)
diff --git a/src/op_mode/restart.py b/src/op_mode/restart.py
index 7f50ba621..29bd690e3 100755
--- a/src/op_mode/restart.py
+++ b/src/op_mode/restart.py
@@ -26,11 +26,11 @@ config = ConfigTreeQuery()
 
 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': {