kea: T7281: Use correct Kea unit files

12 files changed, 21 insertions, 21 deletions

diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index e3bccba87..0195e89b6 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -44,13 +44,13 @@
                 <properties>
                   <help>Monitor last lines of DHCP server log</help>
                 </properties>
-                <command>journalctl --no-hostname --follow --boot --unit kea-dhcp4.service</command>
+                <command>journalctl --no-hostname --follow --boot --unit isc-kea-dhcp4-server.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@$6.service"</command>
+                    <command>journalctl --no-hostname --follow --boot --unit "isc-kea-dhcp4-server@$6.service"</command>
                   </tagNode>
                 </children>
               </node>
@@ -82,13 +82,13 @@
                 <properties>
                   <help>Monitor last lines of DHCPv6 server log</help>
                 </properties>
-                <command>journalctl --no-hostname --follow --boot --unit kea-dhcp6.service</command>
+                <command>journalctl --no-hostname --follow --boot --unit isc-kea-dhcp6-server.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@$6.service"</command>
+                    <command>journalctl --no-hostname --follow --boot --unit "isc-kea-dhcp6-server@$6.service"</command>
                   </tagNode>
                 </children>
               </node>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 8c85f4e2c..b437bc273 100755
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -104,13 +104,13 @@
                 <properties>
                   <help>Show log for DHCP server</help>
                 </properties>
-                <command>journalctl --no-hostname --boot --unit kea-dhcp4.service</command>
+                <command>journalctl --no-hostname --boot --unit isc-kea-dhcp4-server.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@$6.service"</command>
+                    <command>journalctl --no-hostname --follow --boot --unit "isc-kea-dhcp4-server@$6.service"</command>
                   </tagNode>
                 </children>
               </node>
@@ -142,13 +142,13 @@
                 <properties>
                   <help>Show log for DHCPv6 server</help>
                 </properties>
-                <command>journalctl --no-hostname --boot --unit kea-dhcp6.service</command>
+                <command>journalctl --no-hostname --boot --unit isc-kea-dhcp6-server.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@$6.service"</command>
+                    <command>journalctl --no-hostname --boot --unit "isc-kea-dhcp6-server@$6.service"</command>
                   </tagNode>
                 </children>
               </node>
diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py
index ae0338996..d92321ab8 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@{vrf_name}', f'kea-dhcp-ddns@{vrf_name}']
+        services = [f'isc-kea-dhcp4-server@{vrf_name}', f'isc-kea-dhcp-ddns-server@{vrf_name}']
     else:
-        services = ['kea-dhcp4', 'kea-dhcp-ddns']
+        services = ['isc-kea-dhcp4-server', 'isc-kea-dhcp-ddns-server']
 
     if not dhcp or 'disable' in dhcp:
         for service in services:
@@ -598,7 +598,7 @@ def apply(dhcp):
     for service in services:
         action = 'restart'
 
-        if 'kea-dhcp-ddns-server' in service and 'dynamic_dns_update' not in dhcp:
+        if 'isc-kea-dhcp-ddns-server' in service and 'dynamic_dns_update' not in dhcp:
             action = 'stop'
 
         call(f'systemctl {action} {service}.service')
diff --git a/src/conf_mode/service_dhcpv6-server.py b/src/conf_mode/service_dhcpv6-server.py
index 1b2f07e43..b6a7a87c3 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@{vrf_name}.service'
+        service_name = f'isc-kea-dhcp6-server@{vrf_name}.service'
     else:
-        service_name = 'kea-dhcp6.service'
+        service_name = 'isc-kea-dhcp6-server.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.service.d/override.conf b/src/etc/systemd/system/isc-kea-dhcp-ddns-server.service.d/override.conf
index cdfdea8eb..cdfdea8eb 100644
--- a/src/etc/systemd/system/kea-dhcp-ddns.service.d/override.conf
+++ b/src/etc/systemd/system/isc-kea-dhcp-ddns-server.service.d/override.conf
diff --git a/src/etc/systemd/system/kea-dhcp-ddns@.service b/src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service
index b6360e573..b6360e573 100644
--- a/src/etc/systemd/system/kea-dhcp-ddns@.service
+++ b/src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service
diff --git a/src/etc/systemd/system/kea-dhcp4.service.d/override.conf b/src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf
index 4a04892c0..4a04892c0 100644
--- a/src/etc/systemd/system/kea-dhcp4.service.d/override.conf
+++ b/src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf
diff --git a/src/etc/systemd/system/kea-dhcp4@.service b/src/etc/systemd/system/isc-kea-dhcp4-server@.service
index f63364275..f63364275 100644
--- a/src/etc/systemd/system/kea-dhcp4@.service
+++ b/src/etc/systemd/system/isc-kea-dhcp4-server@.service
diff --git a/src/etc/systemd/system/kea-dhcp6.service.d/override.conf b/src/etc/systemd/system/isc-kea-dhcp6-server.service.d/override.conf
index cb33fc057..cb33fc057 100644
--- a/src/etc/systemd/system/kea-dhcp6.service.d/override.conf
+++ b/src/etc/systemd/system/isc-kea-dhcp6-server.service.d/override.conf
diff --git a/src/etc/systemd/system/kea-dhcp6@.service b/src/etc/systemd/system/isc-kea-dhcp6-server@.service
index 1d2330f74..1d2330f74 100644
--- a/src/etc/systemd/system/kea-dhcp6@.service
+++ b/src/etc/systemd/system/isc-kea-dhcp6-server@.service
diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py
index 6e6ad153b..905c9b80c 100755
--- a/src/op_mode/dhcp.py
+++ b/src/op_mode/dhcp.py
@@ -326,9 +326,9 @@ def show_server_pool_statistics(
     inet_suffix = '6' if family == 'inet6' else '4'
 
     if vrf:
-        service = f'kea-dhcp{inet_suffix}@{vrf}.service'
+        service = f'isc-kea-dhcp{inet_suffix}-server@{vrf}.service'
     else:
-        service = f'kea-dhcp{inet_suffix}.service'
+        service = f'isc-kea-dhcp{inet_suffix}-server.service'
 
     if not is_systemd_service_running(service):
         Warning(stale_warn_msg)
@@ -376,9 +376,9 @@ def show_server_leases(
     inet_suffix = '6' if family == 'inet6' else '4'
 
     if vrf:
-        service = f'kea-dhcp{inet_suffix}@{vrf}.service'
+        service = f'isc-kea-dhcp{inet_suffix}-server@{vrf}.service'
     else:
-        service = f'kea-dhcp{inet_suffix}.service'
+        service = f'isc-kea-dhcp{inet_suffix}-server.service'
 
     if not is_systemd_service_running(service):
         Warning(stale_warn_msg)
@@ -437,9 +437,9 @@ def show_server_static_mappings(
     inet_suffix = '6' if family == 'inet6' else '4'
 
     if vrf:
-        service = f'kea-dhcp{inet_suffix}@{vrf}.service'
+        service = f'isc-kea-dhcp{inet_suffix}-server@{vrf}.service'
     else:
-        service = f'kea-dhcp{inet_suffix}.service'
+        service = f'isc-kea-dhcp{inet_suffix}-server.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 29bd690e3..4f05d6eb8 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',
+        'systemd_service': 'isc-kea-dhcp4-server',
         'path': ['service', 'dhcp-server'],
     },
     'dhcpv6': {
-        'systemd_service': 'kea-dhcp6',
+        'systemd_service': 'isc-kea-dhcp6-server',
         'path': ['service', 'dhcpv6-server'],
     },
     'dns_dynamic': {