fix: fixed persistence of subnet data in DHCP service (#788)

Author: iyashnov

.docker/kea.Dockerfile

@@ -2,4 +2,10 @@ FROM jonasal/kea-dhcp4:3.1.2-alpine AS runtime
 
 COPY --from=jonasal/kea-hooks:3.1.2-alpine /hooks /usr/lib/kea/hooks
 
+RUN touch /kea/config/kea-dhcp4.conf
+
+COPY ./kea-dhcp4.conf /kea/config/kea-dhcp4.conf
+
+RUN chmod 750 /kea/config/kea-dhcp4.conf
+
 RUN ldconfig /usr/local/lib/kea/hooks

.package/docker-compose.yml

@@ -327,8 +327,7 @@ services:
     restart: unless-stopped
     command: -c /kea/config/kea-dhcp4.conf
     volumes:
-      - kea_data:/var/lib/kea
-      - ./.dhcp:/kea/config
+      - dhcp:/kea/config
       - sockets:/kea/sockets
       - leases:/kea/leases
 
@@ -342,7 +341,7 @@ services:
       kea_dhcp4:
         condition: service_started
     volumes:
-      - ./.dhcp:/kea/config
+      - ./kea-ctrl-agent.conf:/kea/config/kea-ctrl-agent.conf
       - sockets:/kea/sockets
       - leases:/kea/leases
 
@@ -421,6 +420,6 @@ volumes:
   dns_server_config:
   dragonflydata:
   ldap_keytab:
-  kea_data:
   leases:
   sockets:
+  dhcp:

.dhcp/kea-ctrl-agent.conf .package/kea-ctrl-agent.conf.dhcp/kea-ctrl-agent.conf renamed to .package/kea-ctrl-agent.conf

@@ -97,6 +97,10 @@ async def delete_reservation(self, reservation: DHCPReservation) -> None:
     async def list_reservations(self, subnet_id: int) -> list[DHCPReservation]:
         """List all reservations for a subnet."""
 
+    @abstractmethod
+    async def write_config(self) -> None:
+        """Write the DHCP server configuration to apply changes."""
+
 
 class AbstractDHCPManager(AbstractService):
     """Abstract DHCP manager class."""

app/ldap_protocol/dhcp/base.py

@@ -28,13 +28,15 @@ async def create_subnet(
         subnet_dto.id = await self._get_new_subnet_id()
         try:
             await self._api_repository.create_subnet(subnet_dto)
+            await self._api_repository.write_config()
         except DHCPAPIError as e:
             raise DHCPEntryAddError(f"Failed to create subnet: {e}")
 
     async def delete_subnet(self, subnet_id: int) -> None:
         """Delete a subnet."""
         try:
             await self._api_repository.delete_subnet(subnet_id)
+            await self._api_repository.write_config()
         except DHCPAPIError as e:
             raise DHCPEntryDeleteError(f"Failed to delete subnet: {e}")
 
@@ -62,6 +64,7 @@ async def update_subnet(
         """Update an existing subnet."""
         try:
             await self._api_repository.update_subnet(subnet_dto)
+            await self._api_repository.write_config()
         except DHCPAPIError as e:
             raise DHCPEntryUpdateError(
                 f"Failed to update subnet: {e}",
@@ -124,6 +127,7 @@ async def add_reservation(
         """Add a reservation for a MAC address."""
         try:
             await self._api_repository.create_reservation(reservation)
+            await self._api_repository.write_config()
         except DHCPAPIError as e:
             raise DHCPEntryAddError(
                 f"Failed to add reservation: {e}",
@@ -143,6 +147,7 @@ async def delete_reservation(
         )
         try:
             await self._api_repository.delete_reservation(reservation)
+            await self._api_repository.write_config()
         except DHCPAPIError as e:
             raise DHCPEntryDeleteError(
                 f"Failed to delete reservation: {e}",

app/ldap_protocol/dhcp/kea_dhcp_manager.py

@@ -83,6 +83,10 @@ async def list_reservations(
     ) -> NoReturn:
         raise DHCPAPIError
 
+    @logger_wraps(is_stub=True)
+    async def write_config(self) -> None:
+        """Write the DHCP server configuration to apply changes."""
+
 
 class StubDHCPManager(AbstractDHCPManager):
     """Stub DHCP manager class."""

app/ldap_protocol/dhcp/stub.py

@@ -265,8 +265,7 @@ services:
     restart: unless-stopped
     command: -c /kea/config/kea-dhcp4.conf
     volumes:
-      - kea_data:/var/lib/kea
-      - ./.dhcp:/kea/config
+      - dhcp:/kea/config
       - sockets:/kea/sockets
       - leases:/kea/leases
 
@@ -280,7 +279,7 @@ services:
       kea_dhcp4:
         condition: service_started
     volumes:
-      - ./.dhcp:/kea/config
+      - ./.package/kea-ctrl-agent.conf:/kea/config/kea-ctrl-agent.conf
       - sockets:/kea/sockets
       - leases:/kea/leases
 
@@ -486,6 +485,6 @@ volumes:
   dns_server_config:
   ldap_keytab:
   dragonflydata:
-  kea_data:
   leases:
   sockets:
+  dhcp:

docker-compose.yml

@@ -28,7 +28,7 @@
             },
             {
                 "library": "libdhcp_lease_cmds.so"
-            },
+            }
         ],
         "parked-packet-limit": 128,
         "valid-lifetime": 6000,